diff --git a/pom.xml b/pom.xml
index 14a8352b7..aa3d539c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.samples</groupId>
-  <artifactId>spring-petclinic</artifactId>
+  <artifactId>spring-cheapy</artifactId>
   <version>2.4.2</version>
 
   <parent>
@@ -12,7 +12,7 @@
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>2.4.2</version>
   </parent>
-  <name>petclinic</name>
+  <name>cheapy</name>
 
   <properties>
 
diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/cheapy/CheapyApplication.java
similarity index 86%
rename from src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
rename to src/main/java/org/springframework/cheapy/CheapyApplication.java
index 191253587..2912ee3d8 100644
--- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
+++ b/src/main/java/org/springframework/cheapy/CheapyApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic;
+package org.springframework.cheapy;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -26,10 +26,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  *
  */
 @SpringBootApplication(proxyBeanMethods = false)
-public class PetClinicApplication {
+public class CheapyApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(PetClinicApplication.class, args);
+		SpringApplication.run(CheapyApplication.class, args);
 	}
 
 }
diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/src/main/java/org/springframework/cheapy/model/BaseEntity.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
rename to src/main/java/org/springframework/cheapy/model/BaseEntity.java
index 4cb9ffc0c..21aab45b7 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java
+++ b/src/main/java/org/springframework/cheapy/model/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.model;
+package org.springframework.cheapy.model;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/src/main/java/org/springframework/cheapy/model/NamedEntity.java
similarity index 95%
rename from src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
rename to src/main/java/org/springframework/cheapy/model/NamedEntity.java
index 088e52e81..0f00a5e9c 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java
+++ b/src/main/java/org/springframework/cheapy/model/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.model;
+package org.springframework.cheapy.model;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java b/src/main/java/org/springframework/cheapy/model/Owner.java
similarity index 95%
rename from src/main/java/org/springframework/samples/petclinic/owner/Owner.java
rename to src/main/java/org/springframework/cheapy/model/Owner.java
index 396743569..792f42753 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/Owner.java
+++ b/src/main/java/org/springframework/cheapy/model/Owner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package org.springframework.cheapy.model;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,7 +32,6 @@ import javax.validation.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.model.Person;
 
 /**
  * Simple JavaBean domain object representing an owner.
diff --git a/src/main/java/org/springframework/samples/petclinic/model/Person.java b/src/main/java/org/springframework/cheapy/model/Person.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/model/Person.java
rename to src/main/java/org/springframework/cheapy/model/Person.java
index 15fabacc3..7e8d87c0c 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/Person.java
+++ b/src/main/java/org/springframework/cheapy/model/Person.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.model;
+package org.springframework.cheapy.model;
 
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
diff --git a/src/main/java/org/springframework/samples/petclinic/model/package-info.java b/src/main/java/org/springframework/cheapy/model/package-info.java
similarity index 92%
rename from src/main/java/org/springframework/samples/petclinic/model/package-info.java
rename to src/main/java/org/springframework/cheapy/model/package-info.java
index 37d6295e8..620e13c68 100644
--- a/src/main/java/org/springframework/samples/petclinic/model/package-info.java
+++ b/src/main/java/org/springframework/cheapy/model/package-info.java
@@ -17,4 +17,4 @@
 /**
  * The classes in this package represent utilities used by the domain.
  */
-package org.springframework.samples.petclinic.model;
+package org.springframework.cheapy.model;
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/src/main/java/org/springframework/cheapy/repository/OwnerRepository.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
rename to src/main/java/org/springframework/cheapy/repository/OwnerRepository.java
index d6615b5db..67c4d6a9a 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java
+++ b/src/main/java/org/springframework/cheapy/repository/OwnerRepository.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package org.springframework.cheapy.repository;
 
 import java.util.Collection;
 
