diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java
similarity index 98%
rename from spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizer.java
rename to spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java
index 7eb350ad87d5..4129048c6f2d 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizer.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizer.java
@@ -42,12 +42,12 @@
 import org.springframework.test.context.MergedContextConfiguration;
 
 /**
- * {@link ContextCustomizer} for {@link SpringBootTest}.
+ * {@link ContextCustomizer} for {@link TestRestTemplate}.
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
  */
-class TestRestTemplateTestContextCustomizer implements ContextCustomizer {
+class TestRestTemplateContextCustomizer implements ContextCustomizer {
 
 	@Override
 	public void customizeContext(ConfigurableApplicationContext context,
diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerFactory.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerFactory.java
similarity index 83%
rename from spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerFactory.java
rename to spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerFactory.java
index 717f84f8dcbe..a6ff19f126cc 100644
--- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerFactory.java
+++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerFactory.java
@@ -25,19 +25,19 @@
 import org.springframework.test.context.ContextCustomizerFactory;
 
 /**
- * {@link ContextCustomizerFactory} for {@link SpringBootTest}.
+ * {@link ContextCustomizerFactory} for {@link TestRestTemplate}.
  *
  * @author Andy Wilkinson
- * @see TestRestTemplateTestContextCustomizer
+ * @see TestRestTemplateContextCustomizer
  */
-class TestRestTemplateTestContextCustomizerFactory implements ContextCustomizerFactory {
+class TestRestTemplateContextCustomizerFactory implements ContextCustomizerFactory {
 
 	@Override
 	public ContextCustomizer createContextCustomizer(Class<?> testClass,
 			List<ContextConfigurationAttributes> configAttributes) {
 		if (AnnotatedElementUtils.findMergedAnnotation(testClass,
 				SpringBootTest.class) != null) {
-			return new TestRestTemplateTestContextCustomizer();
+			return new TestRestTemplateContextCustomizer();
 		}
 		return null;
 	}
diff --git a/spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring.factories
index aec403293e24..dace6b7b70af 100644
--- a/spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-project/spring-boot-test/src/main/resources/META-INF/spring.factories
@@ -4,7 +4,7 @@ org.springframework.boot.test.context.ImportsContextCustomizerFactory,\
 org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory,\
 org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory,\
 org.springframework.boot.test.mock.mockito.MockitoContextCustomizerFactory,\
-org.springframework.boot.test.web.client.TestRestTemplateTestContextCustomizerFactory,\
+org.springframework.boot.test.web.client.TestRestTemplateContextCustomizerFactory,\
 org.springframework.boot.test.web.reactive.server.WebTestClientContextCustomizerFactory
 
 # Test Execution Listeners
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java
similarity index 94%
rename from spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerIntegrationTests.java
rename to spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java
index 2cd5785d3274..4dc6db8607db 100644
--- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerIntegrationTests.java
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerIntegrationTests.java
@@ -40,14 +40,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration test for {@link TestRestTemplateTestContextCustomizer}.
+ * Integration tests for {@link TestRestTemplateContextCustomizer}.
  *
  * @author Phillip Webb
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
-public class TestRestTemplateTestContextCustomizerIntegrationTests {
+public class TestRestTemplateContextCustomizerIntegrationTests {
 
 	@Autowired
 	private TestRestTemplate restTemplate;
diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerWithOverrideIntegrationTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java
similarity index 93%
rename from spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerWithOverrideIntegrationTests.java
rename to spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java
index b03bb7dfd3b1..93393a85e175 100644
--- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTestContextCustomizerWithOverrideIntegrationTests.java
+++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateContextCustomizerWithOverrideIntegrationTests.java
@@ -40,7 +40,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration test for {@link TestRestTemplateTestContextCustomizer} with a custom
+ * Integration tests for {@link TestRestTemplateContextCustomizer} with a custom
  * {@link TestRestTemplate} bean.
  *
  * @author Phillip Webb
@@ -48,7 +48,7 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @DirtiesContext
-public class TestRestTemplateTestContextCustomizerWithOverrideIntegrationTests {
+public class TestRestTemplateContextCustomizerWithOverrideIntegrationTests {
 
 	@Autowired
 	private TestRestTemplate restTemplate;