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 95275d789b..e4dd924a25 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -31,7 +31,7 @@ content into your application; rather pick only the properties that you need.
     banner.charset=UTF-8 # banner file encoding
     banner.location=classpath:banner.txt # banner file location
 
-	# SPRING CONFIG ({sc-spring-boot}/context/config/ConfigFileEnvironmentPostProcessor.{sc-ext}[ConfigFileEnvironmentPostProcessor])
+	# SPRING CONFIG ({sc-spring-boot}/context/config/ConfigFileApplicationListener.{sc-ext}[ConfigFileApplicationListener])
 	spring.config.name= # config file name (default to 'application')
 	spring.config.location= # location of config file
 
diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc
index 7f2f950afb..379a63ab88 100644
--- a/spring-boot-docs/src/main/asciidoc/howto.adoc
+++ b/spring-boot-docs/src/main/asciidoc/howto.adoc
@@ -188,7 +188,7 @@ extension are also added to the list by default.
 Spring Boot logs the configuration files that are loaded at `DEBUG` level and the
 candidates it has not found at `TRACE` level.
 
-See {sc-spring-boot}/context/config/ConfigFileEnvironmentPostProcessor.{sc-ext}[`ConfigFileEnvironmentPostProcessor`]
+See {sc-spring-boot}/context/config/ConfigFileApplicationListener.{sc-ext}[`ConfigFileApplicationListener`]
 for more detail.
 
 
diff --git a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 6a56f37310..8a98e4b2a8 100644
--- a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -99,14 +99,14 @@
   {
     "name": "spring.config.name",
     "type": "java.lang.String",
-    "sourceType": "org.springframework.boot.context.config.ConfigFileEnvironmentPostProcessor",
+    "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
     "description": "Config file name.",
     "defaultValue": "application"
   },
   {
     "name": "spring.config.location",
     "type": "java.lang.String",
-    "sourceType": "org.springframework.boot.context.config.ConfigFileEnvironmentPostProcessor",
+    "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
     "description": "Config file locations."
   },
   {
@@ -145,13 +145,13 @@
   {
     "name": "spring.profiles.active",
     "type": "java.lang.String",
-    "sourceType": "org.springframework.boot.context.config.ConfigFileEnvironmentPostProcessor",
+    "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
     "description": "Comma-separated list of active profiles. Can be overridden by a command line switch."
   },
   {
     "name": "spring.profiles.include",
     "type": "java.lang.String",
-    "sourceType": "org.springframework.boot.context.config.ConfigFileEnvironmentPostProcessor",
+    "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
     "description": "Unconditionally activate the specified comma separated profiles."
   }
 ],"hints": [