diff --git a/README.md b/README.md
index 428e2ad9e65b704d31aee4d328e3e2b8fd52b870..650cf702825fc0b8065c5ef2b13482198357ff24 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # Distributed version of the Spring PetClinic Sample Application built with Spring Cloud [![Build Status](https://travis-ci.org/spring-petclinic/spring-petclinic-microservices.svg?branch=master)](https://travis-ci.org/spring-petclinic/spring-petclinic-microservices/)
 
 ## Starting services locally
-Every microservice is a Spring Boot application and can be started locally using IDE or `mvn spring-boot:run` command. Please note that supporting services (Config and Discovery Server) must be started before any other application (Clients, Vets, Visits and API).
+Every microservice is a Spring Boot application and can be started locally using IDE or `mvn spring-boot:run` command. Please note that supporting services (Config and Discovery Server) must be started before any other application (Customers, Vets, Visits and API).
 If everything goes well, you can access the following services at given location:
 * Discovery Server - http://localhost:8761
 * Config Server - http://localhost:8888
 * AngularJS frontend (API Gateway) - http://localhost:8080
-* Clients, Vets and Visits Services - random port, check Eureka Dashboard 
+* Customers, Vets and Visits Services - random port, check Eureka Dashboard 
 
 ## Understanding the Spring Petclinic application with a few diagrams
 <a href="https://speakerdeck.com/michaelisvy/spring-petclinic-sample-application">See the presentation here</a>
diff --git a/pom.xml b/pom.xml
index 645aaf7ac5fa672253574e61398dfe90f1deb430..15abd09fca6ab8352e25f475dd356e606cc324f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,8 @@
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>spring-petclinic-client</module>
-		<module>spring-petclinic-clients-service</module>
+		<module>spring-petclinic-ui</module>
+		<module>spring-petclinic-customers-service</module>
 		<module>spring-petclinic-vets-service</module>
 		<module>spring-petclinic-visits-service</module>
 		<module>spring-petclinic-config-server</module>
diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml
index cd8f4b0cb4d5d37a6c0f5008b108ae850c680f6b..b12948505e18c1e5eb0678b5d6d34e38a0c01524 100644
--- a/spring-petclinic-api-gateway/pom.xml
+++ b/spring-petclinic-api-gateway/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.samples</groupId>
-            <artifactId>spring-petclinic-client</artifactId>
+            <artifactId>spring-petclinic-ui</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/spring-petclinic-clients-service/pom.xml b/spring-petclinic-customers-service/pom.xml
similarity index 93%
rename from spring-petclinic-clients-service/pom.xml
rename to spring-petclinic-customers-service/pom.xml
index 9f1b3a4bdc4b557cafabb23ecb65895de8809288..68c22795d86fa2e28b7491e1e136f1bd54d2d5f9 100644
--- a/spring-petclinic-clients-service/pom.xml
+++ b/spring-petclinic-customers-service/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.samples.petclinic.client</groupId>
-	<artifactId>spring-petclinic-clients-service</artifactId>
+	<artifactId>spring-petclinic-customers-service</artifactId>
 	<version>1.4.2</version>
 	<packaging>jar</packaging>
 
-	<name>spring-petclinic-clients-service</name>
-	<description>Spring PetClinic Clients Service</description>
+	<name>spring-petclinic-customers-service</name>
+	<description>Spring PetClinic Customers Service</description>
 
 	<parent>
 		<groupId>org.springframework.samples</groupId>
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/ClientsServiceApplication.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java
similarity index 73%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/ClientsServiceApplication.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java
index 961f5a62530bde49245f53451d2de069ae8a4fbc..681e655b3eb7567b841ef06968e45d31522bc047 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/ClientsServiceApplication.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.clients;
+package org.springframework.samples.petclinic.customers;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -9,9 +9,9 @@ import org.springframework.samples.petclinic.monitoring.MonitoringConfig;
 @EnableDiscoveryClient
 @SpringBootApplication
 @Import(MonitoringConfig.class)
-public class ClientsServiceApplication {
+public class CustomersServiceApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(ClientsServiceApplication.class, args);
+		SpringApplication.run(CustomersServiceApplication.class, args);
 	}
 }
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/application/OwnerService.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/application/OwnerService.java
similarity index 81%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/application/OwnerService.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/application/OwnerService.java
index c11d67eb1d565625bd6b573f4cebb16d70e4719e..022c20af9159274c4d46755f5b7a61ea35885bbd 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/application/OwnerService.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/application/OwnerService.java
@@ -1,9 +1,9 @@
-package org.springframework.samples.petclinic.clients.application;
+package org.springframework.samples.petclinic.customers.application;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
-import org.springframework.samples.petclinic.clients.domain.model.owner.OwnerRepository;
+import org.springframework.samples.petclinic.customers.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.customers.domain.model.owner.OwnerRepository;
 import org.springframework.samples.petclinic.monitoring.Monitored;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/application/PetService.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/application/PetService.java
