diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/resources/templates.xml b/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/resources/templates.xml
index 37b2593bd..0f8aaaea9 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/resources/templates.xml
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/resources/templates.xml
@@ -264,7 +264,7 @@ public ${SomeData} ${getMethodName}(@RequestParam ${String} ${param}) {
 	description="PostMapping method" 
 	enabled="true" 
 	>${x:import(org.springframework.web.bind.annotation.PostMapping, org.springframework.web.bind.annotation.RequestBody)}@PostMapping(value="${path}")
-public ${SomeEnityData} ${postMethodName}(@RequestBody ${SomeEnityData} ${entity}) {
+public ${SomeEntityData} ${postMethodName}(@RequestBody ${SomeEntityData} ${entity}) {
 	//TODO: process POST request
 	${cursor}
 	return ${entity};
@@ -277,7 +277,7 @@ public ${SomeEnityData} ${postMethodName}(@RequestBody ${SomeEnityData} ${entity
 	description="PutMapping method" 
 	enabled="true" 
 	>${x:import(org.springframework.web.bind.annotation.PutMapping, org.springframework.web.bind.annotation.RequestBody, org.springframework.web.bind.annotation.PathVariable)}@PutMapping(value="${path}/{${id}}")
-public ${SomeEnityData} ${putMethodName}(@PathVariable ${pvt:link(String,int,long)} ${id}, @RequestBody ${SomeEnityData} ${entity}) {
+public ${SomeEntityData} ${putMethodName}(@PathVariable ${pvt:link(String,int,long)} ${id}, @RequestBody ${SomeEntityData} ${entity}) {
 	//TODO: process PUT request
 	${cursor}
 	return ${entity};
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/eclipse-templates.xml b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/eclipse-templates.xml
index 29f2785cc..75daa4e82 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/eclipse-templates.xml
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/eclipse-templates.xml
@@ -26,8 +26,8 @@
 		context="boot-members" description="PostMapping method" enabled="true">
 		${x:import(org.springframework.web.bind.annotation.PostMapping,
 		org.springframework.web.bind.annotation.RequestBody)}@PostMapping(value="${path}")
-		public ${SomeEnityData} ${postMethodName}(@RequestBody
-		${SomeEnityData} ${entity}) {
+		public ${SomeEntityData} ${postMethodName}(@RequestBody
+		${SomeEntityData} ${entity}) {
 		//TODO: process POST request
 		${cursor}
 		return ${entity};
@@ -39,8 +39,8 @@
 		${x:import(org.springframework.web.bind.annotation.PutMapping,
 		org.springframework.web.bind.annotation.RequestBody,
 		org.springframework.web.bind.annotation.PathVariable)}@PutMapping(value="${path}/{${id}}")
-		public ${SomeEnityData} ${putMethodName}(@PathVariable
-		${pvt:link(String,int,long)} ${id}, @RequestBody ${SomeEnityData}
+		public ${SomeEntityData} ${putMethodName}(@PathVariable
+		${pvt:link(String,int,long)} ${id}, @RequestBody ${SomeEntityData}
 		${entity}) {
 		//TODO: process PUT request
 		${cursor}