diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/aot/JdbcRuntimeHintsRegistrar.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/aot/JdbcRuntimeHints.java
similarity index 97%
rename from spring-data-jdbc/src/main/java/org/springframework/data/jdbc/aot/JdbcRuntimeHintsRegistrar.java
rename to spring-data-jdbc/src/main/java/org/springframework/data/jdbc/aot/JdbcRuntimeHints.java
index 29ecdb0f2..2f9c917bc 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/aot/JdbcRuntimeHintsRegistrar.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/aot/JdbcRuntimeHints.java
@@ -37,7 +37,7 @@ import org.springframework.lang.Nullable;
  * @author Christoph Strobl
  * @since 3.0
  */
-class JdbcRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+class JdbcRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
diff --git a/spring-data-jdbc/src/main/resources/META-INF/spring/aot.factories b/spring-data-jdbc/src/main/resources/META-INF/spring/aot.factories
index e812c48f5..719661141 100644
--- a/spring-data-jdbc/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-data-jdbc/src/main/resources/META-INF/spring/aot.factories
@@ -1,2 +1,2 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-	org.springframework.data.jdbc.aot.JdbcRuntimeHintsRegistrar
+	org.springframework.data.jdbc.aot.JdbcRuntimeHints
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/aot/R2dbcRuntimeHintsRegistrar.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/aot/R2dbcRuntimeHints.java
similarity index 96%
rename from spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/aot/R2dbcRuntimeHintsRegistrar.java
rename to spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/aot/R2dbcRuntimeHints.java
index dbc96899f..57ea097e9 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/aot/R2dbcRuntimeHintsRegistrar.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/aot/R2dbcRuntimeHints.java
@@ -33,7 +33,7 @@ import org.springframework.data.r2dbc.repository.support.SimpleR2dbcRepository;
  * @author Christoph Strobl
  * @since 3.0
  */
-class R2dbcRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+class R2dbcRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
diff --git a/spring-data-r2dbc/src/main/resources/META-INF/spring/aot.factories b/spring-data-r2dbc/src/main/resources/META-INF/spring/aot.factories
index d1dc9c0aa..efebd2938 100644
--- a/spring-data-r2dbc/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-data-r2dbc/src/main/resources/META-INF/spring/aot.factories
@@ -1,2 +1,2 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-	org.springframework.data.r2dbc.aot.R2dbcRuntimeHintsRegistrar
+	org.springframework.data.r2dbc.aot.R2dbcRuntimeHints
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/aot/RelationalManagedTypesBeanRegistrationAotProcessor.java b/spring-data-relational/src/main/java/org/springframework/data/relational/aot/RelationalManagedTypesBeanRegistrationAotProcessor.java
index b2afbcbab..eae969972 100644
--- a/spring-data-relational/src/main/java/org/springframework/data/relational/aot/RelationalManagedTypesBeanRegistrationAotProcessor.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/relational/aot/RelationalManagedTypesBeanRegistrationAotProcessor.java
@@ -28,10 +28,12 @@ import org.springframework.util.ClassUtils;
  */
 class RelationalManagedTypesBeanRegistrationAotProcessor extends ManagedTypesBeanRegistrationAotProcessor {
 
+	@Override
 	protected boolean isMatch(@Nullable Class<?> beanType, @Nullable String beanName) {
 		return this.matchesByType(beanType);
 	}
 
+	@Override
 	protected boolean matchesByType(@Nullable Class<?> beanType) {
 		return beanType != null && ClassUtils.isAssignable(RelationalManagedTypes.class, beanType);
 	}