similarity index 78%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/application/PetService.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/application/PetService.java
index c6713131a816967380f8194bf629f0a22ab7d640..1c2cf61ec61bd3360cf65809ee7550c22fdff0c3 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/application/PetService.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/application/PetService.java
@@ -1,10 +1,10 @@
-package org.springframework.samples.petclinic.clients.application;
+package org.springframework.samples.petclinic.customers.application;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
-import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
-import org.springframework.samples.petclinic.clients.domain.model.pet.PetRepository;
-import org.springframework.samples.petclinic.clients.domain.model.pet.PetType;
+import org.springframework.samples.petclinic.customers.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.customers.domain.model.pet.PetRepository;
+import org.springframework.samples.petclinic.customers.domain.model.pet.PetType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/owner/OwnerResource.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/owner/OwnerResource.java
similarity index 92%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/owner/OwnerResource.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/owner/OwnerResource.java
index aa045e866cc272ce0d7688c79ccd01a602db2184..652f348dd3c10a8e69b17849298efbe862631345 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/owner/OwnerResource.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/owner/OwnerResource.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.boundary.web.owner;
+package org.springframework.samples.petclinic.customers.boundary.web.owner;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.samples.petclinic.clients.application.OwnerService;
-import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.customers.application.OwnerService;
+import org.springframework.samples.petclinic.customers.domain.model.owner.Owner;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetResource.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetResource.java
similarity index 89%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetResource.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetResource.java
index 0da9afc4b6175b9c73d40d5d29ef6117c27b4538..5276deef4641f7495355c236b09dda884afca70d 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetResource.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetResource.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.boundary.web.pet;
+package org.springframework.samples.petclinic.customers.boundary.web.pet;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
-import org.springframework.samples.petclinic.clients.application.OwnerService;
-import org.springframework.samples.petclinic.clients.application.PetService;
-import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
-import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
-import org.springframework.samples.petclinic.clients.domain.model.pet.PetType;
+import org.springframework.samples.petclinic.customers.application.OwnerService;
+import org.springframework.samples.petclinic.customers.application.PetService;
+import org.springframework.samples.petclinic.customers.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.customers.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.customers.domain.model.pet.PetType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.Size;
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetValidator.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetValidator.java
similarity index 91%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetValidator.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetValidator.java
index 9f888d21bcbf6ae0db0a64408db319f6a794991a..fb8cdc24bca5b6547f7cd9cbcd9d87f8b9fbaaa2 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetValidator.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetValidator.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.boundary.web.pet;
+package org.springframework.samples.petclinic.customers.boundary.web.pet;
 
-import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.customers.domain.model.pet.Pet;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.Errors;
 
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/Person.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/Person.java
similarity index 90%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/Person.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/Person.java
index b9af8c6e734e88859416c1797ecf09489e662e78..faea7f4ece48141ec8063fd92f9b896d5c0db894 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/Person.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/Person.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.domain.model;
+package org.springframework.samples.petclinic.customers.domain.model;
 
 import org.hibernate.validator.constraints.NotEmpty;
-import org.springframework.samples.petclinic.clients.support.jpa.BaseEntity;
+import org.springframework.samples.petclinic.customers.support.jpa.BaseEntity;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/owner/Owner.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/owner/Owner.java
similarity index 94%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/owner/Owner.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/owner/Owner.java
index 9af363b356789a59fb9e5cb91ce24abd26c677d3..4b873b20efb1bbf5d809877c562e1ea8e8338c72 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/owner/Owner.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/owner/Owner.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.domain.model.owner;
+package org.springframework.samples.petclinic.customers.domain.model.owner;
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.beans.support.MutableSortDefinition;
 import org.springframework.beans.support.PropertyComparator;
 import org.springframework.core.style.ToStringCreator;
-import org.springframework.samples.petclinic.clients.domain.model.Person;
-import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.customers.domain.model.Person;
+import org.springframework.samples.petclinic.customers.domain.model.pet.Pet;
 
 import javax.persistence.*;
 import javax.validation.constraints.Digits;
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/owner/OwnerRepository.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/owner/OwnerRepository.java
similarity index 94%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/owner/OwnerRepository.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/owner/OwnerRepository.java
index a1a17ce0e2544c5d63afadfbdd06c456afdb1def..56980bbb623a72105c980302a5fb1f53dade2504 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/owner/OwnerRepository.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/owner/OwnerRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.domain.model.owner;
+package org.springframework.samples.petclinic.customers.domain.model.owner;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/Pet.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/Pet.java
similarity index 87%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/Pet.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/Pet.java
index 6439c9497859de79972f8e5e301f2a75b0f4744f..be6decb4d70dfc931b5ba4e6c9daa40726a2539b 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/Pet.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/Pet.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.domain.model.pet;
+package org.springframework.samples.petclinic.customers.domain.model.pet;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
-import org.springframework.samples.petclinic.clients.support.jpa.NamedEntity;
+import org.springframework.samples.petclinic.customers.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.customers.support.jpa.NamedEntity;
 
 import javax.persistence.*;
 import java.util.Date;
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/PetRepository.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/PetRepository.java
similarity index 96%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/PetRepository.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/PetRepository.java
index 00750726ac9166186758aa09a8e1370f28df9c2a..1a386d62cce67f170f4550b3be1562ca859907aa 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/PetRepository.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/PetRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.domain.model.pet;
+package org.springframework.samples.petclinic.customers.domain.model.pet;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/PetType.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/PetType.java
similarity index 84%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/PetType.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/PetType.java
index c54e7c48da655d8062ef3de3bec214503cdf1eea..59065f5eb6e907eb02b3a03b5f5db288218f592a 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/domain/model/pet/PetType.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/domain/model/pet/PetType.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.domain.model.pet;
+package org.springframework.samples.petclinic.customers.domain.model.pet;
 
