diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java
index 82ddd0d8c3..49f552048d 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java
@@ -46,7 +46,7 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguratio
 @ConditionalOnMissingBean(RepositoryRestMvcConfiguration.class)
 @ConditionalOnClass(RepositoryRestMvcConfiguration.class)
 @AutoConfigureAfter(HttpMessageConvertersAutoConfiguration.class)
-@Import(RepositoryRestMvcBootConfiguration.class)
+@Import(SpringBootRepositoryRestMvcConfiguration.class)
 public class RepositoryRestMvcAutoConfiguration {
 
 }
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcBootConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestMvcConfiguration.java
similarity index 95%
rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcBootConfiguration.java
rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestMvcConfiguration.java
index 3997261947..0be878c7a8 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcBootConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestMvcConfiguration.java
@@ -37,7 +37,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * @since 1.2.2
  */
 @Configuration
-public class RepositoryRestMvcBootConfiguration extends RepositoryRestMvcConfiguration {
+public class SpringBootRepositoryRestMvcConfiguration extends
+		RepositoryRestMvcConfiguration {
 
 	@Autowired(required = false)
 	private Jackson2ObjectMapperBuilder objectMapperBuilder;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java
index 01e42efc4b..64c5650a1e 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java
@@ -143,7 +143,7 @@ public class RepositoryRestMvcAutoConfigurationTests {
 
 	}
 
-	@Import({ TestConfiguration.class, RepositoryRestMvcBootConfiguration.class })
+	@Import({ TestConfiguration.class, SpringBootRepositoryRestMvcConfiguration.class })
 	protected static class TestConfigurationWithRestMvcBootConfig {
 
 	}
diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc
index 1c7f00bb28..2891c955d9 100644
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -1486,16 +1486,15 @@ respectively.
 
 [[howto-use-exposing-spring-data-repositories-rest-endpoint]]
 === Expose Spring Data repositories as REST endpoint
-
 Spring Data REST can expose the `Repository` implementations as REST endpoints for you as
 long as Spring MVC has been enabled for the application.
 
 Spring Boot exposes as set of useful properties from the `spring.data.rest` namespace that
-customize the
-{spring-data-rest-javadoc}/core/config/RepositoryRestConfiguration.{dc-ext}[`RepositoryRestConfiguration`].
-If your application requires to define its own `RepositoryRestMvcConfiguration` consider
-extending from `RepositoryRestMvcBootConfiguration` instead as the latter provides namely
-the handling of `spring.data.rest` properties.
+customize the {spring-data-rest-javadoc}/core/config/RepositoryRestConfiguration.{dc-ext}[`RepositoryRestConfiguration`].
+If you need to provide additional customization, you can create a `@Configuration` class
+that extends `SpringBootRepositoryRestMvcConfiguration`. This class supports the same
+functionality as `RepositoryRestMvcConfiguration`, but allows you to continue using
+`spring.data.rest.*` properties.