diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
index 8d37d33fbdb..161a03869cc 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
@@ -63,14 +63,14 @@ public class CassandraAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@Lazy
-	public CqlSession cqlSession(CqlSessionBuilder cqlSessionBuilder) {
+	public CqlSession cassandraSession(CqlSessionBuilder cqlSessionBuilder) {
 		return cqlSessionBuilder.build();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
-	public CqlSessionBuilder cqlSessionBuilder(CassandraProperties properties, DriverConfigLoader driverConfigLoader,
-			ObjectProvider<CqlSessionBuilderCustomizer> builderCustomizers) {
+	public CqlSessionBuilder cassandraSessionBuilder(CassandraProperties properties,
+			DriverConfigLoader driverConfigLoader, ObjectProvider<CqlSessionBuilderCustomizer> builderCustomizers) {
 		CqlSessionBuilder builder = CqlSession.builder().withConfigLoader(driverConfigLoader);
 		configureSsl(properties, builder);
 		builder.withKeyspace(properties.getKeyspaceName());
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java
index 8f29bd9143f..557a58d1dc7 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java
@@ -96,7 +96,7 @@ public class CassandraDataAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(SessionFactory.class)
-	public SessionFactoryFactoryBean cassandraSession(Environment environment, CassandraConverter converter) {
+	public SessionFactoryFactoryBean cassandraSessionFactory(Environment environment, CassandraConverter converter) {
 		SessionFactoryFactoryBean session = new SessionFactoryFactoryBean();
 		session.setSession(this.session);
 		session.setConverter(converter);