+import org.springframework.cheapy.model.Owner;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.query.Param;
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/src/main/java/org/springframework/cheapy/system/CacheConfiguration.java
similarity index 97%
rename from src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
rename to src/main/java/org/springframework/cheapy/system/CacheConfiguration.java
index 0a96582c9..d5df44632 100755
--- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
+++ b/src/main/java/org/springframework/cheapy/system/CacheConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.system;
+package org.springframework.cheapy.system;
 
 import javax.cache.configuration.MutableConfiguration;
 
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java b/src/main/java/org/springframework/cheapy/system/CrashController.java
similarity index 93%
rename from src/main/java/org/springframework/samples/petclinic/system/CrashController.java
rename to src/main/java/org/springframework/cheapy/system/CrashController.java
index 2b28600fd..4fb7e15f5 100644
--- a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java
+++ b/src/main/java/org/springframework/cheapy/system/CrashController.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.system;
+package org.springframework.cheapy.system;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * Also see how a view that resolves to "error" has been added ("error.html").
  */
 @Controller
-class CrashController {
+public class CrashController {
 
 	@GetMapping("/oups")
 	public String triggerException() {
diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/cheapy/system/WelcomeController.java
similarity index 93%
rename from src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java
rename to src/main/java/org/springframework/cheapy/system/WelcomeController.java
index 9224015bc..85782e967 100644
--- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java
+++ b/src/main/java/org/springframework/cheapy/system/WelcomeController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.system;
+package org.springframework.cheapy.system;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java b/src/main/java/org/springframework/cheapy/web/OwnerController.java
similarity index 95%
rename from src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
rename to src/main/java/org/springframework/cheapy/web/OwnerController.java
index 4c1e74dbb..e12697ff4 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java
+++ b/src/main/java/org/springframework/cheapy/web/OwnerController.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.samples.petclinic.owner;
+package org.springframework.cheapy.web;
 
+import org.springframework.cheapy.model.Owner;
+import org.springframework.cheapy.repository.OwnerRepository;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -36,7 +38,7 @@ import java.util.Map;
  * @author Michael Isvy
  */
 @Controller
-class OwnerController {
+public class OwnerController {
 
 	private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
 
diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt
index 6225d1208..da0aacccf 100644
--- a/src/main/resources/banner.txt
+++ b/src/main/resources/banner.txt
@@ -1,15 +1,9 @@
-
-
-              |\      _,,,--,,_
-             /,`.-'`'   ._  \-;;,_
-  _______ __|,4-  ) )_   .;.(__`'-'__     ___ __    _ ___ _______
- |       | '---''(_/._)-'(_\_)   |   |   |   |  |  | |   |       |
- |    _  |    ___|_     _|       |   |   |   |   |_| |   |       | __ _ _
- |   |_| |   |___  |   | |       |   |   |   |       |   |       | \ \ \ \
- |    ___|    ___| |   | |      _|   |___|   |  _    |   |      _|  \ \ \ \
- |   |   |   |___  |   | |     |_|       |   | | |   |   |     |_    ) ) ) )
- |___|   |_______| |___| |_______|_______|___|_|  |__|___|_______|  / / / /
- ==================================================================/_/_/_/
+          __^__                                      __^__
+         ( ___ )------------------------------------( ___ )
+          | / |                                      | \ |
+          | / |                Cheapy                | \ |
+          |___|                                      |___|
+         (_____)------------------------------------(_____) 
 
 :: Built with Spring Boot :: ${spring-boot.version}
 
diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html
index f3b207483..3ca576a08 100755
--- a/src/main/resources/templates/fragments/layout.html
+++ b/src/main/resources/templates/fragments/layout.html
@@ -8,9 +8,9 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <link rel="shortcut icon" type="image/x-icon" th:href="@{/resources/images/favicon.png}">
+  <link rel="shortcut icon" type="image/x-icon" th:href="@{/resources/images/cheapy.png}">
 
-  <title>PetClinic :: a Spring Framework demonstration</title>
+  <title>Cheapy</title>
 
   <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
diff --git a/src/main/resources/templates/pets/createOrUpdatePetForm.html b/src/main/resources/templates/pets/createOrUpdatePetForm.html
deleted file mode 100644
index af87f3876..000000000
--- a/src/main/resources/templates/pets/createOrUpdatePetForm.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<html xmlns:th="https://www.thymeleaf.org"
-  th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
-
-<body>
-
-  <h2>
-    <th:block th:if="${pet['new']}">New </th:block>
-    Pet
-  </h2>
-  <form th:object="${pet}" class="form-horizontal" method="post">
-    <input type="hidden" name="id" th:value="*{id}" />
-    <div class="form-group has-feedback">
-      <div class="form-group">
-        <label class="col-sm-2 control-label">Owner</label>
-        <div class="col-sm-10">
-          <span th:text="${pet.owner?.firstName + ' ' + pet.owner?.lastName}" />
-        </div>
-      </div>
-      <input
-        th:replace="~{fragments/inputField :: input ('Name', 'name', 'text')}" />
-      <input
-        th:replace="~{fragments/inputField :: input ('Birth Date', 'birthDate', 'date')}" />
-      <input
-        th:replace="~{fragments/selectField :: select ('Type', 'type', ${types})}" />
-    </div>
-    <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
-        <button
-          th:with="text=${pet['new']} ? 'Add Pet' : 'Update Pet'"
-          class="btn btn-default" type="submit" th:text="${text}">Add
-          Pet</button>
-      </div>
-    </div>
-  </form>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/pets/createOrUpdateVisitForm.html b/src/main/resources/templates/pets/createOrUpdateVisitForm.html
deleted file mode 100644
index ddcbb9d59..000000000
--- a/src/main/resources/templates/pets/createOrUpdateVisitForm.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<html xmlns:th="https://www.thymeleaf.org"
-  th:replace="~{fragments/layout :: layout (~{::body},'owners')}">
-
-<body>
-
-  <h2>
-    <th:block th:if="${visit['new']}">New </th:block>
-    Visit
-  </h2>
-
-  <b>Pet</b>
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th>Birth Date</th>
-        <th>Type</th>
-        <th>Owner</th>
-      </tr>
-    </thead>
-    <tr>
-      <td th:text="${pet.name}"></td>
-      <td
-        th:text="${#temporals.format(pet.birthDate, 'yyyy-MM-dd')}"></td>
-      <td th:text="${pet.type}"></td>
-      <td
-        th:text="${pet.owner?.firstName + ' ' + pet.owner?.lastName}"></td>
-    </tr>
-  </table>
-
-  <form th:object="${visit}" class="form-horizontal" method="post">
-    <div class="form-group has-feedback">
-      <input
-        th:replace="~{fragments/inputField :: input ('Date', 'date', 'date')}"  />
-      <input
-        th:replace="~{fragments/inputField :: input ('Description', 'description', 'text')}" />
-    </div>
-
-    <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
-        <input type="hidden" name="petId" th:value="${pet.id}" />
-        <button class="btn btn-default" type="submit">Add Visit</button>
-      </div>
-    </div>
-  </form>
-
-  <br />
-  <b>Previous Visits</b>
-  <table class="table table-striped">
-    <tr>
-      <th>Date</th>
-      <th>Description</th>
-    </tr>
-    <tr th:if="${!visit['new']}" th:each="visit : ${pet.visits}">
-      <td th:text="${#temporals.format(visit.date, 'yyyy-MM-dd')}"></td>
-      <td th:text=" ${visit.description}"></td>
-    </tr>
-  </table>
-
-</body>
-</html>
diff --git a/src/main/resources/templates/vets/vetList.html b/src/main/resources/templates/vets/vetList.html
deleted file mode 100644
index 4fc961793..000000000
--- a/src/main/resources/templates/vets/vetList.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-
-<html xmlns:th="https://www.thymeleaf.org"
-  th:replace="~{fragments/layout :: layout (~{::body},'vets')}">
-
-<body>
-
-  <h2>Veterinarians</h2>
-
-  <table id="vets" class="table table-striped">
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th>Specialties</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr th:each="vet : ${vets.vetList}">
-        <td th:text="${vet.firstName + ' ' + vet.lastName}"></td>
-        <td><span th:each="specialty : ${vet.specialties}"
-          th:text="${specialty.name + ' '}" /> <span
-          th:if="${vet.nrOfSpecialties == 0}">none</span></td>
-      </tr>
-    </tbody>
-  </table>
-</body>
-</html>
diff --git a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java b/src/test/java/org/springframework/cheapy/integration/PetclinicIntegrationTests.java
similarity index 94%
rename from src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
rename to src/test/java/org/springframework/cheapy/integration/PetclinicIntegrationTests.java
index a5c0a0233..41121f628 100644
--- a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
+++ b/src/test/java/org/springframework/cheapy/integration/PetclinicIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic;
+package org.springframework.cheapy.integration;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/cheapy/model/ValidatorTests.java
similarity index 95%
rename from src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
rename to src/test/java/org/springframework/cheapy/model/ValidatorTests.java
index 8d754900d..2a4aabf49 100644
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
+++ b/src/test/java/org/springframework/cheapy/model/ValidatorTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.model;
+package org.springframework.cheapy.model;
 
 import java.util.Locale;
 import java.util.Set;
@@ -23,6 +23,7 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
 
 import org.junit.jupiter.api.Test;
+import org.springframework.cheapy.model.Person;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
diff --git a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/src/test/java/org/springframework/cheapy/service/EntityUtils.java
similarity index 90%
rename from src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
rename to src/test/java/org/springframework/cheapy/service/EntityUtils.java
index ca8bc41fc..1823217c3 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
+++ b/src/test/java/org/springframework/cheapy/service/EntityUtils.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.service;
+package org.springframework.cheapy.service;
 
 import java.util.Collection;
 
+import org.springframework.cheapy.model.BaseEntity;
 import org.springframework.orm.ObjectRetrievalFailureException;
-import org.springframework.samples.petclinic.model.BaseEntity;
 
 /**
  * Utility methods for handling entities. Separate from the BaseEntity class mainly
@@ -27,7 +27,7 @@ import org.springframework.samples.petclinic.model.BaseEntity;
  *
  * @author Juergen Hoeller
  * @author Sam Brannen
- * @see org.springframework.samples.petclinic.model.BaseEntity
+ * @see org.springframework.cheapy.model.BaseEntity
  * @since 29.10.2003
  */
 public abstract class EntityUtils {
diff --git a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java b/src/test/java/org/springframework/cheapy/system/CrashControllerTests.java
similarity index 94%
rename from src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java
rename to src/test/java/org/springframework/cheapy/system/CrashControllerTests.java
index 6bafc7499..6953f3269 100644
--- a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java
+++ b/src/test/java/org/springframework/cheapy/system/CrashControllerTests.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.system;
+package org.springframework.cheapy.system;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.cheapy.system.CrashController;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/src/test/java/org/springframework/cheapy/web/OwnerControllerTests.java
similarity index 97%
rename from src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
rename to src/test/java/org/springframework/cheapy/web/OwnerControllerTests.java
index ecbcec948..f6963accf 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
+++ b/src/test/java/org/springframework/cheapy/web/OwnerControllerTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.samples.petclinic.owner;
+package org.springframework.cheapy.web;
 
 import java.time.LocalDate;
 import java.util.Collections;
@@ -28,6 +28,8 @@ import org.junit.jupiter.api.Test;
 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.cheapy.model.Owner;
+import org.springframework.cheapy.repository.OwnerRepository;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.hamcrest.Matchers.empty;