-import org.springframework.samples.petclinic.clients.support.jpa.NamedEntity;
+import org.springframework.samples.petclinic.customers.support.jpa.NamedEntity;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/support/jpa/BaseEntity.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/support/jpa/BaseEntity.java
similarity index 94%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/support/jpa/BaseEntity.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/support/jpa/BaseEntity.java
index a3ce55b6f46473c373f86155921fd50ad9002acc..09dc6e985052d47d66bbb8789d19b2b93690e317 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/support/jpa/BaseEntity.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/support/jpa/BaseEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.support.jpa;
+package org.springframework.samples.petclinic.customers.support.jpa;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
diff --git a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/support/jpa/NamedEntity.java b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/support/jpa/NamedEntity.java
similarity index 94%
rename from spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/support/jpa/NamedEntity.java
rename to spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/support/jpa/NamedEntity.java
index 3ef1b0218c286753b3f23f40b132dbbeafe5b381..cf5b8218d74cf471a3b889f53bbcfb1454c4d9b3 100644
--- a/spring-petclinic-clients-service/src/main/java/org/springframework/samples/petclinic/clients/support/jpa/NamedEntity.java
+++ b/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/support/jpa/NamedEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.clients.support.jpa;
+package org.springframework.samples.petclinic.customers.support.jpa;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
diff --git a/spring-petclinic-clients-service/src/main/resources/bootstrap.yml b/spring-petclinic-customers-service/src/main/resources/bootstrap.yml
similarity index 73%
rename from spring-petclinic-clients-service/src/main/resources/bootstrap.yml
rename to spring-petclinic-customers-service/src/main/resources/bootstrap.yml
index 060debf6d878e992babe029d5d96eead388a73b5..9744623645e111140a77ae1f115bf127721f9237 100644
--- a/spring-petclinic-clients-service/src/main/resources/bootstrap.yml
+++ b/spring-petclinic-customers-service/src/main/resources/bootstrap.yml
@@ -3,4 +3,4 @@ spring:
     config:
       uri: http://localhost:8888
   application:
-    name: clients-service
+    name: customers-service
diff --git a/spring-petclinic-clients-service/src/main/resources/db/hsqldb/data.sql b/spring-petclinic-customers-service/src/main/resources/db/hsqldb/data.sql
similarity index 100%
rename from spring-petclinic-clients-service/src/main/resources/db/hsqldb/data.sql
rename to spring-petclinic-customers-service/src/main/resources/db/hsqldb/data.sql
diff --git a/spring-petclinic-clients-service/src/main/resources/db/hsqldb/schema.sql b/spring-petclinic-customers-service/src/main/resources/db/hsqldb/schema.sql
similarity index 100%
rename from spring-petclinic-clients-service/src/main/resources/db/hsqldb/schema.sql
rename to spring-petclinic-customers-service/src/main/resources/db/hsqldb/schema.sql
diff --git a/spring-petclinic-clients-service/src/main/resources/db/mysql/data.sql b/spring-petclinic-customers-service/src/main/resources/db/mysql/data.sql
similarity index 100%
rename from spring-petclinic-clients-service/src/main/resources/db/mysql/data.sql
rename to spring-petclinic-customers-service/src/main/resources/db/mysql/data.sql
diff --git a/spring-petclinic-clients-service/src/main/resources/db/mysql/schema.sql b/spring-petclinic-customers-service/src/main/resources/db/mysql/schema.sql
similarity index 100%
rename from spring-petclinic-clients-service/src/main/resources/db/mysql/schema.sql
rename to spring-petclinic-customers-service/src/main/resources/db/mysql/schema.sql
diff --git a/spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/application/ClientsServicesTest.java b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/application/CustomersServicesTest.java
similarity index 88%
rename from spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/application/ClientsServicesTest.java
rename to spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/application/CustomersServicesTest.java
index bc5577d5b4abddcb09ca6ede26f7faf8b83d7a27..0fa93345959aba24c6aaf0790b9f2520fbb9522f 100644
--- a/spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/application/ClientsServicesTest.java
+++ b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/application/CustomersServicesTest.java
@@ -1,14 +1,14 @@
-package org.springframework.samples.petclinic.clients.application;
+package org.springframework.samples.petclinic.customers.application;
 
 import com.google.common.collect.Iterables;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.samples.petclinic.clients.ClientsServiceApplication;
