diff --git a/spring-boot-samples/spring-boot-sample-web-mustache/pom.xml b/spring-boot-samples/spring-boot-sample-web-mustache/pom.xml
index dd060b9feda..3e24643d777 100644
--- a/spring-boot-samples/spring-boot-sample-web-mustache/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-mustache/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<artifactId>spring-boot-sample-web-mustache</artifactId>
 	<name>spring-boot-sample-web-mustache</name>
-	<description>Spring Boot Web FreeMarker Sample</description>
+	<description>Spring Boot Web Mustache Sample</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>
diff --git a/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java
index 2ecbc8c3649..6ec050a5f4e 100644
--- a/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
- * Basic integration tests for FreeMarker application.
+ * Basic integration tests for Mustache application.
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
diff --git a/spring-boot-starters/spring-boot-starter-mustache/pom.xml b/spring-boot-starters/spring-boot-starter-mustache/pom.xml
index 7916970390d..688ee02d9b6 100644
--- a/spring-boot-starters/spring-boot-starter-mustache/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-mustache/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>spring-boot-starter-mustache</artifactId>
 	<name>spring-boot-starter-mustache</name>
-	<description>Spring Boot FreeMarker Starter</description>
+	<description>Spring Boot Mustache Starter</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
 		<name>Pivotal Software, Inc.</name>