diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java b/src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
similarity index 95%
rename from src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
index cd830aff6fbe14d1f03793af926fcb72c638e007..0f2575c3f94e036936d9b35100ec2604404ae204 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddOwnerController.java
@@ -27,13 +27,13 @@ import org.springframework.web.bind.support.SessionStatus;
 @Controller
 @RequestMapping("/owners/new")
 @SessionAttributes(types = Owner.class)
-public class AddOwnerForm {
+public class AddOwnerController {
 
 	private final Clinic clinic;
 
 
 	@Autowired
-	public AddOwnerForm(Clinic clinic) {
+	public AddOwnerController(Clinic clinic) {
 		this.clinic = clinic;
 	}
 
diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java b/src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
index 586cf3d67c5eead7b5144b9dc7f0d740e7586f34..314b301b1437a3f243e4a80c8efd43168c545acc 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddPetController.java
@@ -32,13 +32,13 @@ import org.springframework.web.bind.support.SessionStatus;
 @Controller
 @RequestMapping("/owners/{ownerId}/pets/new")
 @SessionAttributes("pet")
-public class AddPetForm {
+public class AddPetController {
 
 	private final Clinic clinic;
 
 
 	@Autowired
-	public AddPetForm(Clinic clinic) {
+	public AddPetController(Clinic clinic) {
 		this.clinic = clinic;
 	}
 
diff --git a/src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java b/src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
index 68368644026b9e1d1ffba76c11644325c984829f..93125687990e23d6c6a705e99f9502c7fd71d3b2 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/AddVisitController.java
@@ -29,13 +29,13 @@ import org.springframework.web.bind.support.SessionStatus;
 @Controller
 @RequestMapping("/owners/*/pets/{petId}/visits/new")
 @SessionAttributes("visit")
-public class AddVisitForm {
+public class AddVisitController {
 
 	private final Clinic clinic;
 
 
 	@Autowired
-	public AddVisitForm(Clinic clinic) {
+	public AddVisitController(Clinic clinic) {
 		this.clinic = clinic;
 	}
 
diff --git a/src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java b/src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
index 0b65de51bf69e1ab01b225422ccd1769c0a56210..e602f75fd268ba7874ba96eac0dc29fa71fa1e12 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/EditOwnerController.java
@@ -27,13 +27,13 @@ import org.springframework.web.bind.support.SessionStatus;
 @Controller
 @RequestMapping("/owners/{ownerId}/edit")
 @SessionAttributes(types = Owner.class)
-public class EditOwnerForm {
+public class EditOwnerController {
 
 	private final Clinic clinic;
 
 
 	@Autowired
-	public EditOwnerForm(Clinic clinic) {
+	public EditOwnerController(Clinic clinic) {
 		this.clinic = clinic;
 	}
 
diff --git a/src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java b/src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
index 1a7fd6ed3c624249e47d59896cb72545724c7aa4..c7703c1e9f29c8afadfefef3123ed2216fcfc3ab 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/EditPetController.java
@@ -30,13 +30,13 @@ import org.springframework.web.bind.support.SessionStatus;
 @Controller
 @RequestMapping("/owners/*/pets/{petId}/edit")
 @SessionAttributes("pet")
-public class EditPetForm {
+public class EditPetController {
 
 	private final Clinic clinic;
 
 
 	@Autowired
-	public EditPetForm(Clinic clinic) {
+	public EditPetController(Clinic clinic) {
 		this.clinic = clinic;
 	}
 
diff --git a/src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java b/src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
similarity index 96%
rename from src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java
rename to src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
index eb93fabad0a44a970f14a62be79c2da92c58d56c..13d9eb1ca236624a53e520b3142e8b3d07743be7 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/FindOwnersController.java
@@ -23,13 +23,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
  * @author Arjen Poutsma
  */
 @Controller
-public class FindOwnersForm {
+public class FindOwnersController {
 
 	private final Clinic clinic;
 
 
 	@Autowired
-	public FindOwnersForm(Clinic clinic) {
+	public FindOwnersController(Clinic clinic) {
 		this.clinic = clinic;
 	}
 
diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml
index 13330e6ff243d7c96c7d19b9e481c048ea44ff02..56c78c7e9243d16cb6a6f79122909591246433e5 100755
--- a/src/main/resources/log4j.xml
+++ b/src/main/resources/log4j.xml
@@ -15,6 +15,10 @@
 		<level value="DEBUG" />
 	</logger>
 	
+	<logger name="org.springframework.web">
+		<level value="DEBUG" />
+	</logger>
+	
 
 	
 	<!-- Root Logger -->
diff --git a/src/main/webapp/resources/html/tutorial.html b/src/main/webapp/resources/html/tutorial.html
index acc261fb1cf1d2ac8c070fbaa381771b00867453..40652fe4683d2316a0463e45dde2c7e2a6256967 100644
--- a/src/main/webapp/resources/html/tutorial.html
+++ b/src/main/webapp/resources/html/tutorial.html
@@ -819,32 +819,32 @@
 		that is used to handle simple display-oriented URLs.
 	  </li>
 	  <li>
-		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.FindOwnersForm</span>
+		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.FindOwnersController</span>
 		is an annotation-driven, POJO <em>Form</em> controller that is used to search for
 		<strong>Owner</strong>s by last name.
 	  </li>
 	  <li>
-		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddOwnerForm</span>
+		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddOwnerController</span>
 		is an annotation-driven, POJO <em>Form</em> controller that is used to add a new <strong>Owner</strong>
 		to the system.
 	  </li>
 	  <li>
-		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.EditOwnerForm</span>
+		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.EditOwnerController</span>
 		is an annotation-driven, POJO <em>Form</em> controller that is used to edit an existing <strong>Owner</strong>.
 		A copy of the existing <strong>Owner</strong> is used for editing.
 	  </li>
 	  <li>
-		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddPetForm</span>
+		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddPetController</span>
 		is an annotation-driven, POJO <em>Form</em> controller that is used to add a new <strong>Pet</strong>
 		to an existing <strong>Owner</strong>.
 	  </li>
 	  <li>
-		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.EditPetForm</span>
+		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.EditPetController</span>
 		is an annotation-driven, POJO <em>Form</em> controller that is used to edit an existing <strong>Pet</strong>.
 		A copy of the existing <strong>Pet</strong> is used for editing.
 	  </li>
 	  <li>
-		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddVisitForm</span>
+		<span style="font-weight: bold; font-style: italic;">org.springframework.samples.petclinic.web.AddVisitController</span>
 		is an annotation-driven, POJO <em>Form</em> controller that is used to add a new <strong>Visit</strong>
 		to an existing <strong>Pet</strong>.
 	  </li>