diff --git a/cassandra/example/src/main/resources/application.properties b/cassandra/example/src/main/resources/application.properties
index 137ca04d..8a531ae9 100644
--- a/cassandra/example/src/main/resources/application.properties
+++ b/cassandra/example/src/main/resources/application.properties
@@ -1,3 +1,3 @@
-spring.data.cassandra.keyspace-name=example
-spring.data.cassandra.schema-action=recreate
-spring.data.cassandra.local-datacenter=datacenter1
+spring.cassandra.keyspace-name=example
+spring.cassandra.schema-action=recreate
+spring.cassandra.local-datacenter=datacenter1
diff --git a/cassandra/example/src/test/java/example/springdata/cassandra/udt/UserDefinedTypeIntegrationTest.java b/cassandra/example/src/test/java/example/springdata/cassandra/udt/UserDefinedTypeIntegrationTest.java
index c0cdc783..58faa067 100644
--- a/cassandra/example/src/test/java/example/springdata/cassandra/udt/UserDefinedTypeIntegrationTest.java
+++ b/cassandra/example/src/test/java/example/springdata/cassandra/udt/UserDefinedTypeIntegrationTest.java
@@ -32,10 +32,6 @@ import org.springframework.data.cassandra.config.SchemaAction;
 import org.springframework.data.cassandra.core.CassandraAdminOperations;
 import org.springframework.data.cassandra.core.CassandraOperations;
 
-import com.datastax.oss.driver.api.core.data.UdtValue;
-import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
-import com.datastax.oss.driver.api.core.type.UserDefinedType;
-
 /**
  * Integration test to show User-Defined type support.
  *
@@ -51,12 +47,12 @@ class UserDefinedTypeIntegrationTest {
 
 		@Override
 		protected int getPort() {
-			return Integer.getInteger("spring.data.cassandra.port");
+			return Integer.getInteger("spring.cassandra.port");
 		}
 
 		@Override
 		protected String getContactPoints() {
-			return System.getProperty("spring.data.cassandra.contact-points");
+			return System.getProperty("spring.cassandra.contact-points");
 		}
 
 		@Override
diff --git a/cassandra/kotlin/src/main/resources/application.properties b/cassandra/kotlin/src/main/resources/application.properties
index 137ca04d..8a531ae9 100644
--- a/cassandra/kotlin/src/main/resources/application.properties
+++ b/cassandra/kotlin/src/main/resources/application.properties
@@ -1,3 +1,3 @@
-spring.data.cassandra.keyspace-name=example
-spring.data.cassandra.schema-action=recreate
-spring.data.cassandra.local-datacenter=datacenter1
+spring.cassandra.keyspace-name=example
+spring.cassandra.schema-action=recreate
+spring.cassandra.local-datacenter=datacenter1
diff --git a/cassandra/reactive/src/test/resources/application.properties b/cassandra/reactive/src/test/resources/application.properties
index ca11a7f3..888a1951 100644
--- a/cassandra/reactive/src/test/resources/application.properties
+++ b/cassandra/reactive/src/test/resources/application.properties
@@ -1,5 +1,5 @@
-spring.data.cassandra.keyspace-name=example
-spring.data.cassandra.schema-action=recreate
-spring.data.cassandra.local-datacenter=datacenter1
+spring.cassandra.keyspace-name=example
+spring.cassandra.schema-action=recreate
+spring.cassandra.local-datacenter=datacenter1
 logging.level.org.springframework.data.cassandra=INFO
 
diff --git a/cassandra/util/src/main/java/example/springdata/cassandra/util/CassandraExtension.java b/cassandra/util/src/main/java/example/springdata/cassandra/util/CassandraExtension.java
index 1023fc04..8cb4f0ff 100644
--- a/cassandra/util/src/main/java/example/springdata/cassandra/util/CassandraExtension.java
+++ b/cassandra/util/src/main/java/example/springdata/cassandra/util/CassandraExtension.java
@@ -52,8 +52,8 @@ class CassandraExtension implements BeforeAllCallback {
 		var keyspace = store.getOrComputeIfAbsent(CassandraServer.class, it -> {
 
 			CassandraContainer container = runTestcontainer();
-			System.setProperty("spring.data.cassandra.port", "" + container.getMappedPort(9042));
-			System.setProperty("spring.data.cassandra.contact-points", "" + container.getHost());
+			System.setProperty("spring.cassandra.port", "" + container.getMappedPort(9042));
+			System.setProperty("spring.cassandra.contact-points", "" + container.getHost());
 
 			return new CassandraServer(container.getHost(), container.getMappedPort(9042),
 					CassandraServer.RuntimeMode.EMBEDDED_IF_NOT_RUNNING);