diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java
index 8a31477b6c3..2c012bbee9e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java
@@ -30,7 +30,7 @@ import de.flapdoodle.embed.mongo.distribution.Feature;
  * @author Andy Wilkinson
  * @since 1.3.0
  */
-@ConfigurationProperties(prefix = "spring.embedded-mongodb")
+@ConfigurationProperties(prefix = "spring.mongodb.embedded")
 public class EmbeddedMongoProperties {
 
 	/**
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
index eef395d155b..486c7941ab2 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
@@ -73,7 +73,7 @@ public class EmbeddedMongoAutoConfigurationTests {
 		this.context = new AnnotationConfigApplicationContext();
 		int mongoPort = findAvailableTcpPort();
 		addEnvironment(this.context, "spring.data.mongodb.port=" + mongoPort,
-				"spring.embedded-mongodb.features=TEXT_SEARCH, SYNC_DELAY");
+				"spring.mongodb.embedded.features=TEXT_SEARCH, SYNC_DELAY");
 		this.context.register(EmbeddedMongoAutoConfiguration.class);
 		this.context.refresh();
 		assertThat(this.context.getBean(EmbeddedMongoProperties.class).getFeatures(),
@@ -100,7 +100,7 @@ public class EmbeddedMongoAutoConfigurationTests {
 		int mongoPort = findAvailableTcpPort();
 		addEnvironment(this.context, "spring.data.mongodb.port=" + mongoPort);
 		if (configuredVersion != null) {
-			addEnvironment(this.context, "spring.embedded-mongodb.version="
+			addEnvironment(this.context, "spring.mongodb.embedded.version="
 					+ configuredVersion);
 		}
 		this.context.register(MongoAutoConfiguration.class,
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index d8d2f5c0559..6fb2183e273 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -335,8 +335,8 @@ content into your application; rather pick only the properties that you need.
 	spring.data.mongodb.field-naming-strategy= # fully qualified name of the FieldNamingStrategy to use
 
 	# EMBEDDED MONGODB ({sc-spring-boot-autoconfigure}/mongo/embedded/EmbeddedMongoProerties.{sc-ext}[EmbeddedMongoProperties])
-	spring.embedded-mongodb.version=2.6.10 # version of Mongo to use
-	spring.embedded-mongodb.features=SYNC_DELAY # comma-separated list of features to enable
+	spring.mongodb.embedded.version=2.6.10 # version of Mongo to use
+	spring.mongodb.embedded.features=SYNC_DELAY # comma-separated list of features to enable
 
 	# JPA ({sc-spring-boot-autoconfigure}/orm/jpa/JpaBaseConfiguration.{sc-ext}[JpaBaseConfiguration], {sc-spring-boot-autoconfigure}/orm/jpa/HibernateJpaAutoConfiguration.{sc-ext}[HibernateJpaAutoConfiguration])
 	spring.jpa.properties.*= # properties to set on the JPA connection