diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 7dc43dd14e8..a1dedb3f24e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1138,7 +1138,7 @@
       }
     }, {
       "name" : "server.session.tracking-modes",
-      "type" : "java.util.Set<org.springframework.boot.autoconfigure.web.ServerProperties.Session.SessionTrackingMode>",
+      "type" : "java.util.Set<org.springframework.boot.web.servlet.server.Session.SessionTrackingMode>",
       "description" : "Session tracking modes (one or more of the following: \"cookie\", \"url\", \"ssl\").",
       "deprecation" : {
         "replacement" : "server.servlet.session.tracking-modes",
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 45b0859c720..5e793af554d 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -218,13 +218,13 @@
       "name": "spring.pid.file",
       "type": "java.lang.String",
       "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
-      "sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
+      "sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
     },
     {
       "name": "spring.pid.fail-on-write-error",
       "type": "java.lang.Boolean",
       "description": "Fails if ApplicationPidFileWriter is used but it cannot write the PID file.",
-      "sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
+      "sourceType": "org.springframework.boot.context.ApplicationPidFileWriter"
     },
     {
       "name": "spring.profiles.active",