-import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
-import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
-import org.springframework.samples.petclinic.clients.domain.model.pet.PetType;
+import org.springframework.samples.petclinic.customers.CustomersServiceApplication;
+import org.springframework.samples.petclinic.customers.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.customers.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.customers.domain.model.pet.PetType;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,9 +19,9 @@ import java.util.Date;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = ClientsServiceApplication.class, webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@SpringBootTest(classes = CustomersServiceApplication.class, webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @ActiveProfiles("test")
-public class ClientsServicesTest {
+public class CustomersServicesTest {
 
     @Autowired
     private PetService petService;
diff --git a/spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetResourceTest.java b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetResourceTest.java
similarity index 79%
rename from spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetResourceTest.java
rename to spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetResourceTest.java
index 1bc8d68c4f391f478e7e1b93809371b9812c6d24..f8219d6630f548c5a66a519ffb0e296d8d5cdb6b 100644
--- a/spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/boundary/web/pet/PetResourceTest.java
+++ b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/boundary/web/pet/PetResourceTest.java
@@ -1,4 +1,4 @@
-package org.springframework.samples.petclinic.clients.boundary.web.pet;
+package org.springframework.samples.petclinic.customers.boundary.web.pet;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -6,11 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
-import org.springframework.samples.petclinic.clients.application.OwnerService;
-import org.springframework.samples.petclinic.clients.application.PetService;
-import org.springframework.samples.petclinic.clients.domain.model.owner.Owner;
-import org.springframework.samples.petclinic.clients.domain.model.pet.Pet;
-import org.springframework.samples.petclinic.clients.domain.model.pet.PetType;
+import org.springframework.samples.petclinic.customers.application.OwnerService;
+import org.springframework.samples.petclinic.customers.application.PetService;
+import org.springframework.samples.petclinic.customers.domain.model.owner.Owner;
+import org.springframework.samples.petclinic.customers.domain.model.pet.Pet;
+import org.springframework.samples.petclinic.customers.domain.model.pet.PetType;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
diff --git a/spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/infrastructure/ValidatorTests.java b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/infrastructure/ValidatorTests.java
similarity index 91%
rename from spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/infrastructure/ValidatorTests.java
rename to spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/infrastructure/ValidatorTests.java
index 7c761bb9fbdc09145d39325d198300ab23b62db4..36d29774bdb24f21ab9e47f444086015ec0158b6 100644
--- a/spring-petclinic-clients-service/src/test/java/org/springframework/samples/petclinic/clients/infrastructure/ValidatorTests.java
+++ b/spring-petclinic-customers-service/src/test/java/org/springframework/samples/petclinic/customers/infrastructure/ValidatorTests.java
@@ -1,8 +1,8 @@
-package org.springframework.samples.petclinic.clients.infrastructure;
+package org.springframework.samples.petclinic.customers.infrastructure;
 
 import org.junit.Test;
 import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.samples.petclinic.clients.domain.model.Person;
+import org.springframework.samples.petclinic.customers.domain.model.Person;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
 import javax.validation.ConstraintViolation;
diff --git a/spring-petclinic-clients-service/src/test/resources/application-test.yml b/spring-petclinic-customers-service/src/test/resources/application-test.yml
similarity index 100%
rename from spring-petclinic-clients-service/src/test/resources/application-test.yml
rename to spring-petclinic-customers-service/src/test/resources/application-test.yml
diff --git a/spring-petclinic-clients-service/src/test/resources/bootstrap-test.yml b/spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml
similarity index 100%
rename from spring-petclinic-clients-service/src/test/resources/bootstrap-test.yml
rename to spring-petclinic-customers-service/src/test/resources/bootstrap-test.yml
diff --git a/spring-petclinic-client/.gitignore b/spring-petclinic-ui/.gitignore
similarity index 100%
rename from spring-petclinic-client/.gitignore
rename to spring-petclinic-ui/.gitignore
diff --git a/spring-petclinic-client/bower.json b/spring-petclinic-ui/bower.json
similarity index 93%
rename from spring-petclinic-client/bower.json
rename to spring-petclinic-ui/bower.json
index 89f91536a78732e7c2992682933a82ee9898aa37..1ec3c9fe413cb20f2d410b05067399d4e04f6e8d 100644
--- a/spring-petclinic-client/bower.json
+++ b/spring-petclinic-ui/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "spring-petclinic-client",
+  "name": "spring-petclinic-ui",
   "description": "Spring Petclinic AngularJS client application",
   "main": "",
   "authors": [
diff --git a/spring-petclinic-client/gulpfile.js b/spring-petclinic-ui/gulpfile.js
similarity index 100%
rename from spring-petclinic-client/gulpfile.js
rename to spring-petclinic-ui/gulpfile.js
diff --git a/spring-petclinic-client/package.json b/spring-petclinic-ui/package.json
similarity index 100%
rename from spring-petclinic-client/package.json
rename to spring-petclinic-ui/package.json
diff --git a/spring-petclinic-client/pom.xml b/spring-petclinic-ui/pom.xml
similarity index 95%
rename from spring-petclinic-client/pom.xml
rename to spring-petclinic-ui/pom.xml
index 3a3b7b8f20c92277e211662190ac6065791e1e9d..812840e02bc5e57f5a6bacc8d0e82f47da7c4d5b 100644
--- a/spring-petclinic-client/pom.xml
+++ b/spring-petclinic-ui/pom.xml
@@ -7,8 +7,8 @@
 		<artifactId>spring-petclinic-microservices</artifactId>
 		<version>1.4.2</version>
 	</parent>
-	<artifactId>spring-petclinic-client</artifactId>
-	<name>Spring Petclinic :: AngularJS Client</name>
+	<artifactId>spring-petclinic-ui</artifactId>
+	<name>Spring Petclinic :: AngularJS UI</name>
     <version>1.4.2</version>
 
 	<properties>
diff --git a/spring-petclinic-client/src/css/README.md b/spring-petclinic-ui/src/css/README.md
similarity index 100%
rename from spring-petclinic-client/src/css/README.md
rename to spring-petclinic-ui/src/css/README.md
diff --git a/spring-petclinic-client/src/css/petclinic.css b/spring-petclinic-ui/src/css/petclinic.css
similarity index 100%
rename from spring-petclinic-client/src/css/petclinic.css
rename to spring-petclinic-ui/src/css/petclinic.css
diff --git a/spring-petclinic-client/src/fonts/montserrat-webfont.eot b/spring-petclinic-ui/src/fonts/montserrat-webfont.eot
similarity index 100%
rename from spring-petclinic-client/src/fonts/montserrat-webfont.eot
rename to spring-petclinic-ui/src/fonts/montserrat-webfont.eot
diff --git a/spring-petclinic-client/src/fonts/montserrat-webfont.svg b/spring-petclinic-ui/src/fonts/montserrat-webfont.svg
similarity index 100%
rename from spring-petclinic-client/src/fonts/montserrat-webfont.svg
rename to spring-petclinic-ui/src/fonts/montserrat-webfont.svg
diff --git a/spring-petclinic-client/src/fonts/montserrat-webfont.ttf b/spring-petclinic-ui/src/fonts/montserrat-webfont.ttf
similarity index 100%
rename from spring-petclinic-client/src/fonts/montserrat-webfont.ttf
rename to spring-petclinic-ui/src/fonts/montserrat-webfont.ttf
diff --git a/spring-petclinic-client/src/fonts/montserrat-webfont.woff b/spring-petclinic-ui/src/fonts/montserrat-webfont.woff
similarity index 100%
rename from spring-petclinic-client/src/fonts/montserrat-webfont.woff
rename to spring-petclinic-ui/src/fonts/montserrat-webfont.woff
diff --git a/spring-petclinic-client/src/fonts/varela_round-webfont.eot b/spring-petclinic-ui/src/fonts/varela_round-webfont.eot
similarity index 100%
rename from spring-petclinic-client/src/fonts/varela_round-webfont.eot
rename to spring-petclinic-ui/src/fonts/varela_round-webfont.eot
diff --git a/spring-petclinic-client/src/fonts/varela_round-webfont.svg b/spring-petclinic-ui/src/fonts/varela_round-webfont.svg
similarity index 100%
rename from spring-petclinic-client/src/fonts/varela_round-webfont.svg
rename to spring-petclinic-ui/src/fonts/varela_round-webfont.svg
diff --git a/spring-petclinic-client/src/fonts/varela_round-webfont.ttf b/spring-petclinic-ui/src/fonts/varela_round-webfont.ttf
similarity index 100%
rename from spring-petclinic-client/src/fonts/varela_round-webfont.ttf
rename to spring-petclinic-ui/src/fonts/varela_round-webfont.ttf
diff --git a/spring-petclinic-client/src/fonts/varela_round-webfont.woff b/spring-petclinic-ui/src/fonts/varela_round-webfont.woff
similarity index 100%
rename from spring-petclinic-client/src/fonts/varela_round-webfont.woff
rename to spring-petclinic-ui/src/fonts/varela_round-webfont.woff
diff --git a/spring-petclinic-client/src/images/favicon.png b/spring-petclinic-ui/src/images/favicon.png
similarity index 100%
rename from spring-petclinic-client/src/images/favicon.png
rename to spring-petclinic-ui/src/images/favicon.png
diff --git a/spring-petclinic-client/src/images/pets.png b/spring-petclinic-ui/src/images/pets.png
similarity index 100%
rename from spring-petclinic-client/src/images/pets.png
rename to spring-petclinic-ui/src/images/pets.png
diff --git a/spring-petclinic-client/src/images/platform-bg.png b/spring-petclinic-ui/src/images/platform-bg.png
similarity index 100%
rename from spring-petclinic-client/src/images/platform-bg.png
rename to spring-petclinic-ui/src/images/platform-bg.png
diff --git a/spring-petclinic-client/src/images/spring-logo-dataflow-mobile.png b/spring-petclinic-ui/src/images/spring-logo-dataflow-mobile.png
similarity index 100%
rename from spring-petclinic-client/src/images/spring-logo-dataflow-mobile.png
rename to spring-petclinic-ui/src/images/spring-logo-dataflow-mobile.png
diff --git a/spring-petclinic-client/src/images/spring-logo-dataflow.png b/spring-petclinic-ui/src/images/spring-logo-dataflow.png
similarity index 100%
rename from spring-petclinic-client/src/images/spring-logo-dataflow.png
rename to spring-petclinic-ui/src/images/spring-logo-dataflow.png
diff --git a/spring-petclinic-client/src/images/spring-pivotal-logo.png b/spring-petclinic-ui/src/images/spring-pivotal-logo.png
similarity index 100%
rename from spring-petclinic-client/src/images/spring-pivotal-logo.png
rename to spring-petclinic-ui/src/images/spring-pivotal-logo.png
diff --git a/spring-petclinic-client/src/less/header.less b/spring-petclinic-ui/src/less/header.less
similarity index 100%
rename from spring-petclinic-client/src/less/header.less
rename to spring-petclinic-ui/src/less/header.less
diff --git a/spring-petclinic-client/src/less/petclinic.less b/spring-petclinic-ui/src/less/petclinic.less
similarity index 100%
rename from spring-petclinic-client/src/less/petclinic.less
rename to spring-petclinic-ui/src/less/petclinic.less
diff --git a/spring-petclinic-client/src/less/responsive.less b/spring-petclinic-ui/src/less/responsive.less
similarity index 100%
rename from spring-petclinic-client/src/less/responsive.less
rename to spring-petclinic-ui/src/less/responsive.less
diff --git a/spring-petclinic-client/src/less/typography.less b/spring-petclinic-ui/src/less/typography.less
similarity index 100%
rename from spring-petclinic-client/src/less/typography.less
rename to spring-petclinic-ui/src/less/typography.less
diff --git a/spring-petclinic-client/src/scripts/app.js b/spring-petclinic-ui/src/scripts/app.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/app.js
rename to spring-petclinic-ui/src/scripts/app.js
diff --git a/spring-petclinic-client/src/scripts/fragments/footer.html b/spring-petclinic-ui/src/scripts/fragments/footer.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/fragments/footer.html
rename to spring-petclinic-ui/src/scripts/fragments/footer.html
diff --git a/spring-petclinic-client/src/scripts/fragments/nav.html b/spring-petclinic-ui/src/scripts/fragments/nav.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/fragments/nav.html
rename to spring-petclinic-ui/src/scripts/fragments/nav.html
diff --git a/spring-petclinic-client/src/scripts/fragments/welcome.html b/spring-petclinic-ui/src/scripts/fragments/welcome.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/fragments/welcome.html
rename to spring-petclinic-ui/src/scripts/fragments/welcome.html
diff --git a/spring-petclinic-client/src/scripts/owner-details/owner-details.component.js b/spring-petclinic-ui/src/scripts/owner-details/owner-details.component.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-details/owner-details.component.js
rename to spring-petclinic-ui/src/scripts/owner-details/owner-details.component.js
diff --git a/spring-petclinic-client/src/scripts/owner-details/owner-details.controller.js b/spring-petclinic-ui/src/scripts/owner-details/owner-details.controller.js
similarity index 72%
rename from spring-petclinic-client/src/scripts/owner-details/owner-details.controller.js
rename to spring-petclinic-ui/src/scripts/owner-details/owner-details.controller.js
index c74b1d4a94babe3577512d7bb9e070bd09e691a1..2dd8f63372fb3e75c007e92d648fc2e75fae7669 100644
--- a/spring-petclinic-client/src/scripts/owner-details/owner-details.controller.js
+++ b/spring-petclinic-ui/src/scripts/owner-details/owner-details.controller.js
@@ -4,7 +4,7 @@ angular.module('ownerDetails')
     .controller('OwnerDetailsController', ['$http', '$stateParams', function ($http, $stateParams) {
         var self = this;
 
-        $http.get('api/client/owners/' + $stateParams.ownerId).then(function (resp) {
+        $http.get('api/customer/owners/' + $stateParams.ownerId).then(function (resp) {
             self.owner = resp.data;
         });
     }]);
diff --git a/spring-petclinic-client/src/scripts/owner-details/owner-details.js b/spring-petclinic-ui/src/scripts/owner-details/owner-details.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-details/owner-details.js
rename to spring-petclinic-ui/src/scripts/owner-details/owner-details.js
diff --git a/spring-petclinic-client/src/scripts/owner-details/owner-details.template.html b/spring-petclinic-ui/src/scripts/owner-details/owner-details.template.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-details/owner-details.template.html
rename to spring-petclinic-ui/src/scripts/owner-details/owner-details.template.html
diff --git a/spring-petclinic-client/src/scripts/owner-form/owner-form.component.js b/spring-petclinic-ui/src/scripts/owner-form/owner-form.component.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-form/owner-form.component.js
rename to spring-petclinic-ui/src/scripts/owner-form/owner-form.component.js
diff --git a/spring-petclinic-client/src/scripts/owner-form/owner-form.controller.js b/spring-petclinic-ui/src/scripts/owner-form/owner-form.controller.js
similarity index 80%
rename from spring-petclinic-client/src/scripts/owner-form/owner-form.controller.js
rename to spring-petclinic-ui/src/scripts/owner-form/owner-form.controller.js
index df6d0176488048b963085a59f804d5d904764408..f3e0e057c010da5a28ec8e8a88be839a8851ed45 100644
--- a/spring-petclinic-client/src/scripts/owner-form/owner-form.controller.js
+++ b/spring-petclinic-ui/src/scripts/owner-form/owner-form.controller.js
@@ -9,7 +9,7 @@ angular.module('ownerForm')
         if (!ownerId) {
             self.owner = {};
         } else {
-            $http.get("api/client/owners/" + ownerId).then(function (resp) {
+            $http.get("api/customer/owners/" + ownerId).then(function (resp) {
                 self.owner = resp.data;
             });
         }
@@ -18,9 +18,9 @@ angular.module('ownerForm')
             var id = self.owner.id;
             var req;
             if (id) {
-                req = $http.put("api/client/owners/" + id, self.owner);
+                req = $http.put("api/customer/owners/" + id, self.owner);
             } else {
-                req = $http.post("api/client/owners", self.owner);
+                req = $http.post("api/customer/owners", self.owner);
             }
 
             req.then(function () {
diff --git a/spring-petclinic-client/src/scripts/owner-form/owner-form.js b/spring-petclinic-ui/src/scripts/owner-form/owner-form.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-form/owner-form.js
rename to spring-petclinic-ui/src/scripts/owner-form/owner-form.js
diff --git a/spring-petclinic-client/src/scripts/owner-form/owner-form.template.html b/spring-petclinic-ui/src/scripts/owner-form/owner-form.template.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-form/owner-form.template.html
rename to spring-petclinic-ui/src/scripts/owner-form/owner-form.template.html
diff --git a/spring-petclinic-client/src/scripts/owner-list/owner-list.component.js b/spring-petclinic-ui/src/scripts/owner-list/owner-list.component.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-list/owner-list.component.js
rename to spring-petclinic-ui/src/scripts/owner-list/owner-list.component.js
diff --git a/spring-petclinic-client/src/scripts/owner-list/owner-list.controller.js b/spring-petclinic-ui/src/scripts/owner-list/owner-list.controller.js
similarity index 75%
rename from spring-petclinic-client/src/scripts/owner-list/owner-list.controller.js
rename to spring-petclinic-ui/src/scripts/owner-list/owner-list.controller.js
index e55442b994f3bd3cdba785bf9fc97c5f6c3eb638..8229f43c81c6b5f93e6c0c995e5eb17166f7553f 100644
--- a/spring-petclinic-client/src/scripts/owner-list/owner-list.controller.js
+++ b/spring-petclinic-ui/src/scripts/owner-list/owner-list.controller.js
@@ -4,7 +4,7 @@ angular.module('ownerList')
     .controller('OwnerListController', ['$http', function ($http) {
         var self = this;
 
-        $http.get('api/client/owners').then(function (resp) {
+        $http.get('api/customer/owners').then(function (resp) {
             self.owners = resp.data;
         });
     }]);
diff --git a/spring-petclinic-client/src/scripts/owner-list/owner-list.js b/spring-petclinic-ui/src/scripts/owner-list/owner-list.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-list/owner-list.js
rename to spring-petclinic-ui/src/scripts/owner-list/owner-list.js
diff --git a/spring-petclinic-client/src/scripts/owner-list/owner-list.template.html b/spring-petclinic-ui/src/scripts/owner-list/owner-list.template.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/owner-list/owner-list.template.html
rename to spring-petclinic-ui/src/scripts/owner-list/owner-list.template.html
diff --git a/spring-petclinic-client/src/scripts/pet-form/pet-form.component.js b/spring-petclinic-ui/src/scripts/pet-form/pet-form.component.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/pet-form/pet-form.component.js
rename to spring-petclinic-ui/src/scripts/pet-form/pet-form.component.js
diff --git a/spring-petclinic-client/src/scripts/pet-form/pet-form.controller.js b/spring-petclinic-ui/src/scripts/pet-form/pet-form.controller.js
similarity index 79%
rename from spring-petclinic-client/src/scripts/pet-form/pet-form.controller.js
rename to spring-petclinic-ui/src/scripts/pet-form/pet-form.controller.js
index 6d3140a755e77d6478a375975190b4bab4e8553d..9bf24f190efdffa74250e13065ff91c3a8b0bc63 100644
--- a/spring-petclinic-client/src/scripts/pet-form/pet-form.controller.js
+++ b/spring-petclinic-ui/src/scripts/pet-form/pet-form.controller.js
@@ -5,20 +5,20 @@ angular.module('petForm')
         var self = this;
         var ownerId = $stateParams.ownerId || 0;
 
-        $http.get('api/client/petTypes').then(function (resp) {
+        $http.get('api/customer/petTypes').then(function (resp) {
             self.types = resp.data;
         }).then(function () {
 
             var petId = $stateParams.petId || 0;
 
             if (petId) { // edit
-                $http.get("api/client/owners/" + ownerId + "/pets/" + petId).then(function (resp) {
+                $http.get("api/customer/owners/" + ownerId + "/pets/" + petId).then(function (resp) {
                     self.pet = resp.data;
                     self.pet.birthDate = new Date(self.pet.birthDate);
                     self.petTypeId = "" + self.pet.type.id;
                 });
             } else {
-                $http.get('api/client/owners/' + ownerId).then(function (resp) {
+                $http.get('api/customer/owners/' + ownerId).then(function (resp) {
                     self.pet = {
                         owner: resp.data.firstName + " " + resp.data.lastName
                     };
@@ -40,9 +40,9 @@ angular.module('petForm')
 
             var req;
             if (id) {
-                req = $http.put("api/client/owners/" + ownerId + "/pets/" + id, data);
+                req = $http.put("api/customer/owners/" + ownerId + "/pets/" + id, data);
             } else {
-                req = $http.post("api/client/owners/" + ownerId + "/pets", data);
+                req = $http.post("api/customer/owners/" + ownerId + "/pets", data);
             }
 
             req.then(function () {
diff --git a/spring-petclinic-client/src/scripts/pet-form/pet-form.js b/spring-petclinic-ui/src/scripts/pet-form/pet-form.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/pet-form/pet-form.js
rename to spring-petclinic-ui/src/scripts/pet-form/pet-form.js
diff --git a/spring-petclinic-client/src/scripts/pet-form/pet-form.template.html b/spring-petclinic-ui/src/scripts/pet-form/pet-form.template.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/pet-form/pet-form.template.html
rename to spring-petclinic-ui/src/scripts/pet-form/pet-form.template.html
diff --git a/spring-petclinic-client/src/scripts/vet-list/vet-list.component.js b/spring-petclinic-ui/src/scripts/vet-list/vet-list.component.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/vet-list/vet-list.component.js
rename to spring-petclinic-ui/src/scripts/vet-list/vet-list.component.js
diff --git a/spring-petclinic-client/src/scripts/vet-list/vet-list.controller.js b/spring-petclinic-ui/src/scripts/vet-list/vet-list.controller.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/vet-list/vet-list.controller.js
rename to spring-petclinic-ui/src/scripts/vet-list/vet-list.controller.js
diff --git a/spring-petclinic-client/src/scripts/vet-list/vet-list.js b/spring-petclinic-ui/src/scripts/vet-list/vet-list.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/vet-list/vet-list.js
rename to spring-petclinic-ui/src/scripts/vet-list/vet-list.js
diff --git a/spring-petclinic-client/src/scripts/vet-list/vet-list.template.html b/spring-petclinic-ui/src/scripts/vet-list/vet-list.template.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/vet-list/vet-list.template.html
rename to spring-petclinic-ui/src/scripts/vet-list/vet-list.template.html
diff --git a/spring-petclinic-client/src/scripts/visits/visits.component.js b/spring-petclinic-ui/src/scripts/visits/visits.component.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/visits/visits.component.js
rename to spring-petclinic-ui/src/scripts/visits/visits.component.js
diff --git a/spring-petclinic-client/src/scripts/visits/visits.controller.js b/spring-petclinic-ui/src/scripts/visits/visits.controller.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/visits/visits.controller.js
rename to spring-petclinic-ui/src/scripts/visits/visits.controller.js
diff --git a/spring-petclinic-client/src/scripts/visits/visits.js b/spring-petclinic-ui/src/scripts/visits/visits.js
similarity index 100%
rename from spring-petclinic-client/src/scripts/visits/visits.js
rename to spring-petclinic-ui/src/scripts/visits/visits.js
diff --git a/spring-petclinic-client/src/scripts/visits/visits.template.html b/spring-petclinic-ui/src/scripts/visits/visits.template.html
similarity index 100%
rename from spring-petclinic-client/src/scripts/visits/visits.template.html
rename to spring-petclinic-ui/src/scripts/visits/visits.template.html