diff --git a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java
index 33888686c2e..8d950b02232 100644
--- a/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java
+++ b/module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConverters.java
@@ -61,7 +61,7 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 	static {
 		List<Class<?>> nonReplacingConverters = new ArrayList<>();
 		addClassIfExists(nonReplacingConverters,
-				"org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter");
+				"org.springframework.hateoas.server.mvc.TypeConstrainedJacksonJsonHttpMessageConverter");
 		NON_REPLACING_CONVERTERS = Collections.unmodifiableList(nonReplacingConverters);
 	}
 
diff --git a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java b/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java
index bf863c04b52..de1eabe0868 100644
--- a/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java
+++ b/module/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilterTests.java
@@ -28,6 +28,7 @@ import org.springframework.context.annotation.FilterType;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
+import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Repository;
@@ -186,8 +187,7 @@ class WebMvcTypeExcludeFilterTests {
 	}
 
 	@SuppressWarnings("removal")
-	static class ExampleMessageConverter
-			extends org.springframework.http.converter.json.MappingJackson2HttpMessageConverter {
+	static class ExampleMessageConverter extends JacksonJsonHttpMessageConverter {
 
 	}
 
diff --git a/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/WebMvcEndpointManagementContextConfiguration.java b/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/WebMvcEndpointManagementContextConfiguration.java
index da2947bb3eb..a5493ef6320 100644
--- a/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/WebMvcEndpointManagementContextConfiguration.java
+++ b/module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/WebMvcEndpointManagementContextConfiguration.java
@@ -160,11 +160,8 @@ public class WebMvcEndpointManagementContextConfiguration {
 
 	/**
 	 * {@link WebMvcConfigurer} to apply {@link EndpointJsonMapper} for
-	 * {@link OperationResponseBody} to
-	 * {@link org.springframework.http.converter.json.MappingJackson2HttpMessageConverter}
-	 * instances.
+	 * {@link OperationResponseBody} to {@link JacksonJsonHttpMessageConverter} instances.
 	 */
-	@SuppressWarnings("removal")
 	static class EndpointJsonMapperWebMvcConfigurer implements WebMvcConfigurer {
 
 		private static final List<MediaType> MEDIA_TYPES = Collections
@@ -177,6 +174,7 @@ public class WebMvcEndpointManagementContextConfiguration {
 		}
 
 		@Override
+		@SuppressWarnings("removal")
 		public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
 			for (HttpMessageConverter<?> converter : converters) {
 				if (converter instanceof JacksonJsonHttpMessageConverter jacksonJsonHttpMessageConverter) {