diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraRuntimeHintsRegistrar.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraRuntimeHints.java
similarity index 97%
rename from spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraRuntimeHintsRegistrar.java
rename to spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraRuntimeHints.java
index acac96a24..dd8d87ffd 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraRuntimeHintsRegistrar.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraRuntimeHints.java
@@ -35,7 +35,7 @@ import org.springframework.lang.Nullable;
  * @author Mark Paluch
  * @since 4.0
  */
-class CassandraRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
+class CassandraRuntimeHints implements RuntimeHintsRegistrar {
 
 	private static final boolean PROJECT_REACTOR_PRESENT = ReactiveWrappers
 			.isAvailable(ReactiveWrappers.ReactiveLibrary.PROJECT_REACTOR);
diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring/aot.factories b/spring-data-cassandra/src/main/resources/META-INF/spring/aot.factories
index c30649f39..a63fc2196 100644
--- a/spring-data-cassandra/src/main/resources/META-INF/spring/aot.factories
+++ b/spring-data-cassandra/src/main/resources/META-INF/spring/aot.factories
@@ -1,5 +1,5 @@
 org.springframework.aot.hint.RuntimeHintsRegistrar=\
-	org.springframework.data.cassandra.aot.CassandraRuntimeHintsRegistrar
+	org.springframework.data.cassandra.aot.CassandraRuntimeHints
 
 org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
 	org.springframework.data.cassandra.aot.CassandraManagedTypesBeanRegistrationAotProcessor
diff --git a/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/aot/CassandraRuntimeHintsRegistrarUnitTests.java b/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/aot/CassandraRuntimeHintsUnitTests.java
similarity index 91%
rename from spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/aot/CassandraRuntimeHintsRegistrarUnitTests.java
rename to spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/aot/CassandraRuntimeHintsUnitTests.java
index 41a806cb4..d94178487 100644
--- a/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/aot/CassandraRuntimeHintsRegistrarUnitTests.java
+++ b/spring-data-cassandra/src/test/kotlin/org/springframework/data/cassandra/aot/CassandraRuntimeHintsUnitTests.java
@@ -28,16 +28,16 @@ import org.springframework.data.cassandra.repository.support.SimpleCassandraRepo
 import org.springframework.data.cassandra.repository.support.SimpleReactiveCassandraRepository;
 
 /**
- * Unit tests for {@link CassandraRuntimeHintsRegistrar}.
+ * Unit tests for {@link CassandraRuntimeHints}.
  *
  * @author Mark Paluch
  */
-class CassandraRuntimeHintsRegistrarUnitTests {
+class CassandraRuntimeHintsUnitTests {
 
 	@Test // GH-1280
 	void shouldRegisterCassandraHints() {
 
-		CassandraRuntimeHintsRegistrar registrar = new CassandraRuntimeHintsRegistrar();
+		CassandraRuntimeHints registrar = new CassandraRuntimeHints();
 
 		DefaultGenerationContext context = new DefaultGenerationContext(new ClassNameGenerator(Object.class),
 				new InMemoryGeneratedFiles());