diff --git a/complete/src/main/java/hello/Greeting.java b/complete/src/main/java/hello/GreetingClass.java
similarity index 91%
rename from complete/src/main/java/hello/Greeting.java
rename to complete/src/main/java/hello/GreetingClass.java
index a92576c..377b7a1 100644
--- a/complete/src/main/java/hello/Greeting.java
+++ b/complete/src/main/java/hello/GreetingClass.java
@@ -1,6 +1,6 @@
 package hello;
 
-public class Greeting {
+public class GreetingClass {
 
     private long id;
     private String content;
diff --git a/complete/src/main/java/hello/GreetingController.java b/complete/src/main/java/hello/GreetingController.java
index b335d8f..fa1d56c 100644
--- a/complete/src/main/java/hello/GreetingController.java
+++ b/complete/src/main/java/hello/GreetingController.java
@@ -11,13 +11,12 @@ public class GreetingController {
 
     @GetMapping("/greeting")
     public String greetingForm(Model model) {
-        model.addAttribute("greeting", new Greeting());
-        return "greeting";
+        model.addAttribute("greeting_attribute", new GreetingClass());
+        return "greeting_template";
     }
 
     @PostMapping("/greeting")
-    public String greetingSubmit(@ModelAttribute Greeting greeting) {
+    public String greetingSubmit(@ModelAttribute GreetingClass result) {
         return "result";
     }
-
 }
diff --git a/complete/src/main/resources/templates/greeting.html b/complete/src/main/resources/templates/greeting.html
deleted file mode 100644
index 8a8ff78..0000000
--- a/complete/src/main/resources/templates/greeting.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML>
-<html xmlns:th="http://www.thymeleaf.org">
-<head> 
-    <title>Getting Started: Handling Form Submission</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-<body>
-	<h1>Form</h1>
-    <form action="#" th:action="@{/greeting}" th:object="${greeting}" method="post">
-    	<p>Id: <input type="text" th:field="*{id}" /></p>
-        <p>Message: <input type="text" th:field="*{content}" /></p>
-        <p><input type="submit" value="Submit" /> <input type="reset" value="Reset" /></p>
-    </form>
-</body>
-</html>
diff --git a/complete/src/main/resources/templates/greeting_template.html b/complete/src/main/resources/templates/greeting_template.html
new file mode 100644
index 0000000..2d05378
--- /dev/null
+++ b/complete/src/main/resources/templates/greeting_template.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title>Getting Started: Handling Form Submission</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<h1>Form</h1>
+<form action="#" th:action="@{/greeting}" th:object="${greeting_attribute}" method="post">
+    <p>Id: <input type="number" th:field="*{id}"/></p>
+    <p>Message: <input type="text" th:field="*{content}"/></p>
+    <p><input type="submit" value="Submit"/> <input type="reset" value="Reset"/></p>
+</form>
+</body>
+</html>
diff --git a/complete/src/main/resources/templates/result.html b/complete/src/main/resources/templates/result.html
index 05131f6..308bd14 100644
--- a/complete/src/main/resources/templates/result.html
+++ b/complete/src/main/resources/templates/result.html
@@ -1,13 +1,13 @@
 <!DOCTYPE HTML>
 <html xmlns:th="http://www.thymeleaf.org">
-<head> 
+<head>
     <title>Getting Started: Handling Form Submission</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-	<h1>Result</h1>
-    <p th:text="'id: ' + ${greeting.id}" />
-    <p th:text="'content: ' + ${greeting.content}" />
-    <a href="/greeting">Submit another message</a>
+<h1>Result</h1>
+<p th:text="'id: ' + ${greetingClass.id}"/>
+<p th:text="'content: ' + ${greetingClass.content}"/>
+<a href="/greeting">Submit another message</a>
 </body>
 </html>
