diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java b/src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
index 0f2575c3f..21ee7097b 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
@@ -46,14 +46,14 @@ public class AddOwnerController {
 	public String setupForm(Model model) {
 		Owner owner = new Owner();
 		model.addAttribute(owner);
-		return "owners/form";
+		return "owners/createOrUpdateOwnerForm";
 	}
 
 	@RequestMapping(method = RequestMethod.POST)
 	public String processSubmit(@ModelAttribute Owner owner, BindingResult result, SessionStatus status) {
 		new OwnerValidator().validate(owner, result);
 		if (result.hasErrors()) {
-			return "owners/form";
+			return "owners/createOrUpdateOwnerForm";
 		}
 		else {
 			this.clinic.storeOwner(owner);
diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddPetController.java b/src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
index 3d429d4bf..99de31506 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
@@ -58,14 +58,14 @@ public class AddPetController {
 		Pet pet = new Pet();
 		owner.addPet(pet);
 		model.addAttribute("pet", pet);
-		return "pets/form";
+		return "pets/createOrUpdatePetForm";
 	}
 
 	@RequestMapping(method = RequestMethod.POST)
 	public String processSubmit(@ModelAttribute("pet") Pet pet, BindingResult result, SessionStatus status) {
 		new PetValidator().validate(pet, result);
 		if (result.hasErrors()) {
-			return "pets/form";
+			return "pets/createOrUpdatePetForm";
 		}
 		else {
 			this.clinic.storePet(pet);
diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java b/src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
index 64a09edd5..f005cff33 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
@@ -50,14 +50,14 @@ public class AddVisitController {
 		Visit visit = new Visit();
 		pet.addVisit(visit);
 		model.addAttribute("visit", visit);
-		return "pets/visitForm";
+		return "pets/createOrUpdateVisitForm";
 	}
 
 	@RequestMapping(method = RequestMethod.POST)
 	public String processSubmit(@ModelAttribute("visit") Visit visit, BindingResult result, SessionStatus status) {
 		new VisitValidator().validate(visit, result);
 		if (result.hasErrors()) {
-			return "pets/visitForm";
+			return "pets/createOrUpdateVisitForm";
 		}
 		else {
 			this.clinic.storeVisit(visit);
diff --git a/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java b/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java
index d624e4dc8..4ffcd7173 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java
@@ -59,7 +59,7 @@ public class ClinicController {
 		Vets vets = new Vets();
 		vets.getVetList().addAll(this.clinic.getVets());
 		model.addAttribute("vets", vets);
-		return "vets";
+		return "vetsList";
 	}
 
 	/**
@@ -70,7 +70,7 @@ public class ClinicController {
 	 */
 	@RequestMapping("/owners/{ownerId}")
 	public ModelAndView showOwner(@PathVariable("ownerId") int ownerId) {
-		ModelAndView mav = new ModelAndView("owners/show");
+		ModelAndView mav = new ModelAndView("owners/ownerDetails");
 		mav.addObject(this.clinic.findOwner(ownerId));
 		return mav;
 	}
diff --git a/src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java b/src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
index 5c830181d..8d396ee88 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
@@ -46,14 +46,14 @@ public class EditOwnerController {
 	public String setupForm(@PathVariable("ownerId") int ownerId, Model model) {
 		Owner owner = this.clinic.findOwner(ownerId);
 		model.addAttribute(owner);
-		return "owners/form";
+		return "owners/createOrUpdateOwnerForm";
 	}
 
 	@RequestMapping(method = RequestMethod.PUT)
 	public String processSubmit(@ModelAttribute Owner owner, BindingResult result, SessionStatus status) {
 		new OwnerValidator().validate(owner, result);
 		if (result.hasErrors()) {
-			return "owners/form";
+			return "owners/createOrUpdateOwnerForm";
 		}
 		else {
 			this.clinic.storeOwner(owner);
diff --git a/src/main/java/org/springframework/samples/petclinic/web/EditPetController.java b/src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
index 129f078fa..0a02fdaf2 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
@@ -54,14 +54,14 @@ public class EditPetController {
 	public String setupForm(@PathVariable("petId") int petId, Model model) {
 		Pet pet = this.clinic.findPet(petId);
 		model.addAttribute("pet", pet);
-		return "pets/form";
+		return "pets/createOrUpdatePetForm";
 	}
 
 	@RequestMapping(method = { RequestMethod.PUT, RequestMethod.POST })
 	public String processSubmit(@ModelAttribute("pet") Pet pet, BindingResult result, SessionStatus status) {
 		new PetValidator().validate(pet, result);
 		if (result.hasErrors()) {
-			return "pets/form";
+			return "pets/createOrUpdatePetForm";
 		}
 		else {
 			this.clinic.storePet(pet);
diff --git a/src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java b/src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
index 13d9eb1ca..d0b0cefcf 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
@@ -38,10 +38,10 @@ public class FindOwnersController {
 		dataBinder.setDisallowedFields("id");
 	}
 
-	@RequestMapping(value = "/owners/search", method = RequestMethod.GET)
+	@RequestMapping(value = "/owners/find", method = RequestMethod.GET)
 	public String setupForm(Model model) {
 		model.addAttribute("owner", new Owner());
-		return "owners/search";
+		return "owners/findOwners";
 	}
 
 	@RequestMapping(value = "/owners", method = RequestMethod.GET)
@@ -57,12 +57,12 @@ public class FindOwnersController {
 		if (results.size() < 1) {
 			// no owners found
 			result.rejectValue("lastName", "notFound", "not found");
-			return "owners/search";
+			return "owners/findOwners";
 		}
 		if (results.size() > 1) {
 			// multiple owners found
 			model.addAttribute("selections", results);
-			return "owners/list";
+			return "owners/ownersList";
 		}
 		else {
 			// 1 owner found
diff --git a/src/main/webapp/WEB-INF/jsp/owners/form.jsp b/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/owners/form.jsp
rename to src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/owners/search.jsp b/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/owners/search.jsp
rename to src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/owners/show.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/owners/show.jsp
rename to src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/owners/list.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/owners/list.jsp
rename to src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/pets/form.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/pets/form.jsp
rename to src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
similarity index 97%
rename from src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp
rename to src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
index 871c99a85..22ad647f7 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp
@@ -18,7 +18,7 @@
 		
 		<form:form modelAttribute="visit">
 		  <b>Pet:</b>
-		  <table width="333">
+		  <table  class="table table-striped">
 		    <thead>
 		    	<tr>
 			      <th>Name</th>
@@ -35,7 +35,7 @@
 		    </tr>
 		  </table>
 		
-		  <table width="333">
+		  <table class="table">
 		    <tr>
 		      <th>
 		        Date:
diff --git a/src/main/webapp/WEB-INF/jsp/vets.jsp b/src/main/webapp/WEB-INF/jsp/vetsList.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/vets.jsp
rename to src/main/webapp/WEB-INF/jsp/vetsList.jsp
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
index 89e2f2e7c..63d5aacfd 100644
--- a/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -14,7 +14,7 @@
 		<h2><fmt:message key="welcome"/></h2>
 		
 		<ul class="unstyled">
-		  <li><a href="<spring:url value="/owners/search.html" htmlEscape="true" />">Find owner</a></li>
+		  <li><a href="<spring:url value="/owners/find.html" htmlEscape="true" />">Find owner</a></li>
 		  <li><a href="<spring:url value="/vets.html" htmlEscape="true" />">Display all veterinarians</a></li>
 		  <li><a href="<spring:url value="/resources/html/tutorial.html" htmlEscape="true" />">Tutorial</a></li>
 		</ul>
diff --git a/src/main/webapp/WEB-INF/petclinic-servlet.xml b/src/main/webapp/WEB-INF/petclinic-servlet.xml
index 7cca8f3e1..153fd456e 100644
--- a/src/main/webapp/WEB-INF/petclinic-servlet.xml
+++ b/src/main/webapp/WEB-INF/petclinic-servlet.xml
@@ -40,8 +40,8 @@
                     <bean class="org.springframework.web.accept.PathExtensionContentNegotiationStrategy">
                         <constructor-arg>
                             <map>
-				 				<entry key="xml" value="#{vets.contentType}"/>
-								<entry key="atom" value="#{visits.contentType}"/>
+				 				<entry key="xml" value="#{vetsList.contentType}"/>
+								<entry key="atom" value="#{visitsList.contentType}"/>
                            </map>
                         </constructor-arg>
                     </bean>
@@ -121,9 +121,9 @@
 	
 	<!-- 	- The AtomView rendering a Atom feed of the visits  -->
 	 
-	<bean id="visits" class="org.springframework.samples.petclinic.web.VisitsAtomView"/>
+	<bean id="visitsList" class="org.springframework.samples.petclinic.web.VisitsAtomView"/>
 
-	<bean id="vets" class="org.springframework.web.servlet.view.xml.MarshallingView">
+	<bean id="vetsList" class="org.springframework.web.servlet.view.xml.MarshallingView">
 		<property name="contentType" value="application/vnd.springsource.samples.petclinic+xml"/>
 		<property name="marshaller" ref="marshaller"/>
 	</bean>