From 26364c27e27389c23de07d44900367e15a62e982 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Tue, 30 Sep 2025 16:39:23 +0100
Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=A6DataAutoConfiguration=20to=20?=
 =?UTF-8?q?Data=E2=80=A6AutoConfiguration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes gh-47049
---
 .../cache/metrics/RedisCacheMetricsTests.java |  4 +-
 .../autoconfigure/CacheAutoConfiguration.java |  4 +-
 ...nfigure.AutoConfigureDataCassandra.imports |  8 ++--
 ...draAutoConfigurationIntegrationTests.java} |  6 +--
 ...va => DataCassandraAutoConfiguration.java} |  4 +-
 ...taCassandraReactiveAutoConfiguration.java} |  4 +-
 ...eactiveRepositoriesAutoConfiguration.java} |  6 +--
 ...ssandraReactiveRepositoriesRegistrar.java} |  2 +-
 ...ssandraRepositoriesAutoConfiguration.java} |  4 +-
 ...> DataCassandraRepositoriesRegistrar.java} |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  8 ++--
 ... DataCassandraAutoConfigurationTests.java} |  8 ++--
 ...sandraReactiveAutoConfigurationTests.java} |  8 ++--
 ...veRepositoriesAutoConfigurationTests.java} | 13 ++++---
 ...raRepositoriesAutoConfigurationTests.java} |  8 ++--
 ...taRepositoryMetricsAutoConfiguration.java} |  4 +-
 ...ion.java => DataWebAutoConfiguration.java} | 10 ++---
 ...Properties.java => DataWebProperties.java} |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  4 +-
 ....autoconfigure.AutoConfigureWebMvc.imports |  2 +-
 ...icsAutoConfigurationIntegrationTests.java} |  6 +--
 ...ositoryMetricsAutoConfigurationTests.java} | 10 ++---
 ...ocationListenerBeanPostProcessorTests.java |  2 +-
 ...ava => DataWebAutoConfigurationTests.java} | 10 ++---
 ...=> DataWebWebMvcTestIntegrationTests.java} |  4 +-
 ...nfigure.AutoConfigureDataCouchbase.imports |  8 ++--
 ...va => DataCouchbaseAutoConfiguration.java} |  4 +-
 ...n.java => DataCouchbaseConfiguration.java} |  2 +-
 ...taCouchbaseReactiveAutoConfiguration.java} |  6 +--
 ...> DataCouchbaseReactiveConfiguration.java} |  2 +-
 ...eactiveRepositoriesAutoConfiguration.java} |  6 +--
 ...uchbaseReactiveRepositoriesRegistrar.java} |  2 +-
 ...uchbaseRepositoriesAutoConfiguration.java} |  4 +-
 ...> DataCouchbaseRepositoriesRegistrar.java} |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  8 ++--
 ... DataCouchbaseAutoConfigurationTests.java} |  6 +--
 ...veRepositoriesAutoConfigurationTests.java} | 12 +++---
 ...chbaseReactiveAutoConfigurationTests.java} |  6 +--
 ...veRepositoriesAutoConfigurationTests.java} | 12 +++---
 ...seRepositoriesAutoConfigurationTests.java} |  8 ++--
 ...ure.AutoConfigureDataElasticsearch.imports |  6 +--
 ...veRepositoriesAutoConfigurationTests.java} |  8 ++--
 ...chRepositoriesAutoConfigurationTests.java} |  8 ++--
 ...> DataElasticsearchAutoConfiguration.java} |  8 ++--
 ...va => DataElasticsearchConfiguration.java} |  2 +-
 ...eactiveRepositoriesAutoConfiguration.java} |  4 +-
 ...csearchReactiveRepositoriesRegistrar.java} |  2 +-
 ...csearchRepositoriesAutoConfiguration.java} |  4 +-
 ...taElasticsearchRepositoriesRegistrar.java} |  2 +-
 ...veHealthContributorAutoConfiguration.java} | 14 +++----
 ...ElasticsearchReactiveHealthIndicator.java} |  4 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  8 ++--
 ...aElasticsearchAutoConfigurationTests.java} |  6 +--
 ...lthContributorAutoConfigurationTests.java} | 18 ++++-----
 ...icsearchReactiveHealthIndicatorTests.java} |  8 ++--
 ...utoconfigure.AutoConfigureDataJdbc.imports |  2 +-
 ...lect.java => DataJdbcDatabaseDialect.java} |  4 +-
 .../autoconfigure/DataJdbcProperties.java     |  6 +--
 ...ataJdbcRepositoriesAutoConfiguration.java} |  6 +--
 ...ava => DataJdbcRepositoriesRegistrar.java} |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  2 +-
 ...bcRepositoriesAutoConfigurationTests.java} |  6 +--
 ...autoconfigure.AutoConfigureDataJpa.imports |  2 +-
 ...DataJpaRepositoriesAutoConfiguration.java} |  6 +--
 ...java => DataJpaRepositoriesRegistrar.java} |  2 +-
 .../EnversRevisionRepositoriesRegistrar.java  |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  2 +-
 ...paRepositoriesAutoConfigurationTests.java} |  6 +--
 ...paRepositoriesAutoConfigurationTests.java} |  6 +--
 ...EnversRevisionAutoConfigurationTests.java} |  5 ++-
 ...hSpringDataWebAutoConfigurationTests.java} | 10 ++---
 ...utoconfigure.AutoConfigureDataLdap.imports |  2 +-
 ...ataLdapRepositoriesAutoConfiguration.java} |  4 +-
 ...ava => DataLdapRepositoriesRegistrar.java} |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  2 +-
 ...apRepositoriesAutoConfigurationTests.java} |  8 ++--
 ...toconfigure.AutoConfigureDataMongo.imports |  8 ++--
 ...n.java => DataMongoAutoConfiguration.java} |  4 +-
 ...ation.java => DataMongoConfiguration.java} |  4 +-
 ...> DataMongoReactiveAutoConfiguration.java} |  4 +-
 ...eactiveRepositoriesAutoConfiguration.java} |  6 +--
 ...taMongoReactiveRepositoriesRegistrar.java} |  2 +-
 ...taMongoRepositoriesAutoConfiguration.java} |  6 +--
 ...va => DataMongoRepositoriesRegistrar.java} |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  8 ++--
 ...a => DataMongoAutoConfigurationTests.java} | 10 ++---
 .../DataMongoPropertiesTests.java             |  2 +-
 ...ngRepositoriesAutoConfigurationTests.java} | 10 ++---
 ...aMongoReactiveAutoConfigurationTests.java} | 10 ++---
 ...veRepositoriesAutoConfigurationTests.java} | 14 +++----
 ...goRepositoriesAutoConfigurationTests.java} | 12 +++---
 ...toconfigure.AutoConfigureDataNeo4j.imports |  8 ++--
 ...riesAutoConfigurationIntegrationTests.java |  4 +-
 ...n.java => DataNeo4jAutoConfiguration.java} |  2 +-
 ...> DataNeo4jReactiveAutoConfiguration.java} |  4 +-
 ...eactiveRepositoriesAutoConfiguration.java} |  6 +--
 ...taNeo4jReactiveRepositoriesRegistrar.java} |  2 +-
 ...taNeo4jRepositoriesAutoConfiguration.java} |  6 +--
 ...va => DataNeo4jRepositoriesRegistrar.java} |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  8 ++--
 ...a => DataNeo4jAutoConfigurationTests.java} |  6 +--
 ...aNeo4jReactiveAutoConfigurationTests.java} | 10 ++---
 ...veRepositoriesAutoConfigurationTests.java} | 12 +++---
 ...4jRepositoriesAutoConfigurationTests.java} |  8 ++--
 ...toconfigure.AutoConfigureDataR2dbc.imports |  4 +-
 ...n.java => DataR2dbcAutoConfiguration.java} |  4 +-
 ...taR2dbcRepositoriesAutoConfiguration.java} |  6 +--
 ...bcRepositoriesAutoConfigureRegistrar.java} |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  4 +-
 ...a => DataR2dbcAutoConfigurationTests.java} |  6 +--
 ...bcRepositoriesAutoConfigurationTests.java} | 10 ++---
 ...toconfigure.AutoConfigureDataRedis.imports |  6 +--
 ...isRepositoriesAutoConfigurationTests.java} | 18 ++++-----
 ...ectionDetailsFactoryIntegrationTests.java} | 16 ++++----
 ...ontainerConnectionDetailsFactoryTests.java |  6 +--
 ...ontainerConnectionDetailsFactoryTests.java |  8 ++--
 ...ontainerConnectionDetailsFactoryTests.java |  8 ++--
 ...ontainerConnectionDetailsFactoryTests.java |  8 ++--
 ...n.java => DataRedisAutoConfiguration.java} | 10 ++---
 ... => DataRedisConnectionConfiguration.java} | 29 +++++++-------
 ...s.java => DataRedisConnectionDetails.java} |  2 +-
 ...operties.java => DataRedisProperties.java} |  2 +-
 ...> DataRedisReactiveAutoConfiguration.java} |  4 +-
 ...taRedisRepositoriesAutoConfiguration.java} |  6 +--
 ...va => DataRedisRepositoriesRegistrar.java} |  2 +-
 .../{RedisUrl.java => DataRedisUrl.java}      | 12 +++---
 ....java => DataRedisUrlSyntaxException.java} |  6 +--
 ...=> DataRedisUrlSyntaxFailureAnalyzer.java} |  6 +--
 .../JedisConnectionConfiguration.java         | 13 ++++---
 .../LettuceConnectionConfiguration.java       | 12 +++---
 ...PropertiesDataRedisConnectionDetails.java} | 32 +++++++--------
 ...isHealthContributorAutoConfiguration.java} | 18 +++++----
 ...veHealthContributorAutoConfiguration.java} | 16 ++++----
 .../LettuceMetricsAutoConfiguration.java      |  6 ++-
 .../autoconfigure/metrics/package-info.java   | 23 +++++++++++
 ...DockerComposeConnectionDetailsFactory.java | 16 ++++----
 ...{RedisHealth.java => DataRedisHealth.java} |  8 ++--
 ...tor.java => DataRedisHealthIndicator.java} |  8 ++--
 ... => DataRedisReactiveHealthIndicator.java} |  8 ++--
 ...edisContainerConnectionDetailsFactory.java | 16 ++++----
 ...itional-spring-configuration-metadata.json |  2 +-
 .../main/resources/META-INF/spring.factories  |  2 +-
 ...ot.autoconfigure.AutoConfiguration.imports | 12 +++---
 ...DataRedisAutoConfigurationJedisTests.java} | 10 ++---
 ...ationLettuceWithoutCommonsPool2Tests.java} |  7 ++--
 ...a => DataRedisAutoConfigurationTests.java} | 39 ++++++++++---------
 ...aRedisReactiveAutoConfigurationTests.java} |  8 ++--
 ...PropertiesRedisConnectionDetailsTests.java | 38 +++++++++---------
 .../autoconfigure/RedisPropertiesTests.java   |  6 +--
 .../RedisUrlSyntaxFailureAnalyzerTests.java   | 18 ++++-----
 ...althContributorAutoConfigurationTests.java | 20 +++++-----
 ...althContributorAutoConfigurationTests.java | 22 +++++------
 .../LettuceMetricsAutoConfigurationTests.java | 11 +++---
 .../health/RedisHealthIndicatorTests.java     | 16 ++++----
 .../RedisReactiveHealthIndicatorTests.java    | 18 ++++-----
 ...on.java => DataRestAutoConfiguration.java} | 14 +++----
 ...roperties.java => DataRestProperties.java} |  2 +-
 .../SpringBootRepositoryRestConfigurer.java   |  4 +-
 ...ot.autoconfigure.AutoConfiguration.imports |  2 +-
 ...va => DataRestAutoConfigurationTests.java} | 10 ++---
 ...ssionDataMongoAutoConfigurationTests.java} | 10 ++---
 ...aMongoReactiveAutoConfigurationTests.java} | 12 +++---
 ...=> SessionDataMongoAutoConfiguration.java} |  8 ++--
 ...ot.autoconfigure.AutoConfiguration.imports |  2 +-
 ...ssionDataRedisAutoConfigurationTests.java} | 17 ++++----
 ...aRedisReactiveAutoConfigurationTests.java} | 14 +++----
 ...=> SessionDataRedisAutoConfiguration.java} |  8 ++--
 ...ot.autoconfigure.AutoConfiguration.imports |  2 +-
 ...AbstractSessionAutoConfigurationTests.java |  2 +-
 ...essionReactiveAutoConfigurationTests.java} |  2 +-
 settings.gradle                               | 10 ++---
 ...CassandraApplicationReactiveSslTests.java} |  4 +-
 ...mpleDataCassandraApplicationSslTests.java} |  4 +-
 ...va => SampleDataCassandraApplication.java} |  2 +-
 ...CouchbaseApplicationReactiveSslTests.java} |  4 +-
 ...mpleDataCouchbaseApplicationSslTests.java} |  2 +-
 ...va => SampleDataCouchbaseApplication.java} |  2 +-
 ...pleDataElasticsearchApplicationTests.java} |  4 +-
 ...DataElasticsearchSslApplicationTests.java} |  4 +-
 ...chWithElasticsearch8ApplicationTests.java} |  4 +-
 ...chWithElasticsearch9ApplicationTests.java} |  4 +-
 ...> SampleDataElasticsearchApplication.java} |  4 +-
 ...on.java => SampleDataLdapApplication.java} |  6 +--
 ...va => SampleDataLdapApplicationTests.java} |  4 +-
 .../build.gradle                              |  0
 ...DataMongoApplicationReactiveSslTests.java} |  6 +--
 .../SampleMongoApplicationSslTests.java       |  4 +-
 .../data/mongodb}/SecureMongoContainer.java   |  2 +-
 .../mongodb/SampleDataMongoApplication.java}  |  4 +-
 .../data/mongodb}/SampleDocument.java         |  2 +-
 .../mongodb}/SampleReactiveRepository.java    |  2 +-
 .../data/mongodb}/SampleRepository.java       |  2 +-
 .../data/mongodb}/SampleService.java          |  2 +-
 .../smoketest/data/mongodb}/package-info.java |  2 +-
 .../src/test/resources/ssl/test-ca.crt        |  0
 .../src/test/resources/ssl/test-ca.key        |  0
 .../src/test/resources/ssl/test-client.crt    |  0
 .../src/test/resources/ssl/test-client.key    |  0
 .../src/test/resources/ssl/test-server.pem    |  0
 .../build.gradle                              |  0
 ...leSessionWebFluxMongoApplicationTests.java |  0
 .../session/HelloRestController.java          |  0
 .../SampleSessionWebFluxMongoApplication.java |  0
 .../java/smoketest/session/package-info.java  |  0
 .../src/main/resources/application.properties |  0
 .../build.gradle                              |  0
 .../SampleSessionMongoApplicationTests.java   |  0
 .../SampleSessionMongoApplication.java        |  0
 .../mongodb/SecurityConfiguration.java        |  0
 .../session/mongodb/package-info.java         |  0
 .../src/main/resources/application.properties |  0
 .../build.gradle                              |  0
 ...leSessionWebFluxRedisApplicationTests.java |  0
 .../session/HelloRestController.java          |  0
 .../SampleSessionWebFluxRedisApplication.java |  0
 .../java/smoketest/session/package-info.java  |  0
 .../src/main/resources/application.properties |  0
 .../build.gradle                              |  0
 .../SampleSessionRedisApplicationTests.java   |  0
 ...esImportSampleSessionRedisApplication.java |  0
 ...opertiesSampleSessionRedisApplication.java |  0
 ...onImportSampleSessionRedisApplication.java |  0
 ...nnectionSampleSessionRedisApplication.java |  0
 .../redis/SampleSessionRedisApplication.java  |  0
 .../session/redis/SecurityConfiguration.java  |  0
 .../smoketest/session/redis/package-info.java |  0
 .../src/main/resources/application.properties |  0
 227 files changed, 709 insertions(+), 674 deletions(-)
 rename module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraDataAutoConfigurationIntegrationTests.java => DataCassandraAutoConfigurationIntegrationTests.java} (94%)
 rename module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraDataAutoConfiguration.java => DataCassandraAutoConfiguration.java} (98%)
 rename module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraReactiveDataAutoConfiguration.java => DataCassandraReactiveAutoConfiguration.java} (96%)
 rename module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraReactiveRepositoriesAutoConfiguration.java => DataCassandraReactiveRepositoriesAutoConfiguration.java} (91%)
 rename module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraReactiveRepositoriesRegistrar.java => DataCassandraReactiveRepositoriesRegistrar.java} (94%)
 rename module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraRepositoriesAutoConfiguration.java => DataCassandraRepositoriesAutoConfiguration.java} (94%)
 rename module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraRepositoriesRegistrar.java => DataCassandraRepositoriesRegistrar.java} (94%)
 rename module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraDataAutoConfigurationTests.java => DataCassandraAutoConfigurationTests.java} (95%)
 rename module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraReactiveDataAutoConfigurationTests.java => DataCassandraReactiveAutoConfigurationTests.java} (94%)
 rename module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraReactiveRepositoriesAutoConfigurationTests.java => DataCassandraReactiveRepositoriesAutoConfigurationTests.java} (90%)
 rename module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/{CassandraRepositoriesAutoConfigurationTests.java => DataCassandraRepositoriesAutoConfigurationTests.java} (93%)
 rename module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/{SpringDataRepositoryMetricsAutoConfiguration.java => DataRepositoryMetricsAutoConfiguration.java} (95%)
 rename module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/{SpringDataWebAutoConfiguration.java => DataWebAutoConfiguration.java} (91%)
 rename module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/{SpringDataWebProperties.java => DataWebProperties.java} (99%)
 rename module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/{RepositoryMetricsAutoConfigurationIntegrationTests.java => DataRepositoryMetricsAutoConfigurationIntegrationTests.java} (94%)
 rename module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/{RepositoryMetricsAutoConfigurationTests.java => DataRepositoryMetricsAutoConfigurationTests.java} (96%)
 rename module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/{SpringDataWebAutoConfigurationTests.java => DataWebAutoConfigurationTests.java} (94%)
 rename module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/{SpringDataWebWebMvcTestIntegrationTests.java => DataWebWebMvcTestIntegrationTests.java} (91%)
 rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseDataAutoConfiguration.java => DataCouchbaseAutoConfiguration.java} (95%)
 rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseDataConfiguration.java => DataCouchbaseConfiguration.java} (99%)
 rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseReactiveDataAutoConfiguration.java => DataCouchbaseReactiveAutoConfiguration.java} (88%)
 rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseReactiveDataConfiguration.java => DataCouchbaseReactiveConfiguration.java} (98%)
 rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseReactiveRepositoriesAutoConfiguration.java => DataCouchbaseReactiveRepositoriesAutoConfiguration.java} (91%)
 rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseReactiveRepositoriesRegistrar.java => DataCouchbaseReactiveRepositoriesRegistrar.java} (94%)
 rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseRepositoriesAutoConfiguration.java => DataCouchbaseRepositoriesAutoConfiguration.java} (94%)
 rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseRepositoriesRegistrar.java => DataCouchbaseRepositoriesRegistrar.java} (94%)
 rename module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseDataAutoConfigurationTests.java => DataCouchbaseAutoConfigurationTests.java} (97%)
 rename module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java => DataCouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java} (87%)
 rename module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseReactiveDataAutoConfigurationTests.java => DataCouchbaseReactiveAutoConfigurationTests.java} (95%)
 rename module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseReactiveRepositoriesAutoConfigurationTests.java => DataCouchbaseReactiveRepositoriesAutoConfigurationTests.java} (89%)
 rename module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseRepositoriesAutoConfigurationTests.java => DataCouchbaseRepositoriesAutoConfigurationTests.java} (93%)
 rename module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchReactiveRepositoriesAutoConfigurationTests.java => DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java} (93%)
 rename module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchRepositoriesAutoConfigurationTests.java => DataElasticsearchRepositoriesAutoConfigurationTests.java} (93%)
 rename module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchDataAutoConfiguration.java => DataElasticsearchAutoConfiguration.java} (88%)
 rename module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchDataConfiguration.java => DataElasticsearchConfiguration.java} (98%)
 rename module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchReactiveRepositoriesAutoConfiguration.java => DataElasticsearchReactiveRepositoriesAutoConfiguration.java} (93%)
 rename module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchReactiveRepositoriesRegistrar.java => DataElasticsearchReactiveRepositoriesRegistrar.java} (94%)
 rename module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchRepositoriesAutoConfiguration.java => DataElasticsearchRepositoriesAutoConfiguration.java} (93%)
 rename module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchRepositoriesRegistrar.java => DataElasticsearchRepositoriesRegistrar.java} (94%)
 rename module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/{ElasticsearchReactiveHealthContributorAutoConfiguration.java => DataElasticsearchReactiveHealthContributorAutoConfiguration.java} (81%)
 rename module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/health/{ElasticsearchReactiveHealthIndicator.java => DataElasticsearchReactiveHealthIndicator.java} (94%)
 rename module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/{ElasticsearchDataAutoConfigurationTests.java => DataElasticsearchAutoConfigurationTests.java} (96%)
 rename module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/{ElasticsearchReactiveHealthContributorAutoConfigurationTests.java => DataElasticsearchReactiveHealthContributorAutoConfigurationTests.java} (77%)
 rename module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/health/{ElasticsearchReactiveHealthIndicatorTests.java => DataElasticsearchReactiveHealthIndicatorTests.java} (95%)
 rename module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/{JdbcDatabaseDialect.java => DataJdbcDatabaseDialect.java} (96%)
 rename module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/{JdbcRepositoriesAutoConfiguration.java => DataJdbcRepositoriesAutoConfiguration.java} (97%)
 rename module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/{JdbcRepositoriesRegistrar.java => DataJdbcRepositoriesRegistrar.java} (95%)
 rename module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/{JdbcRepositoriesAutoConfigurationTests.java => DataJdbcRepositoriesAutoConfigurationTests.java} (98%)
 rename module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/{JpaRepositoriesAutoConfiguration.java => DataJpaRepositoriesAutoConfiguration.java} (96%)
 rename module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/{JpaRepositoriesRegistrar.java => DataJpaRepositoriesRegistrar.java} (96%)
 rename module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/{AbstractJpaRepositoriesAutoConfigurationTests.java => AbstractDataJpaRepositoriesAutoConfigurationTests.java} (97%)
 rename module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/{JpaRepositoriesAutoConfigurationTests.java => DataJpaRepositoriesAutoConfigurationTests.java} (85%)
 rename module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/{EnversRevisionRepositoriesAutoConfigurationTests.java => DataJpaRepositoriesWithEnversRevisionAutoConfigurationTests.java} (84%)
 rename module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/{JpaRepositoriesSpringDataWebAutoConfigurationTests.java => DataJpaRepositoriesWithSpringDataWebAutoConfigurationTests.java} (89%)
 rename module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/{LdapRepositoriesAutoConfiguration.java => DataLdapRepositoriesAutoConfiguration.java} (94%)
 rename module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/{LdapRepositoriesRegistrar.java => DataLdapRepositoriesRegistrar.java} (95%)
 rename module/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/{LdapRepositoriesAutoConfigurationTests.java => DataLdapRepositoriesAutoConfigurationTests.java} (91%)
 rename module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoDataAutoConfiguration.java => DataMongoAutoConfiguration.java} (96%)
 rename module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoDataConfiguration.java => DataMongoConfiguration.java} (97%)
 rename module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoReactiveDataAutoConfiguration.java => DataMongoReactiveAutoConfiguration.java} (98%)
 rename module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoReactiveRepositoriesAutoConfiguration.java => DataMongoReactiveRepositoriesAutoConfiguration.java} (93%)
 rename module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoReactiveRepositoriesRegistrar.java => DataMongoReactiveRepositoriesRegistrar.java} (94%)
 rename module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoRepositoriesAutoConfiguration.java => DataMongoRepositoriesAutoConfiguration.java} (94%)
 rename module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoRepositoriesRegistrar.java => DataMongoRepositoriesRegistrar.java} (95%)
 rename module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoDataAutoConfigurationTests.java => DataMongoAutoConfigurationTests.java} (98%)
 rename module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java => DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java} (89%)
 rename module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoReactiveDataAutoConfigurationTests.java => DataMongoReactiveAutoConfigurationTests.java} (94%)
 rename module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoReactiveRepositoriesAutoConfigurationTests.java => DataMongoReactiveRepositoriesAutoConfigurationTests.java} (90%)
 rename module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/{MongoRepositoriesAutoConfigurationTests.java => DataMongoRepositoriesAutoConfigurationTests.java} (91%)
 rename module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jDataAutoConfiguration.java => DataNeo4jAutoConfiguration.java} (99%)
 rename module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jReactiveDataAutoConfiguration.java => DataNeo4jReactiveAutoConfiguration.java} (96%)
 rename module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jReactiveRepositoriesAutoConfiguration.java => DataNeo4jReactiveRepositoriesAutoConfiguration.java} (91%)
 rename module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jReactiveRepositoriesRegistrar.java => DataNeo4jReactiveRepositoriesRegistrar.java} (94%)
 rename module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jRepositoriesAutoConfiguration.java => DataNeo4jRepositoriesAutoConfiguration.java} (93%)
 rename module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jRepositoriesRegistrar.java => DataNeo4jRepositoriesRegistrar.java} (95%)
 rename module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jDataAutoConfigurationTests.java => DataNeo4jAutoConfigurationTests.java} (98%)
 rename module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jReactiveDataAutoConfigurationTests.java => DataNeo4jReactiveAutoConfigurationTests.java} (95%)
 rename module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jReactiveRepositoriesAutoConfigurationTests.java => DataNeo4jReactiveRepositoriesAutoConfigurationTests.java} (90%)
 rename module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jRepositoriesAutoConfigurationTests.java => DataNeo4jRepositoriesAutoConfigurationTests.java} (93%)
 rename module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/{R2dbcDataAutoConfiguration.java => DataR2dbcAutoConfiguration.java} (97%)
 rename module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/{R2dbcRepositoriesAutoConfiguration.java => DataR2dbcRepositoriesAutoConfiguration.java} (91%)
 rename module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/{R2dbcRepositoriesAutoConfigureRegistrar.java => DataR2dbcRepositoriesAutoConfigureRegistrar.java} (94%)
 rename module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/{R2dbcDataAutoConfigurationTests.java => DataR2dbcAutoConfigurationTests.java} (94%)
 rename module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/{R2dbcRepositoriesAutoConfigurationTests.java => DataR2dbcRepositoriesAutoConfigurationTests.java} (95%)
 rename module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/{RedisRepositoriesAutoConfigurationTests.java => DataRedisRepositoriesAutoConfigurationTests.java} (81%)
 rename module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/{RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java => DataRedisDockerComposeConnectionDetailsFactoryIntegrationTests.java} (78%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisAutoConfiguration.java => DataRedisAutoConfiguration.java} (88%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisConnectionConfiguration.java => DataRedisConnectionConfiguration.java} (86%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisConnectionDetails.java => DataRedisConnectionDetails.java} (98%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisProperties.java => DataRedisProperties.java} (99%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisReactiveAutoConfiguration.java => DataRedisReactiveAutoConfiguration.java} (96%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisRepositoriesAutoConfiguration.java => DataRedisRepositoriesAutoConfiguration.java} (91%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisRepositoriesRegistrar.java => DataRedisRepositoriesRegistrar.java} (95%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisUrl.java => DataRedisUrl.java} (88%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisUrlSyntaxException.java => DataRedisUrlSyntaxException.java} (86%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{RedisUrlSyntaxFailureAnalyzer.java => DataRedisUrlSyntaxFailureAnalyzer.java} (91%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{PropertiesRedisConnectionDetails.java => PropertiesDataRedisConnectionDetails.java} (80%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/{RedisHealthContributorAutoConfiguration.java => DataRedisHealthContributorAutoConfiguration.java} (77%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/{RedisReactiveHealthContributorAutoConfiguration.java => DataRedisReactiveHealthContributorAutoConfiguration.java} (80%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/{ => metrics}/LettuceMetricsAutoConfiguration.java (86%)
 create mode 100644 module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/metrics/package-info.java
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/{RedisHealth.java => DataRedisHealth.java} (89%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/{RedisHealthIndicator.java => DataRedisHealthIndicator.java} (87%)
 rename module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/{RedisReactiveHealthIndicator.java => DataRedisReactiveHealthIndicator.java} (90%)
 rename module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/{RedisAutoConfigurationJedisTests.java => DataRedisAutoConfigurationJedisTests.java} (97%)
 rename module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/{RedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java => DataRedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java} (87%)
 rename module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/{RedisAutoConfigurationTests.java => DataRedisAutoConfigurationTests.java} (96%)
 rename module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/{RedisReactiveAutoConfigurationTests.java => DataRedisReactiveAutoConfigurationTests.java} (84%)
 rename module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/{ => metrics}/LettuceMetricsAutoConfigurationTests.java (88%)
 rename module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/{RepositoryRestMvcAutoConfiguration.java => DataRestAutoConfiguration.java} (86%)
 rename module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/{RepositoryRestProperties.java => DataRestProperties.java} (99%)
 rename module/spring-boot-data-rest/src/test/java/org/springframework/boot/data/rest/autoconfigure/{RepositoryRestMvcAutoConfigurationTests.java => DataRestAutoConfigurationTests.java} (95%)
 rename module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/{MongoSessionAutoConfigurationTests.java => SessionDataMongoAutoConfigurationTests.java} (91%)
 rename module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/{MongoReactiveSessionAutoConfigurationTests.java => SessionDataMongoReactiveAutoConfigurationTests.java} (90%)
 rename module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/{MongoSessionAutoConfiguration.java => SessionDataMongoAutoConfiguration.java} (94%)
 rename module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/{RedisSessionAutoConfigurationTests.java => SessionDataRedisAutoConfigurationTests.java} (94%)
 rename module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/{ReactiveRedisSessionAutoConfigurationTests.java => SessionDataRedisReactiveAutoConfigurationTests.java} (93%)
 rename module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/{RedisSessionAutoConfiguration.java => SessionDataRedisAutoConfiguration.java} (97%)
 rename module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/{AbstractReactiveSessionAutoConfigurationTests.java => AbstractSessionReactiveAutoConfigurationTests.java} (98%)
 rename smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/{SampleCassandraApplicationReactiveSslTests.java => SampleDataCassandraApplicationReactiveSslTests.java} (96%)
 rename smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/{SampleCassandraApplicationSslTests.java => SampleDataCassandraApplicationSslTests.java} (97%)
 rename smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/{SampleCassandraApplication.java => SampleDataCassandraApplication.java} (94%)
 rename smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/{SampleCouchbaseApplicationReactiveSslTests.java => SampleDataCouchbaseApplicationReactiveSslTests.java} (95%)
 rename smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/{SampleCouchbaseApplicationSslTests.java => SampleDataCouchbaseApplicationSslTests.java} (98%)
 rename smoke-test/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/{SampleCouchbaseApplication.java => SampleDataCouchbaseApplication.java} (94%)
 rename smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/{SampleElasticsearchApplicationTests.java => SampleDataElasticsearchApplicationTests.java} (96%)
 rename smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/{SampleElasticsearchSslApplicationTests.java => SampleDataElasticsearchSslApplicationTests.java} (96%)
 rename smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/{SampleElasticsearch8ApplicationTests.java => SampleDataElasticsearchWithElasticsearch8ApplicationTests.java} (95%)
 rename smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/{SampleElasticsearch9ApplicationTests.java => SampleDataElasticsearchWithElasticsearch9ApplicationTests.java} (95%)
 rename smoke-test/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/{SampleElasticsearchApplication.java => SampleDataElasticsearchApplication.java} (94%)
 rename smoke-test/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/{SampleLdapApplication.java => SampleDataLdapApplication.java} (88%)
 rename smoke-test/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/{SampleLdapApplicationTests.java => SampleDataLdapApplicationTests.java} (93%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo => spring-boot-smoke-test-data-mongodb}/build.gradle (100%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java => spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java} (93%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo => spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb}/SampleMongoApplicationSslTests.java (96%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo => spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb}/SecureMongoContainer.java (98%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleMongoApplication.java => spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleDataMongoApplication.java} (90%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo => spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb}/SampleDocument.java (97%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo => spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb}/SampleReactiveRepository.java (96%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo => spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb}/SampleRepository.java (96%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo => spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb}/SampleService.java (97%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo => spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb}/package-info.java (95%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo => spring-boot-smoke-test-data-mongodb}/src/test/resources/ssl/test-ca.crt (100%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo => spring-boot-smoke-test-data-mongodb}/src/test/resources/ssl/test-ca.key (100%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo => spring-boot-smoke-test-data-mongodb}/src/test/resources/ssl/test-client.crt (100%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo => spring-boot-smoke-test-data-mongodb}/src/test/resources/ssl/test-client.key (100%)
 rename smoke-test/{spring-boot-smoke-test-data-mongo => spring-boot-smoke-test-data-mongodb}/src/test/resources/ssl/test-server.pem (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-mongo => spring-boot-smoke-test-session-data-mongodb-webflux}/build.gradle (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-mongo => spring-boot-smoke-test-session-data-mongodb-webflux}/src/dockerTest/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-mongo => spring-boot-smoke-test-session-data-mongodb-webflux}/src/main/java/smoketest/session/HelloRestController.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-mongo => spring-boot-smoke-test-session-data-mongodb-webflux}/src/main/java/smoketest/session/SampleSessionWebFluxMongoApplication.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-mongo => spring-boot-smoke-test-session-data-mongodb-webflux}/src/main/java/smoketest/session/package-info.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-mongo => spring-boot-smoke-test-session-data-mongodb-webflux}/src/main/resources/application.properties (100%)
 rename smoke-test/{spring-boot-smoke-test-session-mongo => spring-boot-smoke-test-session-data-mongodb}/build.gradle (100%)
 rename smoke-test/{spring-boot-smoke-test-session-mongo => spring-boot-smoke-test-session-data-mongodb}/src/dockerTest/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-mongo => spring-boot-smoke-test-session-data-mongodb}/src/main/java/smoketest/session/mongodb/SampleSessionMongoApplication.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-mongo => spring-boot-smoke-test-session-data-mongodb}/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-mongo => spring-boot-smoke-test-session-data-mongodb}/src/main/java/smoketest/session/mongodb/package-info.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-mongo => spring-boot-smoke-test-session-data-mongodb}/src/main/resources/application.properties (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-redis => spring-boot-smoke-test-session-data-redis-webflux}/build.gradle (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-redis => spring-boot-smoke-test-session-data-redis-webflux}/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-redis => spring-boot-smoke-test-session-data-redis-webflux}/src/main/java/smoketest/session/HelloRestController.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-redis => spring-boot-smoke-test-session-data-redis-webflux}/src/main/java/smoketest/session/SampleSessionWebFluxRedisApplication.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-redis => spring-boot-smoke-test-session-data-redis-webflux}/src/main/java/smoketest/session/package-info.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-webflux-redis => spring-boot-smoke-test-session-data-redis-webflux}/src/main/resources/application.properties (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/build.gradle (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/main/java/smoketest/session/redis/SampleSessionRedisApplication.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/main/java/smoketest/session/redis/SecurityConfiguration.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/main/java/smoketest/session/redis/package-info.java (100%)
 rename smoke-test/{spring-boot-smoke-test-session-redis => spring-boot-smoke-test-session-data-redis}/src/main/resources/application.properties (100%)

diff --git a/module/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java b/module/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java
index 7723a37ff7b..3d098e44666 100644
--- a/module/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java
+++ b/module/spring-boot-cache/src/dockerTest/java/org/springframework/boot/cache/metrics/RedisCacheMetricsTests.java
@@ -29,7 +29,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
@@ -55,7 +55,7 @@ class RedisCacheMetricsTests {
 	private static final Tags TAGS = Tags.of("app", "test").and("cache", "test");
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class, CacheAutoConfiguration.class))
+		.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class, CacheAutoConfiguration.class))
 		.withUserConfiguration(CachingConfiguration.class)
 		.withPropertyValues("spring.data.redis.host=" + redis.getHost(),
 				"spring.data.redis.port=" + redis.getFirstMappedPort(), "spring.cache.type=redis",
diff --git a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfiguration.java b/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfiguration.java
index daea624630d..bab8fe322c5 100644
--- a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfiguration.java
+++ b/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfiguration.java
@@ -51,8 +51,8 @@ import org.springframework.util.Assert;
  * @since 4.0.0
  * @see EnableCaching
  */
-@AutoConfiguration(afterName = { "org.springframework.boot.data.couchbase.autoconfigure.CouchbaseDataAutoConfiguration",
-		"org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration",
+@AutoConfiguration(afterName = { "org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseAutoConfiguration",
+		"org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration",
 		"org.springframework.boot.hazelcast.autoconfigure.HazelcastAutoConfiguration",
 		"org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration" })
 @ConditionalOnClass(CacheManager.class)
diff --git a/module/spring-boot-data-cassandra-test/src/main/resources/META-INF/spring/org.springframework.boot.data.cassandra.test.autoconfigure.AutoConfigureDataCassandra.imports b/module/spring-boot-data-cassandra-test/src/main/resources/META-INF/spring/org.springframework.boot.data.cassandra.test.autoconfigure.AutoConfigureDataCassandra.imports
index 486238dc0a8..1f0514b7b21 100644
--- a/module/spring-boot-data-cassandra-test/src/main/resources/META-INF/spring/org.springframework.boot.data.cassandra.test.autoconfigure.AutoConfigureDataCassandra.imports
+++ b/module/spring-boot-data-cassandra-test/src/main/resources/META-INF/spring/org.springframework.boot.data.cassandra.test.autoconfigure.AutoConfigureDataCassandra.imports
@@ -1,7 +1,7 @@
 org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration
 org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration
-org.springframework.boot.data.cassandra.autoconfigure.CassandraDataAutoConfiguration
-org.springframework.boot.data.cassandra.autoconfigure.CassandraReactiveDataAutoConfiguration
-org.springframework.boot.data.cassandra.autoconfigure.CassandraReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.cassandra.autoconfigure.CassandraRepositoriesAutoConfiguration
+org.springframework.boot.data.cassandra.autoconfigure.DataCassandraAutoConfiguration
+org.springframework.boot.data.cassandra.autoconfigure.DataCassandraReactiveAutoConfiguration
+org.springframework.boot.data.cassandra.autoconfigure.DataCassandraReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.cassandra.autoconfigure.DataCassandraRepositoriesAutoConfiguration
 optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration
diff --git a/module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfigurationIntegrationTests.java b/module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationIntegrationTests.java
similarity index 94%
rename from module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfigurationIntegrationTests.java
rename to module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationIntegrationTests.java
index 209ce9f3e00..9df16dfca50 100644
--- a/module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfigurationIntegrationTests.java
+++ b/module/spring-boot-data-cassandra/src/dockerTest/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationIntegrationTests.java
@@ -38,20 +38,20 @@ import org.springframework.data.cassandra.config.SessionFactoryFactoryBean;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CassandraDataAutoConfiguration} that require a Cassandra instance.
+ * Tests for {@link DataCassandraAutoConfiguration} that require a Cassandra instance.
  *
  * @author Mark Paluch
  * @author Stephane Nicoll
  */
 @Testcontainers(disabledWithoutDocker = true)
-class CassandraDataAutoConfigurationIntegrationTests {
+class DataCassandraAutoConfigurationIntegrationTests {
 
 	@Container
 	static final CassandraContainer cassandra = TestImage.container(CassandraContainer.class);
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(
-				AutoConfigurations.of(CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class))
+				AutoConfigurations.of(CassandraAutoConfiguration.class, DataCassandraAutoConfiguration.class))
 		.withPropertyValues(
 				"spring.cassandra.contact-points:" + cassandra.getHost() + ":" + cassandra.getFirstMappedPort(),
 				"spring.cassandra.local-datacenter=datacenter1", "spring.cassandra.connection.connect-timeout=60s",
diff --git a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfiguration.java b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfiguration.java
similarity index 98%
rename from module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfiguration.java
rename to module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfiguration.java
index b1f6b768a43..953f981f9d8 100644
--- a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfiguration.java
+++ b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfiguration.java
@@ -63,11 +63,11 @@ import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver;
 @AutoConfiguration(after = CassandraAutoConfiguration.class)
 @ConditionalOnClass({ CqlSession.class, CassandraAdminOperations.class })
 @ConditionalOnBean(CqlSession.class)
-public final class CassandraDataAutoConfiguration {
+public final class DataCassandraAutoConfiguration {
 
 	private final CqlSession session;
 
-	CassandraDataAutoConfiguration(@Lazy CqlSession session) {
+	DataCassandraAutoConfiguration(@Lazy CqlSession session) {
 		this.session = session;
 	}
 
diff --git a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveDataAutoConfiguration.java b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveAutoConfiguration.java
similarity index 96%
rename from module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveDataAutoConfiguration.java
rename to module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveAutoConfiguration.java
index 85b20d94665..bd642e736ef 100644
--- a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveDataAutoConfiguration.java
+++ b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveAutoConfiguration.java
@@ -43,10 +43,10 @@ import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessio
  * @author Mark Paluch
  * @since 4.0.0
  */
-@AutoConfiguration(after = CassandraDataAutoConfiguration.class)
+@AutoConfiguration(after = DataCassandraAutoConfiguration.class)
 @ConditionalOnClass({ CqlSession.class, ReactiveCassandraTemplate.class, Flux.class })
 @ConditionalOnBean(CqlSession.class)
-public final class CassandraReactiveDataAutoConfiguration {
+public final class DataCassandraReactiveAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
diff --git a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesAutoConfiguration.java b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfiguration.java
similarity index 91%
rename from module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfiguration.java
index b9cb8941420..9c397393f47 100644
--- a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfiguration.java
@@ -37,11 +37,11 @@ import org.springframework.data.cassandra.repository.support.ReactiveCassandraRe
  * @since 4.0.0
  * @see EnableReactiveCassandraRepositories
  */
-@AutoConfiguration(after = CassandraReactiveDataAutoConfiguration.class)
+@AutoConfiguration(after = DataCassandraReactiveAutoConfiguration.class)
 @ConditionalOnClass({ ReactiveSession.class, ReactiveCassandraRepository.class })
 @ConditionalOnRepositoryType(store = "cassandra", type = RepositoryType.REACTIVE)
 @ConditionalOnMissingBean(ReactiveCassandraRepositoryFactoryBean.class)
-@Import(CassandraReactiveRepositoriesRegistrar.class)
-public final class CassandraReactiveRepositoriesAutoConfiguration {
+@Import(DataCassandraReactiveRepositoriesRegistrar.class)
+public final class DataCassandraReactiveRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesRegistrar.java b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesRegistrar.java
similarity index 94%
rename from module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesRegistrar.java
rename to module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesRegistrar.java
index 8d1c2838654..2e9f3b76506 100644
--- a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesRegistrar.java
+++ b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Eddú Meléndez
  */
-class CassandraReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataCassandraReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesAutoConfiguration.java b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfiguration.java
similarity index 94%
rename from module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfiguration.java
index f257ec27dc9..ba19090a4c7 100644
--- a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfiguration.java
@@ -41,7 +41,7 @@ import org.springframework.data.cassandra.repository.support.CassandraRepository
 @ConditionalOnClass({ CqlSession.class, CassandraRepository.class })
 @ConditionalOnRepositoryType(store = "cassandra", type = RepositoryType.IMPERATIVE)
 @ConditionalOnMissingBean(CassandraRepositoryFactoryBean.class)
-@Import(CassandraRepositoriesRegistrar.class)
-public final class CassandraRepositoriesAutoConfiguration {
+@Import(DataCassandraRepositoriesRegistrar.class)
+public final class DataCassandraRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesRegistrar.java b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesRegistrar.java
similarity index 94%
rename from module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesRegistrar.java
rename to module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesRegistrar.java
index e1c432c0f76..877fef4b60e 100644
--- a/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesRegistrar.java
+++ b/module/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Eddú Meléndez
  */
-class CassandraRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataCassandraRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index e2bb647a555..37083000e23 100644
--- a/module/spring-boot-data-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,4 +1,4 @@
-org.springframework.boot.data.cassandra.autoconfigure.CassandraDataAutoConfiguration
-org.springframework.boot.data.cassandra.autoconfigure.CassandraReactiveDataAutoConfiguration
-org.springframework.boot.data.cassandra.autoconfigure.CassandraReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.cassandra.autoconfigure.CassandraRepositoriesAutoConfiguration
+org.springframework.boot.data.cassandra.autoconfigure.DataCassandraAutoConfiguration
+org.springframework.boot.data.cassandra.autoconfigure.DataCassandraReactiveAutoConfiguration
+org.springframework.boot.data.cassandra.autoconfigure.DataCassandraReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.cassandra.autoconfigure.DataCassandraRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfigurationTests.java b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java
similarity index 95%
rename from module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfigurationTests.java
rename to module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java
index a76665c32cf..920165d1ffd 100644
--- a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraAutoConfigurationTests.java
@@ -40,19 +40,19 @@ import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CassandraDataAutoConfiguration}.
+ * Tests for {@link DataCassandraAutoConfiguration}.
  *
  * @author Eddú Meléndez
  * @author Mark Paluch
  * @author Stephane Nicoll
  */
-class CassandraDataAutoConfigurationTests {
+class DataCassandraAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withPropertyValues("spring.cassandra.keyspaceName=boot_test")
 		.withUserConfiguration(CassandraMockConfiguration.class)
 		.withConfiguration(
-				AutoConfigurations.of(CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class));
+				AutoConfigurations.of(CassandraAutoConfiguration.class, DataCassandraAutoConfiguration.class));
 
 	@Test
 	void cqlTemplateExists() {
@@ -120,7 +120,7 @@ class CassandraDataAutoConfigurationTests {
 	@Test
 	void clusterDoesNotExist() {
 		try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				CassandraDataAutoConfiguration.class)) {
+				DataCassandraAutoConfiguration.class)) {
 			assertThat(context.getBeansOfType(CqlSession.class)).isEmpty();
 		}
 	}
diff --git a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveDataAutoConfigurationTests.java b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveAutoConfigurationTests.java
similarity index 94%
rename from module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveDataAutoConfigurationTests.java
rename to module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveAutoConfigurationTests.java
index 1173721584e..dcbce823d3f 100644
--- a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveAutoConfigurationTests.java
@@ -33,19 +33,19 @@ import org.springframework.data.cassandra.core.mapping.SimpleUserTypeResolver;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CassandraReactiveDataAutoConfiguration}.
+ * Tests for {@link DataCassandraReactiveAutoConfiguration}.
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
  * @author Mark Paluch
  */
-class CassandraReactiveDataAutoConfigurationTests {
+class DataCassandraReactiveAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withPropertyValues("spring.cassandra.keyspaceName=boot_test")
 		.withUserConfiguration(CassandraMockConfiguration.class)
-		.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
-				CassandraReactiveDataAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class, DataCassandraAutoConfiguration.class,
+				DataCassandraReactiveAutoConfiguration.class));
 
 	@Test
 	void reactiveCqlTemplateExists() {
diff --git a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfigurationTests.java
similarity index 90%
rename from module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfigurationTests.java
index 2bb2a0bb25a..522d0dbda00 100644
--- a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraReactiveRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraReactiveRepositoriesAutoConfigurationTests.java
@@ -38,19 +38,20 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CassandraReactiveRepositoriesAutoConfiguration}.
+ * Tests for {@link DataCassandraReactiveRepositoriesAutoConfiguration}.
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
  * @author Mark Paluch
  * @author Andy Wilkinson
  */
-class CassandraReactiveRepositoriesAutoConfigurationTests {
+class DataCassandraReactiveRepositoriesAutoConfigurationTests {
 
-	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
-			AutoConfigurations.of(CassandraAutoConfiguration.class, CassandraRepositoriesAutoConfiguration.class,
-					CassandraDataAutoConfiguration.class, CassandraReactiveDataAutoConfiguration.class,
-					CassandraReactiveRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+		.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class,
+				DataCassandraRepositoriesAutoConfiguration.class, DataCassandraAutoConfiguration.class,
+				DataCassandraReactiveAutoConfiguration.class, DataCassandraReactiveRepositoriesAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class));
 
 	@Test
 	void testDefaultRepositoryConfiguration() {
diff --git a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfigurationTests.java
similarity index 93%
rename from module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfigurationTests.java
index 29f094c499b..5a3e084b5a6 100644
--- a/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-cassandra/src/test/java/org/springframework/boot/data/cassandra/autoconfigure/DataCassandraRepositoriesAutoConfigurationTests.java
@@ -38,17 +38,17 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CassandraRepositoriesAutoConfiguration}.
+ * Tests for {@link DataCassandraRepositoriesAutoConfiguration}.
  *
  * @author Eddú Meléndez
  * @author Mark Paluch
  * @author Stephane Nicoll
  */
-class CassandraRepositoriesAutoConfigurationTests {
+class DataCassandraRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
-			AutoConfigurations.of(CassandraAutoConfiguration.class, CassandraRepositoriesAutoConfiguration.class,
-					CassandraDataAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
+			AutoConfigurations.of(CassandraAutoConfiguration.class, DataCassandraRepositoriesAutoConfiguration.class,
+					DataCassandraAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
 
 	@Test
 	void testDefaultRepositoryConfiguration() {
diff --git a/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/SpringDataRepositoryMetricsAutoConfiguration.java b/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfiguration.java
similarity index 95%
rename from module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/SpringDataRepositoryMetricsAutoConfiguration.java
rename to module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfiguration.java
index 133aab7f958..b5d598329c0 100644
--- a/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/SpringDataRepositoryMetricsAutoConfiguration.java
+++ b/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfiguration.java
@@ -45,11 +45,11 @@ import org.springframework.util.function.SingletonSupplier;
 @ConditionalOnClass(org.springframework.data.repository.Repository.class)
 @ConditionalOnBean(MeterRegistry.class)
 @EnableConfigurationProperties(DataMetricsProperties.class)
-public final class SpringDataRepositoryMetricsAutoConfiguration {
+public final class DataRepositoryMetricsAutoConfiguration {
 
 	private final DataMetricsProperties properties;
 
-	SpringDataRepositoryMetricsAutoConfiguration(DataMetricsProperties properties) {
+	DataRepositoryMetricsAutoConfiguration(DataMetricsProperties properties) {
 		this.properties = properties;
 	}
 
diff --git a/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebAutoConfiguration.java b/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/DataWebAutoConfiguration.java
similarity index 91%
rename from module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebAutoConfiguration.java
rename to module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/DataWebAutoConfiguration.java
index e3c35aedf0f..7b8dc60d248 100644
--- a/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebAutoConfiguration.java
+++ b/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/DataWebAutoConfiguration.java
@@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.data.autoconfigure.web.SpringDataWebProperties.Pageable;
+import org.springframework.boot.data.autoconfigure.web.DataWebProperties.Pageable;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
@@ -50,12 +50,12 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnClass({ PageableHandlerMethodArgumentResolver.class, WebMvcConfigurer.class })
 @ConditionalOnMissingBean(PageableHandlerMethodArgumentResolver.class)
-@EnableConfigurationProperties(SpringDataWebProperties.class)
-public final class SpringDataWebAutoConfiguration {
+@EnableConfigurationProperties(DataWebProperties.class)
+public final class DataWebAutoConfiguration {
 
-	private final SpringDataWebProperties properties;
+	private final DataWebProperties properties;
 
-	SpringDataWebAutoConfiguration(SpringDataWebProperties properties) {
+	DataWebAutoConfiguration(DataWebProperties properties) {
 		this.properties = properties;
 	}
 
diff --git a/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebProperties.java b/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/DataWebProperties.java
similarity index 99%
rename from module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebProperties.java
rename to module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/DataWebProperties.java
index 6e7fa0e4262..e3f276bd529 100644
--- a/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebProperties.java
+++ b/module/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/DataWebProperties.java
@@ -27,7 +27,7 @@ import org.springframework.data.web.config.EnableSpringDataWebSupport.PageSerial
  * @since 4.0.0
  */
 @ConfigurationProperties("spring.data.web")
-public class SpringDataWebProperties {
+public class DataWebProperties {
 
 	private final Pageable pageable = new Pageable();
 
diff --git a/module/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index a2d71bcb9b9..a1826217a8e 100644
--- a/module/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,2 @@
-org.springframework.boot.data.autoconfigure.metrics.SpringDataRepositoryMetricsAutoConfiguration
-org.springframework.boot.data.autoconfigure.web.SpringDataWebAutoConfiguration
+org.springframework.boot.data.autoconfigure.metrics.DataRepositoryMetricsAutoConfiguration
+org.springframework.boot.data.autoconfigure.web.DataWebAutoConfiguration
diff --git a/module/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc.imports b/module/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc.imports
index 7e9012b4a2b..4ce60ebb8f9 100644
--- a/module/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc.imports
+++ b/module/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureWebMvc.imports
@@ -1 +1 @@
-org.springframework.boot.data.autoconfigure.web.SpringDataWebAutoConfiguration
+org.springframework.boot.data.autoconfigure.web.DataWebAutoConfiguration
diff --git a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/RepositoryMetricsAutoConfigurationIntegrationTests.java b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationIntegrationTests.java
similarity index 94%
rename from module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/RepositoryMetricsAutoConfigurationIntegrationTests.java
rename to module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationIntegrationTests.java
index 6bfd713a995..dc001325262 100644
--- a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/RepositoryMetricsAutoConfigurationIntegrationTests.java
+++ b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationIntegrationTests.java
@@ -40,7 +40,7 @@ import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link SpringDataRepositoryMetricsAutoConfiguration}.
+ * Integration tests for {@link DataRepositoryMetricsAutoConfiguration}.
  *
  * @author Phillip Webb
  */
@@ -51,12 +51,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 		  country  VARCHAR(30)
 		);
 		""")
-class RepositoryMetricsAutoConfigurationIntegrationTests {
+class DataRepositoryMetricsAutoConfigurationIntegrationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withBean(SimpleMeterRegistry.class)
 		.withConfiguration(AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
-				SpringDataRepositoryMetricsAutoConfiguration.class, JdbcTemplateAutoConfiguration.class,
+				DataRepositoryMetricsAutoConfiguration.class, JdbcTemplateAutoConfiguration.class,
 				DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class,
 				DataSourceInitializationAutoConfiguration.class))
 		.withUserConfiguration(TestConfig.class);
diff --git a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/RepositoryMetricsAutoConfigurationTests.java b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationTests.java
similarity index 96%
rename from module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/RepositoryMetricsAutoConfigurationTests.java
rename to module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationTests.java
index 48732c5682a..00063c5b804 100644
--- a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/RepositoryMetricsAutoConfigurationTests.java
+++ b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/DataRepositoryMetricsAutoConfigurationTests.java
@@ -52,22 +52,22 @@ import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link SpringDataRepositoryMetricsAutoConfiguration}.
+ * Tests for {@link DataRepositoryMetricsAutoConfiguration}.
  *
  * @author Phillip Webb
  */
-class RepositoryMetricsAutoConfigurationTests {
+class DataRepositoryMetricsAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withBean(SimpleMeterRegistry.class)
-		.withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class,
-				SpringDataRepositoryMetricsAutoConfiguration.class))
+		.withConfiguration(
+				AutoConfigurations.of(MetricsAutoConfiguration.class, DataRepositoryMetricsAutoConfiguration.class))
 		.withPropertyValues("management.metrics.use-global-registry=false");
 
 	@Test
 	void backsOffWhenMeterRegistryIsMissing() {
 		new ApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(SpringDataRepositoryMetricsAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(DataRepositoryMetricsAutoConfiguration.class))
 			.run((context) -> assertThat(context).doesNotHaveBean(RepositoryTagsProvider.class));
 	}
 
diff --git a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/MetricsRepositoryMethodInvocationListenerBeanPostProcessorTests.java b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/MetricsRepositoryMethodInvocationListenerBeanPostProcessorTests.java
index abc15448720..aa9c7463489 100644
--- a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/MetricsRepositoryMethodInvocationListenerBeanPostProcessorTests.java
+++ b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/MetricsRepositoryMethodInvocationListenerBeanPostProcessorTests.java
@@ -30,7 +30,7 @@ import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link MetricsRepositoryMethodInvocationListenerBeanPostProcessor} .
+ * Tests for {@link MetricsRepositoryMethodInvocationListenerBeanPostProcessor}.
  *
  * @author Phillip Webb
  */
diff --git a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebAutoConfigurationTests.java b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/DataWebAutoConfigurationTests.java
similarity index 94%
rename from module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebAutoConfigurationTests.java
rename to module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/DataWebAutoConfigurationTests.java
index e7b6bae6b80..339154c6ba7 100644
--- a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebAutoConfigurationTests.java
+++ b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/DataWebAutoConfigurationTests.java
@@ -30,17 +30,17 @@ import org.springframework.data.web.config.SpringDataWebSettings;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringDataWebAutoConfiguration}.
+ * Tests for {@link DataWebAutoConfiguration}.
  *
  * @author Andy Wilkinson
  * @author Vedran Pavic
  * @author Stephane Nicoll
  * @author Yanming Zhou
  */
-class SpringDataWebAutoConfigurationTests {
+class DataWebAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(SpringDataWebAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataWebAutoConfiguration.class));
 
 	@Test
 	void webSupportIsAutoConfiguredInWebApplicationContexts() {
@@ -50,7 +50,7 @@ class SpringDataWebAutoConfigurationTests {
 
 	@Test
 	void autoConfigurationBacksOffInNonWebApplicationContexts() {
-		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(SpringDataWebAutoConfiguration.class))
+		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(DataWebAutoConfiguration.class))
 			.run((context) -> assertThat(context).doesNotHaveBean(PageableHandlerMethodArgumentResolver.class));
 	}
 
@@ -80,7 +80,7 @@ class SpringDataWebAutoConfigurationTests {
 	@Test
 	void defaultPageable() {
 		this.contextRunner.run((context) -> {
-			SpringDataWebProperties.Pageable properties = new SpringDataWebProperties().getPageable();
+			DataWebProperties.Pageable properties = new DataWebProperties().getPageable();
 			PageableHandlerMethodArgumentResolver argumentResolver = context
 				.getBean(PageableHandlerMethodArgumentResolver.class);
 			SpringDataWebSettings springDataWebSettings = context.getBean(SpringDataWebSettings.class);
diff --git a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebWebMvcTestIntegrationTests.java b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/DataWebWebMvcTestIntegrationTests.java
similarity index 91%
rename from module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebWebMvcTestIntegrationTests.java
rename to module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/DataWebWebMvcTestIntegrationTests.java
index 36803e6a8da..40c7022f8b2 100644
--- a/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebWebMvcTestIntegrationTests.java
+++ b/module/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/web/DataWebWebMvcTestIntegrationTests.java
@@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.data.autoconfigure.web.SpringDataWebWebMvcTestIntegrationTests.PageableController;
+import org.springframework.boot.data.autoconfigure.web.DataWebWebMvcTestIntegrationTests.PageableController;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.domain.Pageable;
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @WebMvcTest
 @Import(PageableController.class)
-class SpringDataWebWebMvcTestIntegrationTests {
+class DataWebWebMvcTestIntegrationTests {
 
 	@Autowired
 	private MockMvcTester mvc;
diff --git a/module/spring-boot-data-couchbase-test/src/main/resources/META-INF/spring/org.springframework.boot.data.couchbase.test.autoconfigure.AutoConfigureDataCouchbase.imports b/module/spring-boot-data-couchbase-test/src/main/resources/META-INF/spring/org.springframework.boot.data.couchbase.test.autoconfigure.AutoConfigureDataCouchbase.imports
index f91e7a43b7b..fd5cc7d54fa 100644
--- a/module/spring-boot-data-couchbase-test/src/main/resources/META-INF/spring/org.springframework.boot.data.couchbase.test.autoconfigure.AutoConfigureDataCouchbase.imports
+++ b/module/spring-boot-data-couchbase-test/src/main/resources/META-INF/spring/org.springframework.boot.data.couchbase.test.autoconfigure.AutoConfigureDataCouchbase.imports
@@ -1,7 +1,7 @@
 org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration
 org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration
-org.springframework.boot.data.couchbase.autoconfigure.CouchbaseDataAutoConfiguration
-org.springframework.boot.data.couchbase.autoconfigure.CouchbaseReactiveDataAutoConfiguration
-org.springframework.boot.data.couchbase.autoconfigure.CouchbaseReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.couchbase.autoconfigure.CouchbaseRepositoriesAutoConfiguration
+org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseAutoConfiguration
+org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseReactiveAutoConfiguration
+org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseRepositoriesAutoConfiguration
 optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration
diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseAutoConfiguration.java
similarity index 95%
rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java
rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseAutoConfiguration.java
index 4d4703ecfcc..13e101130e7 100644
--- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java
+++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseAutoConfiguration.java
@@ -42,9 +42,9 @@ import org.springframework.data.couchbase.repository.CouchbaseRepository;
 		afterName = "org.springframework.boot.validation.autoconfigure.ValidationAutoConfiguration")
 @ConditionalOnClass({ Bucket.class, CouchbaseRepository.class })
 @EnableConfigurationProperties(DataCouchbaseProperties.class)
-@Import({ CouchbaseDataConfiguration.class, CouchbaseClientFactoryConfiguration.class,
+@Import({ DataCouchbaseConfiguration.class, CouchbaseClientFactoryConfiguration.class,
 		CouchbaseClientFactoryDependentConfiguration.class })
-public final class CouchbaseDataAutoConfiguration {
+public final class DataCouchbaseAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(Validator.class)
diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseConfiguration.java
similarity index 99%
rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataConfiguration.java
rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseConfiguration.java
index f51fa58dbc9..e17c4842b6e 100644
--- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataConfiguration.java
+++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseConfiguration.java
@@ -39,7 +39,7 @@ import org.springframework.data.mapping.model.FieldNamingStrategy;
  * @author Stephane Nicoll
  */
 @Configuration(proxyBeanMethods = false)
-class CouchbaseDataConfiguration {
+class DataCouchbaseConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataAutoConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAutoConfiguration.java
similarity index 88%
rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataAutoConfiguration.java
rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAutoConfiguration.java
index e7b13dd72f7..7405eba1ce0 100644
--- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataAutoConfiguration.java
+++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAutoConfiguration.java
@@ -32,9 +32,9 @@ import org.springframework.data.couchbase.repository.ReactiveCouchbaseRepository
  * @author Alex Derkach
  * @since 4.0.0
  */
-@AutoConfiguration(after = CouchbaseDataAutoConfiguration.class)
+@AutoConfiguration(after = DataCouchbaseAutoConfiguration.class)
 @ConditionalOnClass({ Cluster.class, ReactiveCouchbaseRepository.class, Flux.class })
-@Import(CouchbaseReactiveDataConfiguration.class)
-public final class CouchbaseReactiveDataAutoConfiguration {
+@Import(DataCouchbaseReactiveConfiguration.class)
+public final class DataCouchbaseReactiveAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveConfiguration.java
similarity index 98%
rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataConfiguration.java
rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveConfiguration.java
index ee71d09b25b..1bd07c05858 100644
--- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataConfiguration.java
+++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveConfiguration.java
@@ -33,7 +33,7 @@ import org.springframework.data.couchbase.repository.config.ReactiveRepositoryOp
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnSingleCandidate(CouchbaseClientFactory.class)
-class CouchbaseReactiveDataConfiguration {
+class DataCouchbaseReactiveConfiguration {
 
 	@Bean(name = BeanNames.REACTIVE_COUCHBASE_TEMPLATE)
 	@ConditionalOnMissingBean(name = BeanNames.REACTIVE_COUCHBASE_TEMPLATE)
diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesAutoConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesAutoConfiguration.java
similarity index 91%
rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesAutoConfiguration.java
index 4bbddd73bf6..c649fe26fa1 100644
--- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesAutoConfiguration.java
@@ -38,12 +38,12 @@ import org.springframework.data.couchbase.repository.support.ReactiveCouchbaseRe
  * @author Alex Derkach
  * @since 4.0.0
  */
-@AutoConfiguration(after = CouchbaseReactiveDataAutoConfiguration.class)
+@AutoConfiguration(after = DataCouchbaseReactiveAutoConfiguration.class)
 @ConditionalOnClass({ Cluster.class, ReactiveCouchbaseRepository.class, Flux.class })
 @ConditionalOnRepositoryType(store = "couchbase", type = RepositoryType.REACTIVE)
 @ConditionalOnBean(ReactiveRepositoryOperationsMapping.class)
 @ConditionalOnMissingBean(ReactiveCouchbaseRepositoryFactoryBean.class)
-@Import(CouchbaseReactiveRepositoriesRegistrar.class)
-public final class CouchbaseReactiveRepositoriesAutoConfiguration {
+@Import(DataCouchbaseReactiveRepositoriesRegistrar.class)
+public final class DataCouchbaseReactiveRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesRegistrar.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesRegistrar.java
similarity index 94%
rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesRegistrar.java
rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesRegistrar.java
index 691030e547e..0f39a461100 100644
--- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesRegistrar.java
+++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Alex Derkach
  */
-class CouchbaseReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataCouchbaseReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesAutoConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesAutoConfiguration.java
similarity index 94%
rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesAutoConfiguration.java
index 75dcef7b09f..9e39004035e 100644
--- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesAutoConfiguration.java
@@ -43,7 +43,7 @@ import org.springframework.data.couchbase.repository.support.CouchbaseRepository
 @ConditionalOnBean(RepositoryOperationsMapping.class)
 @ConditionalOnRepositoryType(store = "couchbase", type = RepositoryType.IMPERATIVE)
 @ConditionalOnMissingBean(CouchbaseRepositoryFactoryBean.class)
-@Import(CouchbaseRepositoriesRegistrar.class)
-public final class CouchbaseRepositoriesAutoConfiguration {
+@Import(DataCouchbaseRepositoriesRegistrar.class)
+public final class DataCouchbaseRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesRegistrar.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesRegistrar.java
similarity index 94%
rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesRegistrar.java
rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesRegistrar.java
index 60f9c69566f..2bf8e9740f7 100644
--- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesRegistrar.java
+++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Eddú Meléndez
  */
-class CouchbaseRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataCouchbaseRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-couchbase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-couchbase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 8528d493526..653cfa69e6b 100644
--- a/module/spring-boot-data-couchbase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-couchbase/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,4 +1,4 @@
-org.springframework.boot.data.couchbase.autoconfigure.CouchbaseDataAutoConfiguration
-org.springframework.boot.data.couchbase.autoconfigure.CouchbaseReactiveDataAutoConfiguration
-org.springframework.boot.data.couchbase.autoconfigure.CouchbaseReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.couchbase.autoconfigure.CouchbaseRepositoriesAutoConfiguration
+org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseAutoConfiguration
+org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseReactiveAutoConfiguration
+org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.couchbase.autoconfigure.DataCouchbaseRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfigurationTests.java b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseAutoConfigurationTests.java
similarity index 97%
rename from module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfigurationTests.java
rename to module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseAutoConfigurationTests.java
index 46fcb6b4993..f8ea724bed1 100644
--- a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseAutoConfigurationTests.java
@@ -44,15 +44,15 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CouchbaseDataAutoConfiguration}.
+ * Tests for {@link DataCouchbaseAutoConfiguration}.
  *
  * @author Stephane Nicoll
  */
-class CouchbaseDataAutoConfigurationTests {
+class DataCouchbaseAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(ValidationAutoConfiguration.class, CouchbaseAutoConfiguration.class,
-				CouchbaseDataAutoConfiguration.class));
+				DataCouchbaseAutoConfiguration.class));
 
 	@Test
 	void disabledIfCouchbaseIsNotConfigured() {
diff --git a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java
similarity index 87%
rename from module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java
index e3afca1a81e..d2d072dc072 100644
--- a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests.java
@@ -37,12 +37,12 @@ import org.springframework.util.StringUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CouchbaseRepositoriesAutoConfiguration} and
- * {@link CouchbaseReactiveRepositoriesAutoConfiguration}.
+ * Tests for {@link DataCouchbaseRepositoriesAutoConfiguration} and
+ * {@link DataCouchbaseReactiveRepositoriesAutoConfiguration}.
  *
  * @author Stephane Nicoll
  */
-class CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests {
+class DataCouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests {
 
 	@Test
 	void shouldCreateInstancesForReactiveAndImperativeRepositories() {
@@ -72,9 +72,9 @@ class CouchbaseReactiveAndImperativeRepositoriesAutoConfigurationTests {
 		public String[] selectImports(AnnotationMetadata importingClassMetadata) {
 			List<String> names = new ArrayList<>();
 			for (Class<?> type : new Class<?>[] { CouchbaseAutoConfiguration.class,
-					CouchbaseDataAutoConfiguration.class, CouchbaseRepositoriesAutoConfiguration.class,
-					CouchbaseReactiveDataAutoConfiguration.class,
-					CouchbaseReactiveRepositoriesAutoConfiguration.class }) {
+					DataCouchbaseAutoConfiguration.class, DataCouchbaseRepositoriesAutoConfiguration.class,
+					DataCouchbaseReactiveAutoConfiguration.class,
+					DataCouchbaseReactiveRepositoriesAutoConfiguration.class }) {
 				names.add(type.getName());
 			}
 			return StringUtils.toStringArray(names);
diff --git a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataAutoConfigurationTests.java b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAutoConfigurationTests.java
similarity index 95%
rename from module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataAutoConfigurationTests.java
rename to module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAutoConfigurationTests.java
index 63a0939241b..81ba6af9723 100644
--- a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveAutoConfigurationTests.java
@@ -42,16 +42,16 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CouchbaseReactiveDataAutoConfiguration}.
+ * Tests for {@link DataCouchbaseReactiveAutoConfiguration}.
  *
  * @author Alex Derkach
  * @author Stephane Nicoll
  */
-class CouchbaseReactiveDataAutoConfigurationTests {
+class DataCouchbaseReactiveAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(ValidationAutoConfiguration.class, CouchbaseAutoConfiguration.class,
-				CouchbaseDataAutoConfiguration.class, CouchbaseReactiveDataAutoConfiguration.class));
+				DataCouchbaseAutoConfiguration.class, DataCouchbaseReactiveAutoConfiguration.class));
 
 	@Test
 	void disabledIfCouchbaseIsNotConfigured() {
diff --git a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesAutoConfigurationTests.java
similarity index 89%
rename from module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesAutoConfigurationTests.java
index 0115376064f..3b94dc55e89 100644
--- a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseReactiveRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseReactiveRepositoriesAutoConfigurationTests.java
@@ -33,17 +33,17 @@ import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepos
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CouchbaseReactiveRepositoriesAutoConfiguration}.
+ * Tests for {@link DataCouchbaseReactiveRepositoriesAutoConfiguration}.
  *
  * @author Alex Derkach
  * @author Stephane Nicoll
  */
-class CouchbaseReactiveRepositoriesAutoConfigurationTests {
+class DataCouchbaseReactiveRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class, CouchbaseDataAutoConfiguration.class,
-				CouchbaseRepositoriesAutoConfiguration.class, CouchbaseReactiveDataAutoConfiguration.class,
-				CouchbaseReactiveRepositoriesAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class, DataCouchbaseAutoConfiguration.class,
+				DataCouchbaseRepositoriesAutoConfiguration.class, DataCouchbaseReactiveAutoConfiguration.class,
+				DataCouchbaseReactiveRepositoriesAutoConfiguration.class));
 
 	@Test
 	void couchbaseNotAvailable() {
@@ -97,7 +97,7 @@ class CouchbaseReactiveRepositoriesAutoConfigurationTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@TestAutoConfigurationPackage(CouchbaseReactiveRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataCouchbaseReactiveRepositoriesAutoConfigurationTests.class)
 	@EnableCouchbaseRepositories(basePackageClasses = CityRepository.class)
 	@Import(CouchbaseMockConfiguration.class)
 	static class CustomizedConfiguration {
diff --git a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesAutoConfigurationTests.java
similarity index 93%
rename from module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesAutoConfigurationTests.java
index a1ac6d0af5b..2089c6a144f 100644
--- a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseRepositoriesAutoConfigurationTests.java
@@ -31,16 +31,16 @@ import org.springframework.context.annotation.Import;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link CouchbaseRepositoriesAutoConfiguration}.
+ * Tests for {@link DataCouchbaseRepositoriesAutoConfiguration}.
  *
  * @author Eddú Meléndez
  * @author Stephane Nicoll
  */
-class CouchbaseRepositoriesAutoConfigurationTests {
+class DataCouchbaseRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class, CouchbaseDataAutoConfiguration.class,
-				CouchbaseRepositoriesAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(CouchbaseAutoConfiguration.class, DataCouchbaseAutoConfiguration.class,
+				DataCouchbaseRepositoriesAutoConfiguration.class));
 
 	@Test
 	void couchbaseNotAvailable() {
diff --git a/module/spring-boot-data-elasticsearch-test/src/main/resources/META-INF/spring/org.springframework.boot.data.elasticsearch.test.autoconfigure.AutoConfigureDataElasticsearch.imports b/module/spring-boot-data-elasticsearch-test/src/main/resources/META-INF/spring/org.springframework.boot.data.elasticsearch.test.autoconfigure.AutoConfigureDataElasticsearch.imports
index c35ec73221d..3d96aac2a49 100644
--- a/module/spring-boot-data-elasticsearch-test/src/main/resources/META-INF/spring/org.springframework.boot.data.elasticsearch.test.autoconfigure.AutoConfigureDataElasticsearch.imports
+++ b/module/spring-boot-data-elasticsearch-test/src/main/resources/META-INF/spring/org.springframework.boot.data.elasticsearch.test.autoconfigure.AutoConfigureDataElasticsearch.imports
@@ -1,7 +1,7 @@
 org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration
-org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration
-org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchRepositoriesAutoConfiguration
+org.springframework.boot.data.elasticsearch.autoconfigure.DataElasticsearchAutoConfiguration
+org.springframework.boot.data.elasticsearch.autoconfigure.DataElasticsearchReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.elasticsearch.autoconfigure.DataElasticsearchRepositoriesAutoConfiguration
 org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchClientAutoConfiguration
 org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchReactiveClientAutoConfiguration
 org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration
diff --git a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java
similarity index 93%
rename from module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java
index b01671ab077..d08254b1985 100644
--- a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java
@@ -41,7 +41,7 @@ import org.springframework.data.elasticsearch.repository.config.EnableReactiveEl
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link ElasticsearchReactiveRepositoriesAutoConfiguration}.
+ * Tests for {@link DataElasticsearchReactiveRepositoriesAutoConfiguration}.
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
@@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Scott Frederick
  */
 @Testcontainers(disabledWithoutDocker = true)
-class ElasticsearchReactiveRepositoriesAutoConfigurationTests {
+class DataElasticsearchReactiveRepositoriesAutoConfigurationTests {
 
 	@Container
 	static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class);
@@ -57,7 +57,7 @@ class ElasticsearchReactiveRepositoriesAutoConfigurationTests {
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(ElasticsearchClientAutoConfiguration.class,
 				ElasticsearchRestClientAutoConfiguration.class,
-				ElasticsearchReactiveRepositoriesAutoConfiguration.class, ElasticsearchDataAutoConfiguration.class,
+				DataElasticsearchReactiveRepositoriesAutoConfiguration.class, DataElasticsearchAutoConfiguration.class,
 				ElasticsearchReactiveClientAutoConfiguration.class))
 		.withPropertyValues(
 				"spring.elasticsearch.uris=" + elasticsearch.getHost() + ":" + elasticsearch.getFirstMappedPort(),
@@ -68,7 +68,7 @@ class ElasticsearchReactiveRepositoriesAutoConfigurationTests {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class)
 			.withClassLoader(new FilteredClassLoader(Mono.class))
 			.run((context) -> assertThat(context)
-				.doesNotHaveBean(ElasticsearchReactiveRepositoriesAutoConfiguration.class));
+				.doesNotHaveBean(DataElasticsearchReactiveRepositoriesAutoConfiguration.class));
 	}
 
 	@Test
diff --git a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfigurationTests.java
similarity index 93%
rename from module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfigurationTests.java
index 2e9e12d3b7d..57ed2121dce 100644
--- a/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfigurationTests.java
@@ -38,7 +38,7 @@ import org.springframework.data.elasticsearch.repository.config.EnableElasticsea
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link ElasticsearchRepositoriesAutoConfiguration}.
+ * Tests for {@link DataElasticsearchRepositoriesAutoConfiguration}.
  *
  * @author Phillip Webb
  * @author Andy Wilkinson
@@ -46,15 +46,15 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Scott Frederick
  */
 @Testcontainers(disabledWithoutDocker = true)
-class ElasticsearchRepositoriesAutoConfigurationTests {
+class DataElasticsearchRepositoriesAutoConfigurationTests {
 
 	@Container
 	static final ElasticsearchContainer elasticsearch = TestImage.container(ElasticsearchContainer.class);
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class,
-				ElasticsearchClientAutoConfiguration.class, ElasticsearchRepositoriesAutoConfiguration.class,
-				ElasticsearchDataAutoConfiguration.class))
+				ElasticsearchClientAutoConfiguration.class, DataElasticsearchRepositoriesAutoConfiguration.class,
+				DataElasticsearchAutoConfiguration.class))
 		.withPropertyValues("spring.elasticsearch.uris=" + elasticsearch.getHttpHostAddress());
 
 	@Test
diff --git a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataAutoConfiguration.java b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfiguration.java
similarity index 88%
rename from module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataAutoConfiguration.java
rename to module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfiguration.java
index 5bd2e0fe3cf..c9e74e3e0ae 100644
--- a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataAutoConfiguration.java
+++ b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfiguration.java
@@ -40,9 +40,9 @@ import org.springframework.data.elasticsearch.repository.config.EnableReactiveEl
 @AutoConfiguration(
 		after = { ElasticsearchClientAutoConfiguration.class, ElasticsearchReactiveClientAutoConfiguration.class })
 @ConditionalOnClass({ ElasticsearchTemplate.class })
-@Import({ ElasticsearchDataConfiguration.BaseConfiguration.class,
-		ElasticsearchDataConfiguration.JavaClientConfiguration.class,
-		ElasticsearchDataConfiguration.ReactiveRestClientConfiguration.class })
-public final class ElasticsearchDataAutoConfiguration {
+@Import({ DataElasticsearchConfiguration.BaseConfiguration.class,
+		DataElasticsearchConfiguration.JavaClientConfiguration.class,
+		DataElasticsearchConfiguration.ReactiveRestClientConfiguration.class })
+public final class DataElasticsearchAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataConfiguration.java b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchConfiguration.java
similarity index 98%
rename from module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataConfiguration.java
rename to module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchConfiguration.java
index ea4d0ee8786..e843b5f7bcc 100644
--- a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataConfiguration.java
+++ b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchConfiguration.java
@@ -48,7 +48,7 @@ import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMa
  * @author Scott Frederick
  * @author Stephane Nicoll
  */
-abstract class ElasticsearchDataConfiguration {
+abstract class DataElasticsearchConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	static class BaseConfiguration {
diff --git a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesAutoConfiguration.java b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfiguration.java
similarity index 93%
rename from module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfiguration.java
index b654e1a1952..da8d3ab8464 100644
--- a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfiguration.java
@@ -41,7 +41,7 @@ import org.springframework.data.elasticsearch.repository.support.ReactiveElastic
 @ConditionalOnClass({ ReactiveElasticsearchClient.class, ReactiveElasticsearchRepository.class, Mono.class })
 @ConditionalOnBooleanProperty(name = "spring.data.elasticsearch.repositories.enabled", matchIfMissing = true)
 @ConditionalOnMissingBean(ReactiveElasticsearchRepositoryFactoryBean.class)
-@Import(ElasticsearchReactiveRepositoriesRegistrar.class)
-public final class ElasticsearchReactiveRepositoriesAutoConfiguration {
+@Import(DataElasticsearchReactiveRepositoriesRegistrar.class)
+public final class DataElasticsearchReactiveRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesRegistrar.java b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesRegistrar.java
similarity index 94%
rename from module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesRegistrar.java
rename to module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesRegistrar.java
index d70821f3238..6c8c383ab87 100644
--- a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchReactiveRepositoriesRegistrar.java
+++ b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Brian Clozel
  */
-class ElasticsearchReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataElasticsearchReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesAutoConfiguration.java b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfiguration.java
similarity index 93%
rename from module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfiguration.java
index 68ee38f33e6..0396df1f9d1 100644
--- a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfiguration.java
@@ -39,7 +39,7 @@ import org.springframework.data.elasticsearch.repository.support.ElasticsearchRe
 @ConditionalOnClass(ElasticsearchRepository.class)
 @ConditionalOnBooleanProperty(name = "spring.data.elasticsearch.repositories.enabled", matchIfMissing = true)
 @ConditionalOnMissingBean(ElasticsearchRepositoryFactoryBean.class)
-@Import(ElasticsearchRepositoriesRegistrar.class)
-public final class ElasticsearchRepositoriesAutoConfiguration {
+@Import(DataElasticsearchRepositoriesRegistrar.class)
+public final class DataElasticsearchRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesRegistrar.java b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesRegistrar.java
similarity index 94%
rename from module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesRegistrar.java
rename to module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesRegistrar.java
index 3c91b474014..a41952e8801 100644
--- a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchRepositoriesRegistrar.java
+++ b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesRegistrar.java
@@ -31,7 +31,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  * @author Artur Konczak
  * @author Mohsin Husen
  */
-class ElasticsearchRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataElasticsearchRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/ElasticsearchReactiveHealthContributorAutoConfiguration.java b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/DataElasticsearchReactiveHealthContributorAutoConfiguration.java
similarity index 81%
rename from module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/ElasticsearchReactiveHealthContributorAutoConfiguration.java
rename to module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/DataElasticsearchReactiveHealthContributorAutoConfiguration.java
index 5b3bbc1c4c4..d2d6b630066 100644
--- a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/ElasticsearchReactiveHealthContributorAutoConfiguration.java
+++ b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/DataElasticsearchReactiveHealthContributorAutoConfiguration.java
@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.data.elasticsearch.health.ElasticsearchReactiveHealthIndicator;
+import org.springframework.boot.data.elasticsearch.health.DataElasticsearchReactiveHealthIndicator;
 import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchReactiveClientAutoConfiguration;
 import org.springframework.boot.health.autoconfigure.contributor.CompositeReactiveHealthContributorConfiguration;
 import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
@@ -34,22 +34,22 @@ import org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchCl
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for
- * {@link ElasticsearchReactiveHealthIndicator} using the
+ * {@link DataElasticsearchReactiveHealthIndicator} using the
  * {@link ReactiveElasticsearchClient}.
  *
  * @author Aleksander Lech
  * @since 4.0.0
  */
 @AutoConfiguration(after = ElasticsearchReactiveClientAutoConfiguration.class)
-@ConditionalOnClass({ ReactiveElasticsearchClient.class, Flux.class, ElasticsearchReactiveHealthIndicator.class,
+@ConditionalOnClass({ ReactiveElasticsearchClient.class, Flux.class, DataElasticsearchReactiveHealthIndicator.class,
 		ConditionalOnEnabledHealthIndicator.class })
 @ConditionalOnBean(ReactiveElasticsearchClient.class)
 @ConditionalOnEnabledHealthIndicator("elasticsearch")
-public final class ElasticsearchReactiveHealthContributorAutoConfiguration extends
-		CompositeReactiveHealthContributorConfiguration<ElasticsearchReactiveHealthIndicator, ReactiveElasticsearchClient> {
+public final class DataElasticsearchReactiveHealthContributorAutoConfiguration extends
+		CompositeReactiveHealthContributorConfiguration<DataElasticsearchReactiveHealthIndicator, ReactiveElasticsearchClient> {
 
-	ElasticsearchReactiveHealthContributorAutoConfiguration() {
-		super(ElasticsearchReactiveHealthIndicator::new);
+	DataElasticsearchReactiveHealthContributorAutoConfiguration() {
+		super(DataElasticsearchReactiveHealthIndicator::new);
 	}
 
 	@Bean
diff --git a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/health/ElasticsearchReactiveHealthIndicator.java b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/health/DataElasticsearchReactiveHealthIndicator.java
similarity index 94%
rename from module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/health/ElasticsearchReactiveHealthIndicator.java
rename to module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/health/DataElasticsearchReactiveHealthIndicator.java
index d5a2c41695e..61958d8db52 100644
--- a/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/health/ElasticsearchReactiveHealthIndicator.java
+++ b/module/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/health/DataElasticsearchReactiveHealthIndicator.java
@@ -35,11 +35,11 @@ import org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchCl
  * @author Scott Frederick
  * @since 4.0.0
  */
-public class ElasticsearchReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
+public class DataElasticsearchReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
 
 	private final ReactiveElasticsearchClient client;
 
-	public ElasticsearchReactiveHealthIndicator(ReactiveElasticsearchClient client) {
+	public DataElasticsearchReactiveHealthIndicator(ReactiveElasticsearchClient client) {
 		super("Elasticsearch health check failed");
 		this.client = client;
 	}
diff --git a/module/spring-boot-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index fe06cff203d..929d9cd8a6a 100644
--- a/module/spring-boot-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,4 +1,4 @@
-org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration
-org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchRepositoriesAutoConfiguration
-org.springframework.boot.data.elasticsearch.autoconfigure.health.ElasticsearchReactiveHealthContributorAutoConfiguration
+org.springframework.boot.data.elasticsearch.autoconfigure.DataElasticsearchAutoConfiguration
+org.springframework.boot.data.elasticsearch.autoconfigure.DataElasticsearchReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.elasticsearch.autoconfigure.DataElasticsearchRepositoriesAutoConfiguration
+org.springframework.boot.data.elasticsearch.autoconfigure.health.DataElasticsearchReactiveHealthContributorAutoConfiguration
diff --git a/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataAutoConfigurationTests.java b/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java
similarity index 96%
rename from module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataAutoConfigurationTests.java
rename to module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java
index e07aaf29bdf..42aac06ebac 100644
--- a/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchAutoConfigurationTests.java
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link ElasticsearchDataAutoConfiguration}.
+ * Tests for {@link DataElasticsearchAutoConfiguration}.
  *
  * @author Phillip Webb
  * @author Artur Konczak
@@ -52,11 +52,11 @@ import static org.mockito.Mockito.mock;
  * @author Scott Frederick
  * @author Stephane Nicoll
  */
-class ElasticsearchDataAutoConfigurationTests {
+class DataElasticsearchAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class,
-				ElasticsearchClientAutoConfiguration.class, ElasticsearchDataAutoConfiguration.class,
+				ElasticsearchClientAutoConfiguration.class, DataElasticsearchAutoConfiguration.class,
 				ElasticsearchReactiveClientAutoConfiguration.class));
 
 	@Test
diff --git a/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/ElasticsearchReactiveHealthContributorAutoConfigurationTests.java b/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/DataElasticsearchReactiveHealthContributorAutoConfigurationTests.java
similarity index 77%
rename from module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/ElasticsearchReactiveHealthContributorAutoConfigurationTests.java
rename to module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/DataElasticsearchReactiveHealthContributorAutoConfigurationTests.java
index 3b972f055fb..0a0e67ecbf8 100644
--- a/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/ElasticsearchReactiveHealthContributorAutoConfigurationTests.java
+++ b/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/autoconfigure/health/DataElasticsearchReactiveHealthContributorAutoConfigurationTests.java
@@ -19,8 +19,8 @@ package org.springframework.boot.data.elasticsearch.autoconfigure.health;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.data.elasticsearch.autoconfigure.ElasticsearchDataAutoConfiguration;
-import org.springframework.boot.data.elasticsearch.health.ElasticsearchReactiveHealthIndicator;
+import org.springframework.boot.data.elasticsearch.autoconfigure.DataElasticsearchAutoConfiguration;
+import org.springframework.boot.data.elasticsearch.health.DataElasticsearchReactiveHealthIndicator;
 import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchReactiveClientAutoConfiguration;
 import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchRestClientAutoConfiguration;
 import org.springframework.boot.elasticsearch.autoconfigure.health.ElasticsearchRestHealthContributorAutoConfiguration;
@@ -31,22 +31,22 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link ElasticsearchReactiveHealthContributorAutoConfiguration}.
+ * Tests for {@link DataElasticsearchReactiveHealthContributorAutoConfiguration}.
  *
  * @author Aleksander Lech
  */
-class ElasticsearchReactiveHealthContributorAutoConfigurationTests {
+class DataElasticsearchReactiveHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(ElasticsearchDataAutoConfiguration.class,
+		.withConfiguration(AutoConfigurations.of(DataElasticsearchAutoConfiguration.class,
 				ElasticsearchReactiveClientAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class,
-				ElasticsearchReactiveHealthContributorAutoConfiguration.class,
+				DataElasticsearchReactiveHealthContributorAutoConfiguration.class,
 				HealthContributorAutoConfiguration.class));
 
 	@Test
 	void runShouldCreateIndicator() {
 		this.contextRunner
-			.run((context) -> assertThat(context).hasSingleBean(ElasticsearchReactiveHealthIndicator.class)
+			.run((context) -> assertThat(context).hasSingleBean(DataElasticsearchReactiveHealthIndicator.class)
 				.hasBean("elasticsearchHealthContributor"));
 	}
 
@@ -54,7 +54,7 @@ class ElasticsearchReactiveHealthContributorAutoConfigurationTests {
 	void runWithRegularIndicatorShouldOnlyCreateReactiveIndicator() {
 		this.contextRunner
 			.withConfiguration(AutoConfigurations.of(ElasticsearchRestHealthContributorAutoConfiguration.class))
-			.run((context) -> assertThat(context).hasSingleBean(ElasticsearchReactiveHealthIndicator.class)
+			.run((context) -> assertThat(context).hasSingleBean(DataElasticsearchReactiveHealthIndicator.class)
 				.hasBean("elasticsearchHealthContributor")
 				.doesNotHaveBean(ElasticsearchRestClientHealthIndicator.class));
 	}
@@ -62,7 +62,7 @@ class ElasticsearchReactiveHealthContributorAutoConfigurationTests {
 	@Test
 	void runWhenDisabledShouldNotCreateIndicator() {
 		this.contextRunner.withPropertyValues("management.health.elasticsearch.enabled:false")
-			.run((context) -> assertThat(context).doesNotHaveBean(ElasticsearchReactiveHealthIndicator.class)
+			.run((context) -> assertThat(context).doesNotHaveBean(DataElasticsearchReactiveHealthIndicator.class)
 				.doesNotHaveBean("elasticsearchHealthContributor"));
 	}
 
diff --git a/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/health/ElasticsearchReactiveHealthIndicatorTests.java b/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/health/DataElasticsearchReactiveHealthIndicatorTests.java
similarity index 95%
rename from module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/health/ElasticsearchReactiveHealthIndicatorTests.java
rename to module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/health/DataElasticsearchReactiveHealthIndicatorTests.java
index a1317e5ac19..1c00a199acf 100644
--- a/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/health/ElasticsearchReactiveHealthIndicatorTests.java
+++ b/module/spring-boot-data-elasticsearch/src/test/java/org/springframework/boot/data/elasticsearch/health/DataElasticsearchReactiveHealthIndicatorTests.java
@@ -42,18 +42,18 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
 /**
- * Tests for {@link ElasticsearchReactiveHealthIndicator}
+ * Tests for {@link DataElasticsearchReactiveHealthIndicator}
  *
  * @author Brian Clozel
  * @author Scott Frederick
  */
-class ElasticsearchReactiveHealthIndicatorTests {
+class DataElasticsearchReactiveHealthIndicatorTests {
 
 	private static final Duration TIMEOUT = Duration.ofSeconds(5);
 
 	private MockWebServer server;
 
-	private ElasticsearchReactiveHealthIndicator healthIndicator;
+	private DataElasticsearchReactiveHealthIndicator healthIndicator;
 
 	@BeforeEach
 	void setup() throws Exception {
@@ -62,7 +62,7 @@ class ElasticsearchReactiveHealthIndicatorTests {
 		ReactiveElasticsearchClient client = new ReactiveElasticsearchClient(new Rest5ClientTransport(
 				Rest5Client.builder(HttpHost.create(this.server.getHostName() + ":" + this.server.getPort())).build(),
 				new JacksonJsonpMapper()));
-		this.healthIndicator = new ElasticsearchReactiveHealthIndicator(client);
+		this.healthIndicator = new DataElasticsearchReactiveHealthIndicator(client);
 	}
 
 	@AfterEach
diff --git a/module/spring-boot-data-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.jdbc.test.autoconfigure.AutoConfigureDataJdbc.imports b/module/spring-boot-data-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.jdbc.test.autoconfigure.AutoConfigureDataJdbc.imports
index 8594a630c36..ee9f1e020df 100644
--- a/module/spring-boot-data-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.jdbc.test.autoconfigure.AutoConfigureDataJdbc.imports
+++ b/module/spring-boot-data-jdbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.jdbc.test.autoconfigure.AutoConfigureDataJdbc.imports
@@ -1 +1 @@
-org.springframework.boot.data.jdbc.autoconfigure.JdbcRepositoriesAutoConfiguration
+org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDatabaseDialect.java b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcDatabaseDialect.java
similarity index 96%
rename from module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDatabaseDialect.java
rename to module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcDatabaseDialect.java
index bd68be0481f..1da0329c485 100644
--- a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDatabaseDialect.java
+++ b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcDatabaseDialect.java
@@ -31,7 +31,7 @@ import org.springframework.data.relational.core.dialect.Dialect;
  * @author Jens Schauder
  * @since 4.0.0
  */
-public enum JdbcDatabaseDialect {
+public enum DataJdbcDatabaseDialect {
 
 	/**
 	 * Provides an instance of {@link JdbcDb2Dialect}.
@@ -77,7 +77,7 @@ public enum JdbcDatabaseDialect {
 
 	private final Dialect dialect;
 
-	JdbcDatabaseDialect(Dialect dialect) {
+	DataJdbcDatabaseDialect(Dialect dialect) {
 		this.dialect = dialect;
 	}
 
diff --git a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java
index c491535e695..b052dee820b 100644
--- a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java
+++ b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java
@@ -33,13 +33,13 @@ public class DataJdbcProperties {
 	 * Dialect to use. By default, the dialect is determined by inspecting the database
 	 * connection.
 	 */
-	private @Nullable JdbcDatabaseDialect dialect;
+	private @Nullable DataJdbcDatabaseDialect dialect;
 
-	public @Nullable JdbcDatabaseDialect getDialect() {
+	public @Nullable DataJdbcDatabaseDialect getDialect() {
 		return this.dialect;
 	}
 
-	public void setDialect(@Nullable JdbcDatabaseDialect dialect) {
+	public void setDialect(@Nullable DataJdbcDatabaseDialect dialect) {
 		this.dialect = dialect;
 	}
 
diff --git a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfiguration.java
similarity index 97%
rename from module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfiguration.java
index c88e615f1de..91dea356956 100644
--- a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfiguration.java
@@ -69,11 +69,11 @@ import org.springframework.transaction.PlatformTransactionManager;
 @ConditionalOnClass({ NamedParameterJdbcOperations.class, AbstractJdbcConfiguration.class })
 @ConditionalOnBooleanProperty(name = "spring.data.jdbc.repositories.enabled", matchIfMissing = true)
 @EnableConfigurationProperties(DataJdbcProperties.class)
-public final class JdbcRepositoriesAutoConfiguration {
+public final class DataJdbcRepositoriesAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingBean(JdbcRepositoryConfigExtension.class)
-	@Import(JdbcRepositoriesRegistrar.class)
+	@Import(DataJdbcRepositoriesRegistrar.class)
 	static class JdbcRepositoriesConfiguration {
 
 	}
@@ -146,7 +146,7 @@ public final class JdbcRepositoriesAutoConfiguration {
 		@Bean
 		@ConditionalOnMissingBean
 		public Dialect jdbcDialect(NamedParameterJdbcOperations operations) {
-			JdbcDatabaseDialect dialect = this.properties.getDialect();
+			DataJdbcDatabaseDialect dialect = this.properties.getDialect();
 			return (dialect != null) ? dialect.getDialect() : super.jdbcDialect(operations);
 		}
 
diff --git a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesRegistrar.java b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesRegistrar.java
similarity index 95%
rename from module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesRegistrar.java
rename to module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesRegistrar.java
index 03811a1b7a3..75f3a6ad966 100644
--- a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesRegistrar.java
+++ b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Andy Wilkinson
  */
-class JdbcRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataJdbcRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 8594a630c36..ee9f1e020df 100644
--- a/module/spring-boot-data-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-org.springframework.boot.data.jdbc.autoconfigure.JdbcRepositoriesAutoConfiguration
+org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationTests.java
similarity index 98%
rename from module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationTests.java
index 6f6a1c25b08..d1d50d17c16 100644
--- a/module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-jdbc/src/test/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcRepositoriesAutoConfigurationTests.java
@@ -55,7 +55,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link JdbcRepositoriesAutoConfiguration}.
+ * Tests for {@link DataJdbcRepositoriesAutoConfiguration}.
  *
  * @author Andy Wilkinson
  * @author Stephane Nicoll
@@ -73,10 +73,10 @@ import static org.mockito.Mockito.mock;
 		""")
 @WithResource(name = "data.sql",
 		content = "INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');")
-class JdbcRepositoriesAutoConfigurationTests {
+class DataJdbcRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(JdbcRepositoriesAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataJdbcRepositoriesAutoConfiguration.class));
 
 	@Test
 	void backsOffWithNoDataSource() {
diff --git a/module/spring-boot-data-jpa-test/src/main/resources/META-INF/spring/org.springframework.boot.data.jpa.test.autoconfigure.AutoConfigureDataJpa.imports b/module/spring-boot-data-jpa-test/src/main/resources/META-INF/spring/org.springframework.boot.data.jpa.test.autoconfigure.AutoConfigureDataJpa.imports
index 5bfab1758cf..da069ef78d1 100644
--- a/module/spring-boot-data-jpa-test/src/main/resources/META-INF/spring/org.springframework.boot.data.jpa.test.autoconfigure.AutoConfigureDataJpa.imports
+++ b/module/spring-boot-data-jpa-test/src/main/resources/META-INF/spring/org.springframework.boot.data.jpa.test.autoconfigure.AutoConfigureDataJpa.imports
@@ -1,2 +1,2 @@
-org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration
+org.springframework.boot.data.jpa.autoconfigure.DataJpaRepositoriesAutoConfiguration
 org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration
diff --git a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesAutoConfiguration.java
similarity index 96%
rename from module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesAutoConfiguration.java
index 7fc7018cea4..1cd398afad0 100644
--- a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesAutoConfiguration.java
@@ -32,7 +32,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
-import org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration.JpaRepositoriesImportSelector;
+import org.springframework.boot.data.jpa.autoconfigure.DataJpaRepositoriesAutoConfiguration.JpaRepositoriesImportSelector;
 import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
 import org.springframework.boot.jpa.autoconfigure.EntityManagerFactoryBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
@@ -80,7 +80,7 @@ import org.springframework.util.ClassUtils;
 @ConditionalOnMissingBean({ JpaRepositoryFactoryBean.class, JpaRepositoryConfigExtension.class })
 @ConditionalOnBooleanProperty(name = "spring.data.jpa.repositories.enabled", matchIfMissing = true)
 @Import(JpaRepositoriesImportSelector.class)
-public final class JpaRepositoriesAutoConfiguration {
+public final class DataJpaRepositoriesAutoConfiguration {
 
 	@Bean
 	@Conditional(BootstrapExecutorCondition.class)
@@ -137,7 +137,7 @@ public final class JpaRepositoriesAutoConfiguration {
 
 		private String determineImport() {
 			return ENVERS_AVAILABLE ? EnversRevisionRepositoriesRegistrar.class.getName()
-					: JpaRepositoriesRegistrar.class.getName();
+					: DataJpaRepositoriesRegistrar.class.getName();
 		}
 
 	}
diff --git a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesRegistrar.java b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesRegistrar.java
similarity index 96%
rename from module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesRegistrar.java
rename to module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesRegistrar.java
index 328a13cdc4c..b571b03c626 100644
--- a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesRegistrar.java
+++ b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesRegistrar.java
@@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @author Scott Frederick
  */
-class JpaRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataJpaRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	private @Nullable BootstrapMode bootstrapMode;
 
diff --git a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/EnversRevisionRepositoriesRegistrar.java b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/EnversRevisionRepositoriesRegistrar.java
index de76eb51736..9a1d20ad63c 100644
--- a/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/EnversRevisionRepositoriesRegistrar.java
+++ b/module/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/EnversRevisionRepositoriesRegistrar.java
@@ -26,7 +26,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
  *
  * @author Stefano Cordio
  */
-class EnversRevisionRepositoriesRegistrar extends JpaRepositoriesRegistrar {
+class EnversRevisionRepositoriesRegistrar extends DataJpaRepositoriesRegistrar {
 
 	@Override
 	protected Class<?> getConfiguration() {
diff --git a/module/spring-boot-data-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index ae0f029c174..722933ada09 100644
--- a/module/spring-boot-data-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-jpa/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration
+org.springframework.boot.data.jpa.autoconfigure.DataJpaRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/AbstractJpaRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/AbstractDataJpaRepositoriesAutoConfigurationTests.java
similarity index 97%
rename from module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/AbstractJpaRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/AbstractDataJpaRepositoriesAutoConfigurationTests.java
index 90fcf9e7378..bd12094b0bc 100644
--- a/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/AbstractJpaRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/AbstractDataJpaRepositoriesAutoConfigurationTests.java
@@ -48,18 +48,18 @@ import org.springframework.transaction.PlatformTransactionManager;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Base class for {@link JpaRepositoriesAutoConfiguration} tests.
+ * Base class for {@link DataJpaRepositoriesAutoConfiguration} tests.
  *
  * @author Dave Syer
  * @author Oliver Gierke
  * @author Scott Frederick
  * @author Stefano Cordio
  */
-abstract class AbstractJpaRepositoriesAutoConfigurationTests {
+abstract class AbstractDataJpaRepositoriesAutoConfigurationTests {
 
 	final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(HibernateJpaAutoConfiguration.class,
-				JpaRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class))
+				DataJpaRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class))
 		.withUserConfiguration(EmbeddedDataSourceConfiguration.class);
 
 	@Test
diff --git a/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesAutoConfigurationTests.java
similarity index 85%
rename from module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesAutoConfigurationTests.java
index db4b1bcf77f..e4be70fd347 100644
--- a/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesAutoConfigurationTests.java
@@ -24,13 +24,13 @@ import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link JpaRepositoriesAutoConfiguration} without Spring Data Envers on the
- * classpath.
+ * Tests for {@link DataJpaRepositoriesAutoConfiguration} without Spring Data Envers on
+ * the classpath.
  *
  * @author Stefano Cordio
  */
 @ClassPathExclusions("spring-data-envers-*.jar")
-class JpaRepositoriesAutoConfigurationTests extends AbstractJpaRepositoriesAutoConfigurationTests {
+class DataJpaRepositoriesAutoConfigurationTests extends AbstractDataJpaRepositoriesAutoConfigurationTests {
 
 	@Test
 	void autoConfigurationShouldFailWithRevisionRepository() {
diff --git a/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/EnversRevisionRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesWithEnversRevisionAutoConfigurationTests.java
similarity index 84%
rename from module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/EnversRevisionRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesWithEnversRevisionAutoConfigurationTests.java
index 28323aeb2a8..5a87f04f993 100644
--- a/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/EnversRevisionRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesWithEnversRevisionAutoConfigurationTests.java
@@ -23,12 +23,13 @@ import org.springframework.boot.data.jpa.autoconfigure.domain.country.CountryRep
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link JpaRepositoriesAutoConfiguration} with Spring Data Envers on the
+ * Tests for {@link DataJpaRepositoriesAutoConfiguration} with Spring Data Envers on the
  * classpath.
  *
  * @author Stefano Cordio
  */
-class EnversRevisionRepositoriesAutoConfigurationTests extends AbstractJpaRepositoriesAutoConfigurationTests {
+class DataJpaRepositoriesWithEnversRevisionAutoConfigurationTests
+		extends AbstractDataJpaRepositoriesAutoConfigurationTests {
 
 	@Test
 	void autoConfigurationShouldSucceedWithRevisionRepository() {
diff --git a/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesSpringDataWebAutoConfigurationTests.java b/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesWithSpringDataWebAutoConfigurationTests.java
similarity index 89%
rename from module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesSpringDataWebAutoConfigurationTests.java
rename to module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesWithSpringDataWebAutoConfigurationTests.java
index 44b1e19aee4..cef7815976e 100644
--- a/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesSpringDataWebAutoConfigurationTests.java
+++ b/module/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/DataJpaRepositoriesWithSpringDataWebAutoConfigurationTests.java
@@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
-import org.springframework.boot.data.autoconfigure.web.SpringDataWebAutoConfiguration;
+import org.springframework.boot.data.autoconfigure.web.DataWebAutoConfiguration;
 import org.springframework.boot.data.jpa.autoconfigure.domain.city.City;
 import org.springframework.boot.data.jpa.autoconfigure.domain.city.CityRepository;
 import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
@@ -36,17 +36,17 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringDataWebAutoConfiguration} and
- * {@link JpaRepositoriesAutoConfiguration}.
+ * Tests for {@link DataWebAutoConfiguration} and
+ * {@link DataJpaRepositoriesAutoConfiguration}.
  *
  * @author Dave Syer
  * @author Stephane Nicoll
  */
-class JpaRepositoriesSpringDataWebAutoConfigurationTests {
+class DataJpaRepositoriesWithSpringDataWebAutoConfigurationTests {
 
 	private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-				JpaRepositoriesAutoConfiguration.class, SpringDataWebAutoConfiguration.class))
+				DataJpaRepositoriesAutoConfiguration.class, DataWebAutoConfiguration.class))
 		.withPropertyValues("spring.datasource.generate-unique-name=true");
 
 	@Test
diff --git a/module/spring-boot-data-ldap-test/src/main/resources/META-INF/spring/org.springframework.boot.data.ldap.test.autoconfigure.AutoConfigureDataLdap.imports b/module/spring-boot-data-ldap-test/src/main/resources/META-INF/spring/org.springframework.boot.data.ldap.test.autoconfigure.AutoConfigureDataLdap.imports
index 291311980bc..31fe6e6f5e2 100644
--- a/module/spring-boot-data-ldap-test/src/main/resources/META-INF/spring/org.springframework.boot.data.ldap.test.autoconfigure.AutoConfigureDataLdap.imports
+++ b/module/spring-boot-data-ldap-test/src/main/resources/META-INF/spring/org.springframework.boot.data.ldap.test.autoconfigure.AutoConfigureDataLdap.imports
@@ -1,4 +1,4 @@
-org.springframework.boot.data.ldap.autoconfigure.LdapRepositoriesAutoConfiguration
+org.springframework.boot.data.ldap.autoconfigure.DataLdapRepositoriesAutoConfiguration
 org.springframework.boot.ldap.autoconfigure.LdapAutoConfiguration
 org.springframework.boot.ldap.autoconfigure.embedded.EmbeddedLdapAutoConfiguration
 optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration
diff --git a/module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfiguration.java b/module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesAutoConfiguration.java
similarity index 94%
rename from module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesAutoConfiguration.java
index 49197805785..1e68775c331 100644
--- a/module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesAutoConfiguration.java
@@ -37,7 +37,7 @@ import org.springframework.data.ldap.repository.support.LdapRepositoryFactoryBea
 @ConditionalOnClass({ LdapContext.class, LdapRepository.class })
 @ConditionalOnBooleanProperty(name = "spring.data.ldap.repositories.enabled", matchIfMissing = true)
 @ConditionalOnMissingBean(LdapRepositoryFactoryBean.class)
-@Import(LdapRepositoriesRegistrar.class)
-public final class LdapRepositoriesAutoConfiguration {
+@Import(DataLdapRepositoriesRegistrar.class)
+public final class DataLdapRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesRegistrar.java b/module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesRegistrar.java
similarity index 95%
rename from module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesRegistrar.java
rename to module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesRegistrar.java
index 9ddb56c3911..9279bf405f5 100644
--- a/module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesRegistrar.java
+++ b/module/spring-boot-data-ldap/src/main/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Eddú Meléndez
  */
-class LdapRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataLdapRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-ldap/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-ldap/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index acc2148297c..1e652a66054 100644
--- a/module/spring-boot-data-ldap/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-ldap/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-org.springframework.boot.data.ldap.autoconfigure.LdapRepositoriesAutoConfiguration
+org.springframework.boot.data.ldap.autoconfigure.DataLdapRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesAutoConfigurationTests.java
similarity index 91%
rename from module/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesAutoConfigurationTests.java
index 7294aff556f..cd349a1709b 100644
--- a/module/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/LdapRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-ldap/src/test/java/org/springframework/boot/data/ldap/autoconfigure/DataLdapRepositoriesAutoConfigurationTests.java
@@ -33,11 +33,11 @@ import org.springframework.data.ldap.repository.config.EnableLdapRepositories;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link LdapRepositoriesAutoConfiguration}
+ * Tests for {@link DataLdapRepositoriesAutoConfiguration}
  *
  * @author Eddú Meléndez
  */
-class LdapRepositoriesAutoConfigurationTests {
+class DataLdapRepositoriesAutoConfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
 
@@ -70,7 +70,7 @@ class LdapRepositoriesAutoConfigurationTests {
 		this.context = new AnnotationConfigApplicationContext();
 		TestPropertyValues.of("spring.ldap.urls:ldap://localhost:389").applyTo(this.context);
 		this.context.register(configurationClasses);
-		this.context.register(LdapAutoConfiguration.class, LdapRepositoriesAutoConfiguration.class,
+		this.context.register(LdapAutoConfiguration.class, DataLdapRepositoriesAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class);
 		this.context.refresh();
 	}
@@ -88,7 +88,7 @@ class LdapRepositoriesAutoConfigurationTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@TestAutoConfigurationPackage(LdapRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataLdapRepositoriesAutoConfigurationTests.class)
 	@EnableLdapRepositories(basePackageClasses = PersonRepository.class)
 	static class CustomizedConfiguration {
 
diff --git a/module/spring-boot-data-mongodb-test/src/main/resources/META-INF/spring/org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo.imports b/module/spring-boot-data-mongodb-test/src/main/resources/META-INF/spring/org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo.imports
index b7fc7e185b6..65e43e3e8c2 100644
--- a/module/spring-boot-data-mongodb-test/src/main/resources/META-INF/spring/org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo.imports
+++ b/module/spring-boot-data-mongodb-test/src/main/resources/META-INF/spring/org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo.imports
@@ -1,8 +1,8 @@
 org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration
-org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration
-org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration
-org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.mongodb.autoconfigure.MongoRepositoriesAutoConfiguration
+org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration
+org.springframework.boot.data.mongodb.autoconfigure.DataMongoReactiveAutoConfiguration
+org.springframework.boot.data.mongodb.autoconfigure.DataMongoReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.mongodb.autoconfigure.DataMongoRepositoriesAutoConfiguration
 org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration
 org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration
 org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration
diff --git a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataAutoConfiguration.java b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfiguration.java
similarity index 96%
rename from module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataAutoConfiguration.java
rename to module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfiguration.java
index a4d68ec14f4..7ede7d172ce 100644
--- a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataAutoConfiguration.java
+++ b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfiguration.java
@@ -55,9 +55,9 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate;
 @AutoConfiguration(after = MongoAutoConfiguration.class)
 @ConditionalOnClass({ MongoClient.class, MongoTemplate.class })
 @EnableConfigurationProperties({ MongoProperties.class, DataMongoProperties.class })
-@Import({ MongoDataConfiguration.class, MongoDatabaseFactoryConfiguration.class,
+@Import({ DataMongoConfiguration.class, MongoDatabaseFactoryConfiguration.class,
 		MongoDatabaseFactoryDependentConfiguration.class })
-public final class MongoDataAutoConfiguration {
+public final class DataMongoAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(MongoConnectionDetails.class)
diff --git a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataConfiguration.java b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoConfiguration.java
similarity index 97%
rename from module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataConfiguration.java
rename to module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoConfiguration.java
index 4838cf18a44..1c4f679792f 100644
--- a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataConfiguration.java
+++ b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoConfiguration.java
@@ -45,11 +45,11 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
  * @author Scott Fredericks
  */
 @Configuration(proxyBeanMethods = false)
-class MongoDataConfiguration {
+class DataMongoConfiguration {
 
 	private final DataMongoProperties properties;
 
-	MongoDataConfiguration(DataMongoProperties properties) {
+	DataMongoConfiguration(DataMongoProperties properties) {
 		this.properties = properties;
 	}
 
diff --git a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveDataAutoConfiguration.java b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfiguration.java
similarity index 98%
rename from module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveDataAutoConfiguration.java
rename to module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfiguration.java
index bc10620de67..7f83fa6423c 100644
--- a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveDataAutoConfiguration.java
+++ b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfiguration.java
@@ -73,8 +73,8 @@ import org.springframework.util.StringUtils;
 @ConditionalOnClass({ MongoClient.class, ReactiveMongoTemplate.class })
 @ConditionalOnBean(MongoClient.class)
 @EnableConfigurationProperties({ MongoProperties.class, DataMongoProperties.class })
-@Import(MongoDataConfiguration.class)
-public final class MongoReactiveDataAutoConfiguration {
+@Import(DataMongoConfiguration.class)
+public final class DataMongoReactiveAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(ReactiveMongoDatabaseFactory.class)
diff --git a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesAutoConfiguration.java b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfiguration.java
similarity index 93%
rename from module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfiguration.java
index 1e5a1fef999..a8eb0942789 100644
--- a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfiguration.java
@@ -48,12 +48,12 @@ import org.springframework.data.mongodb.repository.support.ReactiveMongoReposito
  * @since 4.0.0
  * @see EnableReactiveMongoRepositories
  */
-@AutoConfiguration(after = MongoReactiveDataAutoConfiguration.class)
+@AutoConfiguration(after = DataMongoReactiveAutoConfiguration.class)
 @ConditionalOnClass({ MongoClient.class, ReactiveMongoRepository.class })
 @ConditionalOnMissingBean({ ReactiveMongoRepositoryFactoryBean.class,
 		ReactiveMongoRepositoryConfigurationExtension.class })
 @ConditionalOnRepositoryType(store = "mongodb", type = RepositoryType.REACTIVE)
-@Import(MongoReactiveRepositoriesRegistrar.class)
-public final class MongoReactiveRepositoriesAutoConfiguration {
+@Import(DataMongoReactiveRepositoriesRegistrar.class)
+public final class DataMongoReactiveRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesRegistrar.java b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesRegistrar.java
similarity index 94%
rename from module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesRegistrar.java
rename to module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesRegistrar.java
index 6161f49e7ca..1cc8b5ab238 100644
--- a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesRegistrar.java
+++ b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Mark Paluch
  */
-class MongoReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataMongoReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesAutoConfiguration.java b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfiguration.java
similarity index 94%
rename from module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfiguration.java
index 0b886771bd9..66118b2db0a 100644
--- a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfiguration.java
@@ -50,11 +50,11 @@ import org.springframework.data.mongodb.repository.support.MongoRepositoryFactor
  * @since 4.0.0
  * @see EnableMongoRepositories
  */
-@AutoConfiguration(after = MongoDataAutoConfiguration.class)
+@AutoConfiguration(after = DataMongoAutoConfiguration.class)
 @ConditionalOnClass({ MongoClient.class, MongoRepository.class })
 @ConditionalOnMissingBean({ MongoRepositoryFactoryBean.class, MongoRepositoryConfigurationExtension.class })
 @ConditionalOnRepositoryType(store = "mongodb", type = RepositoryType.IMPERATIVE)
-@Import(MongoRepositoriesRegistrar.class)
-public final class MongoRepositoriesAutoConfiguration {
+@Import(DataMongoRepositoriesRegistrar.class)
+public final class DataMongoRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesRegistrar.java b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesRegistrar.java
similarity index 95%
rename from module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesRegistrar.java
rename to module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesRegistrar.java
index cd0db619c7e..aa9fa304302 100644
--- a/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesRegistrar.java
+++ b/module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Dave Syer
  */
-class MongoRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataMongoRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 041ff89777d..3a328d5b4d4 100644
--- a/module/spring-boot-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,4 +1,4 @@
-org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration
-org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration
-org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.mongodb.autoconfigure.MongoRepositoriesAutoConfiguration
+org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration
+org.springframework.boot.data.mongodb.autoconfigure.DataMongoReactiveAutoConfiguration
+org.springframework.boot.data.mongodb.autoconfigure.DataMongoReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.mongodb.autoconfigure.DataMongoRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java
similarity index 98%
rename from module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataAutoConfigurationTests.java
rename to module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java
index 98f2155dcb2..d13fc44bf8c 100644
--- a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java
@@ -62,7 +62,7 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link MongoDataAutoConfiguration}.
+ * Tests for {@link DataMongoAutoConfiguration}.
  *
  * @author Josh Long
  * @author Oliver Gierke
@@ -72,11 +72,11 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Phillip Webb
  * @author Scott Frederick
  */
-class MongoDataAutoConfigurationTests {
+class DataMongoAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
-				MongoAutoConfiguration.class, MongoDataAutoConfiguration.class));
+				MongoAutoConfiguration.class, DataMongoAutoConfiguration.class));
 
 	@Test
 	void templateExists() {
@@ -155,7 +155,7 @@ class MongoDataAutoConfigurationTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		String cityPackage = City.class.getPackage().getName();
 		AutoConfigurationPackages.register(context, cityPackage);
-		context.register(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class);
+		context.register(MongoAutoConfiguration.class, DataMongoAutoConfiguration.class);
 		try {
 			context.refresh();
 			assertDomainTypesDiscovered(context.getBean(MongoMappingContext.class), City.class);
@@ -235,7 +235,7 @@ class MongoDataAutoConfigurationTests {
 	@Test
 	void backsOffIfMongoClientBeanIsNotPresent() {
 		ApplicationContextRunner runner = new ApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(MongoDataAutoConfiguration.class));
+			.withConfiguration(AutoConfigurations.of(DataMongoAutoConfiguration.class));
 		runner.run((context) -> assertThat(context).doesNotHaveBean(MongoTemplate.class));
 	}
 
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoPropertiesTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoPropertiesTests.java
index e72ca1ea71f..43e05d58feb 100644
--- a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoPropertiesTests.java
+++ b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoPropertiesTests.java
@@ -35,7 +35,7 @@ class DataMongoPropertiesTests {
 
 	@Test
 	void canBindAutoIndexCreation() {
-		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(MongoDataAutoConfiguration.class))
+		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(DataMongoAutoConfiguration.class))
 			.withPropertyValues("spring.data.mongodb.auto-index-creation=true")
 			.run((context) -> {
 				DataMongoProperties properties = context.getBean(DataMongoProperties.class);
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java
similarity index 89%
rename from module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java
index 154aa292958..ec431e75083 100644
--- a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java
@@ -39,12 +39,12 @@ import org.springframework.util.StringUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link MongoRepositoriesAutoConfiguration} and
- * {@link MongoReactiveRepositoriesAutoConfiguration}.
+ * Tests for {@link DataMongoRepositoriesAutoConfiguration} and
+ * {@link DataMongoReactiveRepositoriesAutoConfiguration}.
  *
  * @author Mark Paluch
  */
-class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests {
+class DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
 
@@ -82,8 +82,8 @@ class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests {
 		public String[] selectImports(AnnotationMetadata importingClassMetadata) {
 			List<String> names = new ArrayList<>();
 			for (Class<?> type : new Class<?>[] { MongoAutoConfiguration.class, MongoReactiveAutoConfiguration.class,
-					MongoDataAutoConfiguration.class, MongoRepositoriesAutoConfiguration.class,
-					MongoReactiveDataAutoConfiguration.class, MongoReactiveRepositoriesAutoConfiguration.class }) {
+					DataMongoAutoConfiguration.class, DataMongoRepositoriesAutoConfiguration.class,
+					DataMongoReactiveAutoConfiguration.class, DataMongoReactiveRepositoriesAutoConfiguration.class }) {
 				names.add(type.getName());
 			}
 			return StringUtils.toStringArray(names);
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveDataAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfigurationTests.java
similarity index 94%
rename from module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveDataAutoConfigurationTests.java
rename to module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfigurationTests.java
index 6dcfec7bcd5..4480764136c 100644
--- a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfigurationTests.java
@@ -39,7 +39,7 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link MongoReactiveDataAutoConfiguration}.
+ * Tests for {@link DataMongoReactiveAutoConfiguration}.
  *
  * @author Mark Paluch
  * @author Artsiom Yudovin
@@ -48,11 +48,11 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Phillip Webb
  * @author Scott Frederick
  */
-class MongoReactiveDataAutoConfigurationTests {
+class DataMongoReactiveAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
-				MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class));
+				MongoReactiveAutoConfiguration.class, DataMongoReactiveAutoConfiguration.class));
 
 	@Test
 	void templateExists() {
@@ -85,8 +85,8 @@ class MongoReactiveDataAutoConfigurationTests {
 	@Test
 	void backsOffIfMongoClientBeanIsNotPresent() {
 		ApplicationContextRunner runner = new ApplicationContextRunner().withConfiguration(AutoConfigurations
-			.of(PropertyPlaceholderAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class));
-		runner.run((context) -> assertThat(context).doesNotHaveBean(MongoReactiveDataAutoConfiguration.class));
+			.of(PropertyPlaceholderAutoConfiguration.class, DataMongoReactiveAutoConfiguration.class));
+		runner.run((context) -> assertThat(context).doesNotHaveBean(DataMongoReactiveAutoConfiguration.class));
 	}
 
 	@Test
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfigurationTests.java
similarity index 90%
rename from module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfigurationTests.java
index 3a189c08b44..9b44b91c5f3 100644
--- a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfigurationTests.java
@@ -40,17 +40,17 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link MongoReactiveRepositoriesAutoConfiguration}.
+ * Tests for {@link DataMongoReactiveRepositoriesAutoConfiguration}.
  *
  * @author Mark Paluch
  * @author Andy Wilkinson
  */
-class MongoReactiveRepositoriesAutoConfigurationTests {
+class DataMongoReactiveRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
-				MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
-				MongoReactiveRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, DataMongoAutoConfiguration.class,
+				MongoReactiveAutoConfiguration.class, DataMongoReactiveAutoConfiguration.class,
+				DataMongoReactiveRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
 
 	@Test
 	void testDefaultRepositoryConfiguration() {
@@ -108,7 +108,7 @@ class MongoReactiveRepositoriesAutoConfigurationTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataMongoReactiveRepositoriesAutoConfigurationTests.class)
 	@EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class)
 	static class CustomizedConfiguration {
 
@@ -117,7 +117,7 @@ class MongoReactiveRepositoriesAutoConfigurationTests {
 	@Configuration(proxyBeanMethods = false)
 	// To not find any repositories
 	@EnableReactiveMongoRepositories("foo.bar")
-	@TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataMongoReactiveRepositoriesAutoConfigurationTests.class)
 	static class SortOfInvalidCustomConfiguration {
 
 	}
diff --git a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfigurationTests.java
similarity index 91%
rename from module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfigurationTests.java
index 61a351023a4..d1d9e2fd7ee 100644
--- a/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfigurationTests.java
@@ -37,16 +37,16 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link MongoRepositoriesAutoConfiguration}.
+ * Tests for {@link DataMongoRepositoriesAutoConfiguration}.
  *
  * @author Dave Syer
  * @author Oliver Gierke
  */
-class MongoRepositoriesAutoConfigurationTests {
+class DataMongoRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
-				MongoRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, DataMongoAutoConfiguration.class,
+				DataMongoRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
 
 	@Test
 	void testDefaultRepositoryConfiguration() {
@@ -104,7 +104,7 @@ class MongoRepositoriesAutoConfigurationTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@TestAutoConfigurationPackage(MongoRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataMongoRepositoriesAutoConfigurationTests.class)
 	@EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class)
 	static class CustomizedConfiguration {
 
@@ -113,7 +113,7 @@ class MongoRepositoriesAutoConfigurationTests {
 	@Configuration(proxyBeanMethods = false)
 	// To not find any repositories
 	@EnableMongoRepositories("foo.bar")
-	@TestAutoConfigurationPackage(MongoRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataMongoRepositoriesAutoConfigurationTests.class)
 	static class SortOfInvalidCustomConfiguration {
 
 	}
diff --git a/module/spring-boot-data-neo4j-test/src/main/resources/META-INF/spring/org.springframework.boot.data.neo4j.test.autoconfigure.AutoConfigureDataNeo4j.imports b/module/spring-boot-data-neo4j-test/src/main/resources/META-INF/spring/org.springframework.boot.data.neo4j.test.autoconfigure.AutoConfigureDataNeo4j.imports
index 264332f283a..b8041629fa4 100644
--- a/module/spring-boot-data-neo4j-test/src/main/resources/META-INF/spring/org.springframework.boot.data.neo4j.test.autoconfigure.AutoConfigureDataNeo4j.imports
+++ b/module/spring-boot-data-neo4j-test/src/main/resources/META-INF/spring/org.springframework.boot.data.neo4j.test.autoconfigure.AutoConfigureDataNeo4j.imports
@@ -1,7 +1,7 @@
-org.springframework.boot.data.neo4j.autoconfigure.Neo4jDataAutoConfiguration
-org.springframework.boot.data.neo4j.autoconfigure.Neo4jReactiveDataAutoConfiguration
-org.springframework.boot.data.neo4j.autoconfigure.Neo4jReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.neo4j.autoconfigure.Neo4jRepositoriesAutoConfiguration
+org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jAutoConfiguration
+org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jReactiveAutoConfiguration
+org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jRepositoriesAutoConfiguration
 org.springframework.boot.neo4j.autoconfigure.Neo4jAutoConfiguration
 org.springframework.boot.transaction.autoconfigure.TransactionAutoConfiguration
 optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration
diff --git a/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java b/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java
index df397e6270f..9072b10a9fc 100644
--- a/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java
+++ b/module/spring-boot-data-neo4j/src/dockerTest/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationIntegrationTests.java
@@ -63,8 +63,8 @@ class Neo4jRepositoriesAutoConfigurationIntegrationTests {
 
 	@Configuration
 	@EnableNeo4jRepositories(basePackageClasses = CountryRepository.class)
-	@ImportAutoConfiguration({ Neo4jAutoConfiguration.class, Neo4jDataAutoConfiguration.class,
-			Neo4jRepositoriesAutoConfiguration.class })
+	@ImportAutoConfiguration({ Neo4jAutoConfiguration.class, DataNeo4jAutoConfiguration.class,
+			DataNeo4jRepositoriesAutoConfiguration.class })
 	static class TestConfiguration {
 
 	}
diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jAutoConfiguration.java
similarity index 99%
rename from module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java
rename to module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jAutoConfiguration.java
index 1c977854cd5..e594ba494d4 100644
--- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java
+++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jAutoConfiguration.java
@@ -64,7 +64,7 @@ import org.springframework.transaction.TransactionManager;
 @ConditionalOnClass({ Driver.class, Neo4jTransactionManager.class, PlatformTransactionManager.class })
 @EnableConfigurationProperties(DataNeo4jProperties.class)
 @ConditionalOnBean(Driver.class)
-public final class Neo4jDataAutoConfiguration {
+public final class DataNeo4jAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveAutoConfiguration.java
similarity index 96%
rename from module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java
rename to module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveAutoConfiguration.java
index a1cb549b7e6..33ae878a97e 100644
--- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java
+++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveAutoConfiguration.java
@@ -42,11 +42,11 @@ import org.springframework.transaction.ReactiveTransactionManager;
  * @author Stephane Nicoll
  * @since 4.0.0
  */
-@AutoConfiguration(after = Neo4jDataAutoConfiguration.class)
+@AutoConfiguration(after = DataNeo4jAutoConfiguration.class)
 @ConditionalOnClass({ Driver.class, ReactiveNeo4jTemplate.class, ReactiveTransactionManager.class, Flux.class })
 @ConditionalOnBean(Driver.class)
 @EnableConfigurationProperties(DataNeo4jProperties.class)
-public final class Neo4jReactiveDataAutoConfiguration {
+public final class DataNeo4jReactiveAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfiguration.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesAutoConfiguration.java
similarity index 91%
rename from module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesAutoConfiguration.java
index 74ad0cb1ddd..2f27606af4f 100644
--- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesAutoConfiguration.java
@@ -38,12 +38,12 @@ import org.springframework.data.neo4j.repository.support.ReactiveNeo4jRepository
  * @author Stephane Nicoll
  * @since 4.0.0
  */
-@AutoConfiguration(after = Neo4jReactiveDataAutoConfiguration.class)
+@AutoConfiguration(after = DataNeo4jReactiveAutoConfiguration.class)
 @ConditionalOnClass({ Driver.class, ReactiveNeo4jRepository.class, Flux.class })
 @ConditionalOnMissingBean({ ReactiveNeo4jRepositoryFactoryBean.class,
 		ReactiveNeo4jRepositoryConfigurationExtension.class })
 @ConditionalOnRepositoryType(store = "neo4j", type = RepositoryType.REACTIVE)
-@Import(Neo4jReactiveRepositoriesRegistrar.class)
-public final class Neo4jReactiveRepositoriesAutoConfiguration {
+@Import(DataNeo4jReactiveRepositoriesRegistrar.class)
+public final class DataNeo4jReactiveRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesRegistrar.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesRegistrar.java
similarity index 94%
rename from module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesRegistrar.java
rename to module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesRegistrar.java
index c630f269d80..15c231fc3a1 100644
--- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesRegistrar.java
+++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Michael J. Simons
  */
-class Neo4jReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataNeo4jReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfiguration.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesAutoConfiguration.java
similarity index 93%
rename from module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesAutoConfiguration.java
index 7e2f0b33ea4..fc33462e847 100644
--- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesAutoConfiguration.java
@@ -49,11 +49,11 @@ import org.springframework.data.neo4j.repository.support.Neo4jRepositoryFactoryB
  * @since 4.0.0
  * @see EnableNeo4jRepositories
  */
-@AutoConfiguration(after = Neo4jDataAutoConfiguration.class)
+@AutoConfiguration(after = DataNeo4jAutoConfiguration.class)
 @ConditionalOnClass({ Driver.class, Neo4jRepository.class })
 @ConditionalOnMissingBean({ Neo4jRepositoryFactoryBean.class, Neo4jRepositoryConfigurationExtension.class })
 @ConditionalOnRepositoryType(store = "neo4j", type = RepositoryType.IMPERATIVE)
-@Import(Neo4jRepositoriesRegistrar.class)
-public final class Neo4jRepositoriesAutoConfiguration {
+@Import(DataNeo4jRepositoriesRegistrar.class)
+public final class DataNeo4jRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesRegistrar.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesRegistrar.java
similarity index 95%
rename from module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesRegistrar.java
rename to module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesRegistrar.java
index 24b78112c25..cf29d17d3cf 100644
--- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesRegistrar.java
+++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Michael Hunger
  */
-class Neo4jRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataNeo4jRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-neo4j/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-neo4j/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 95f5116fe73..66de76f591e 100644
--- a/module/spring-boot-data-neo4j/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-neo4j/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,4 +1,4 @@
-org.springframework.boot.data.neo4j.autoconfigure.Neo4jDataAutoConfiguration
-org.springframework.boot.data.neo4j.autoconfigure.Neo4jReactiveDataAutoConfiguration
-org.springframework.boot.data.neo4j.autoconfigure.Neo4jReactiveRepositoriesAutoConfiguration
-org.springframework.boot.data.neo4j.autoconfigure.Neo4jRepositoriesAutoConfiguration
+org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jAutoConfiguration
+org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jReactiveAutoConfiguration
+org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jReactiveRepositoriesAutoConfiguration
+org.springframework.boot.data.neo4j.autoconfigure.DataNeo4jRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfigurationTests.java b/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jAutoConfigurationTests.java
similarity index 98%
rename from module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfigurationTests.java
rename to module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jAutoConfigurationTests.java
index 8798b87e424..0477e324e74 100644
--- a/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jAutoConfigurationTests.java
@@ -47,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link Neo4jDataAutoConfiguration}.
+ * Tests for {@link DataNeo4jAutoConfiguration}.
  *
  * @author Stephane Nicoll
  * @author Michael Hunger
@@ -56,11 +56,11 @@ import static org.mockito.Mockito.mock;
  * @author Kazuki Shimizu
  * @author Michael J. Simons
  */
-class Neo4jDataAutoConfigurationTests {
+class DataNeo4jAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withUserConfiguration(MockedDriverConfiguration.class)
-		.withConfiguration(AutoConfigurations.of(Neo4jAutoConfiguration.class, Neo4jDataAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(Neo4jAutoConfiguration.class, DataNeo4jAutoConfiguration.class));
 
 	@Test
 	void shouldProvideConversions() {
diff --git a/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfigurationTests.java b/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveAutoConfigurationTests.java
similarity index 95%
rename from module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfigurationTests.java
rename to module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveAutoConfigurationTests.java
index 4ef2c827bbf..c2d8e06ee5d 100644
--- a/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveAutoConfigurationTests.java
@@ -44,23 +44,23 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link Neo4jReactiveDataAutoConfiguration}.
+ * Tests for {@link DataNeo4jReactiveAutoConfiguration}.
  *
  * @author Michael J. Simons
  * @author Stephane Nicoll
  */
-class Neo4jReactiveDataAutoConfigurationTests {
+class DataNeo4jReactiveAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withUserConfiguration(MockedDriverConfiguration.class)
-		.withConfiguration(AutoConfigurations.of(Neo4jAutoConfiguration.class, Neo4jDataAutoConfiguration.class,
-				Neo4jReactiveDataAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(Neo4jAutoConfiguration.class, DataNeo4jAutoConfiguration.class,
+				DataNeo4jReactiveAutoConfiguration.class));
 
 	@Test
 	void shouldBackOffIfNoMappingContextIsProvided() {
 		new ApplicationContextRunner().withUserConfiguration(MockedDriverConfiguration.class)
 			.withConfiguration(
-					AutoConfigurations.of(Neo4jAutoConfiguration.class, Neo4jReactiveDataAutoConfiguration.class))
+					AutoConfigurations.of(Neo4jAutoConfiguration.class, DataNeo4jReactiveAutoConfiguration.class))
 			.run((context) -> assertThat(context).doesNotHaveBean(Neo4jMappingContext.class));
 	}
 
diff --git a/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesAutoConfigurationTests.java
similarity index 90%
rename from module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesAutoConfigurationTests.java
index a5b70764bc5..b09f3ba9fe2 100644
--- a/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jReactiveRepositoriesAutoConfigurationTests.java
@@ -35,18 +35,18 @@ import org.springframework.data.neo4j.repository.config.EnableReactiveNeo4jRepos
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link Neo4jReactiveRepositoriesAutoConfiguration}.
+ * Tests for {@link DataNeo4jReactiveRepositoriesAutoConfiguration}.
  *
  * @author Stephane Nicoll
  * @author Michael J. Simons
  */
-class Neo4jReactiveRepositoriesAutoConfigurationTests {
+class DataNeo4jReactiveRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withUserConfiguration(MockedDriverConfiguration.class)
-		.withConfiguration(
-				AutoConfigurations.of(Neo4jDataAutoConfiguration.class, Neo4jReactiveDataAutoConfiguration.class,
-						Neo4jRepositoriesAutoConfiguration.class, Neo4jReactiveRepositoriesAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataNeo4jAutoConfiguration.class,
+				DataNeo4jReactiveAutoConfiguration.class, DataNeo4jRepositoriesAutoConfiguration.class,
+				DataNeo4jReactiveRepositoriesAutoConfiguration.class));
 
 	@Test
 	void configurationWithDefaultRepositories() {
@@ -100,7 +100,7 @@ class Neo4jReactiveRepositoriesAutoConfigurationTests {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableReactiveNeo4jRepositories("foo.bar")
-	@TestAutoConfigurationPackage(Neo4jReactiveRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataNeo4jReactiveRepositoriesAutoConfigurationTests.class)
 	static class SortOfInvalidCustomConfiguration {
 
 	}
diff --git a/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesAutoConfigurationTests.java
similarity index 93%
rename from module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesAutoConfigurationTests.java
index 7510e30c7d6..f16d3e59b80 100644
--- a/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-neo4j/src/test/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jRepositoriesAutoConfigurationTests.java
@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link Neo4jRepositoriesAutoConfiguration}.
+ * Tests for {@link DataNeo4jRepositoriesAutoConfiguration}.
  *
  * @author Dave Syer
  * @author Oliver Gierke
@@ -47,12 +47,12 @@ import static org.mockito.Mockito.mock;
  * @author Stephane Nicoll
  * @author Michael J. Simons
  */
-class Neo4jRepositoriesAutoConfigurationTests {
+class DataNeo4jRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withUserConfiguration(MockedDriverConfiguration.class)
 		.withConfiguration(
-				AutoConfigurations.of(Neo4jDataAutoConfiguration.class, Neo4jRepositoriesAutoConfiguration.class));
+				AutoConfigurations.of(DataNeo4jAutoConfiguration.class, DataNeo4jRepositoriesAutoConfiguration.class));
 
 	@Test
 	void configurationWithDefaultRepositories() {
@@ -120,7 +120,7 @@ class Neo4jRepositoriesAutoConfigurationTests {
 
 	@Configuration(proxyBeanMethods = false)
 	@EnableNeo4jRepositories("foo.bar")
-	@TestAutoConfigurationPackage(Neo4jRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataNeo4jRepositoriesAutoConfigurationTests.class)
 	static class SortOfInvalidCustomConfiguration {
 
 	}
diff --git a/module/spring-boot-data-r2dbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.r2dbc.test.autoconfigure.AutoConfigureDataR2dbc.imports b/module/spring-boot-data-r2dbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.r2dbc.test.autoconfigure.AutoConfigureDataR2dbc.imports
index ecf95124aaa..95cd3ac7f46 100644
--- a/module/spring-boot-data-r2dbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.r2dbc.test.autoconfigure.AutoConfigureDataR2dbc.imports
+++ b/module/spring-boot-data-r2dbc-test/src/main/resources/META-INF/spring/org.springframework.boot.data.r2dbc.test.autoconfigure.AutoConfigureDataR2dbc.imports
@@ -1,5 +1,5 @@
-org.springframework.boot.data.r2dbc.autoconfigure.R2dbcDataAutoConfiguration
-org.springframework.boot.data.r2dbc.autoconfigure.R2dbcRepositoriesAutoConfiguration
+org.springframework.boot.data.r2dbc.autoconfigure.DataR2dbcAutoConfiguration
+org.springframework.boot.data.r2dbc.autoconfigure.DataR2dbcRepositoriesAutoConfiguration
 org.springframework.boot.r2dbc.autoconfigure.R2dbcAutoConfiguration
 org.springframework.boot.r2dbc.autoconfigure.R2dbcInitializationAutoConfiguration
 org.springframework.boot.r2dbc.autoconfigure.R2dbcTransactionManagerAutoConfiguration
diff --git a/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcDataAutoConfiguration.java b/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcAutoConfiguration.java
similarity index 97%
rename from module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcDataAutoConfiguration.java
rename to module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcAutoConfiguration.java
index 3b4f85dda8b..ce0f09b8490 100644
--- a/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcDataAutoConfiguration.java
+++ b/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcAutoConfiguration.java
@@ -54,13 +54,13 @@ import org.springframework.r2dbc.core.DatabaseClient;
 @AutoConfiguration(after = R2dbcAutoConfiguration.class)
 @ConditionalOnClass({ DatabaseClient.class, R2dbcEntityTemplate.class })
 @ConditionalOnSingleCandidate(DatabaseClient.class)
-public final class R2dbcDataAutoConfiguration {
+public final class DataR2dbcAutoConfiguration {
 
 	private final DatabaseClient databaseClient;
 
 	private final R2dbcDialect dialect;
 
-	R2dbcDataAutoConfiguration(DatabaseClient databaseClient) {
+	DataR2dbcAutoConfiguration(DatabaseClient databaseClient) {
 		this.databaseClient = databaseClient;
 		this.dialect = DialectResolver.getDialect(this.databaseClient.getConnectionFactory());
 	}
diff --git a/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfiguration.java b/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfiguration.java
similarity index 91%
rename from module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfiguration.java
index de9d5b346e6..61f3b592e93 100644
--- a/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfiguration.java
@@ -37,12 +37,12 @@ import org.springframework.r2dbc.core.DatabaseClient;
  * @since 4.0.0
  * @see EnableR2dbcRepositories
  */
-@AutoConfiguration(after = R2dbcDataAutoConfiguration.class)
+@AutoConfiguration(after = DataR2dbcAutoConfiguration.class)
 @ConditionalOnClass({ ConnectionFactory.class, R2dbcRepository.class })
 @ConditionalOnBean(DatabaseClient.class)
 @ConditionalOnBooleanProperty(name = "spring.data.r2dbc.repositories.enabled", matchIfMissing = true)
 @ConditionalOnMissingBean(R2dbcRepositoryFactoryBean.class)
-@Import(R2dbcRepositoriesAutoConfigureRegistrar.class)
-public final class R2dbcRepositoriesAutoConfiguration {
+@Import(DataR2dbcRepositoriesAutoConfigureRegistrar.class)
+public final class DataR2dbcRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfigureRegistrar.java b/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigureRegistrar.java
similarity index 94%
rename from module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfigureRegistrar.java
rename to module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigureRegistrar.java
index 808f43a6469..33ea299f109 100644
--- a/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfigureRegistrar.java
+++ b/module/spring-boot-data-r2dbc/src/main/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigureRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Mark Paluch
  */
-class R2dbcRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataR2dbcRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-r2dbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-r2dbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 1c20cd5e98f..fc85a412e95 100644
--- a/module/spring-boot-data-r2dbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-r2dbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,2 @@
-org.springframework.boot.data.r2dbc.autoconfigure.R2dbcDataAutoConfiguration
-org.springframework.boot.data.r2dbc.autoconfigure.R2dbcRepositoriesAutoConfiguration
+org.springframework.boot.data.r2dbc.autoconfigure.DataR2dbcAutoConfiguration
+org.springframework.boot.data.r2dbc.autoconfigure.DataR2dbcRepositoriesAutoConfiguration
diff --git a/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcDataAutoConfigurationTests.java b/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcAutoConfigurationTests.java
similarity index 94%
rename from module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcDataAutoConfigurationTests.java
rename to module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcAutoConfigurationTests.java
index 7ba4aeeec12..3b44291a587 100644
--- a/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcDataAutoConfigurationTests.java
+++ b/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcAutoConfigurationTests.java
@@ -31,14 +31,14 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link R2dbcDataAutoConfiguration}.
+ * Tests for {@link DataR2dbcAutoConfiguration}.
  *
  * @author Mark Paluch
  */
-class R2dbcDataAutoConfigurationTests {
+class DataR2dbcAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(R2dbcAutoConfiguration.class, R2dbcDataAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(R2dbcAutoConfiguration.class, DataR2dbcAutoConfiguration.class));
 
 	@Test
 	void r2dbcEntityTemplateIsConfigured() {
diff --git a/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigurationTests.java
similarity index 95%
rename from module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigurationTests.java
index 5c03e20fbe2..7f01ce31b74 100644
--- a/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/R2dbcRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-r2dbc/src/test/java/org/springframework/boot/data/r2dbc/autoconfigure/DataR2dbcRepositoriesAutoConfigurationTests.java
@@ -45,7 +45,7 @@ import org.springframework.r2dbc.core.DatabaseClient;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link R2dbcRepositoriesAutoConfiguration}.
+ * Tests for {@link DataR2dbcRepositoriesAutoConfiguration}.
  *
  * @author Mark Paluch
  */
@@ -60,10 +60,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 		""")
 @WithResource(name = "data.sql",
 		content = "INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');")
-class R2dbcRepositoriesAutoConfigurationTests {
+class DataR2dbcRepositoriesAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(R2dbcRepositoriesAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataR2dbcRepositoriesAutoConfiguration.class));
 
 	@Test
 	void backsOffWithNoConnectionFactory() {
@@ -85,7 +85,7 @@ class R2dbcRepositoriesAutoConfigurationTests {
 	@Test
 	void basicAutoConfiguration() {
 		this.contextRunner
-			.withConfiguration(AutoConfigurations.of(R2dbcAutoConfiguration.class, R2dbcDataAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(R2dbcAutoConfiguration.class, DataR2dbcAutoConfiguration.class))
 			.withUserConfiguration(DatabaseInitializationConfiguration.class, TestConfiguration.class)
 			.withPropertyValues("spring.r2dbc.generate-unique-name:true")
 			.run((context) -> {
@@ -109,7 +109,7 @@ class R2dbcRepositoriesAutoConfigurationTests {
 	@Test
 	void honorsUsersEnableR2dbcRepositoriesConfiguration() {
 		this.contextRunner
-			.withConfiguration(AutoConfigurations.of(R2dbcAutoConfiguration.class, R2dbcDataAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(R2dbcAutoConfiguration.class, DataR2dbcAutoConfiguration.class))
 			.withUserConfiguration(DatabaseInitializationConfiguration.class, EnableRepositoriesConfiguration.class)
 			.withPropertyValues("spring.r2dbc.generate-unique-name:true")
 			.run((context) -> {
diff --git a/module/spring-boot-data-redis-test/src/main/resources/META-INF/spring/org.springframework.boot.data.redis.test.autoconfigure.AutoConfigureDataRedis.imports b/module/spring-boot-data-redis-test/src/main/resources/META-INF/spring/org.springframework.boot.data.redis.test.autoconfigure.AutoConfigureDataRedis.imports
index 74786dc77a2..3cdee4e57ff 100644
--- a/module/spring-boot-data-redis-test/src/main/resources/META-INF/spring/org.springframework.boot.data.redis.test.autoconfigure.AutoConfigureDataRedis.imports
+++ b/module/spring-boot-data-redis-test/src/main/resources/META-INF/spring/org.springframework.boot.data.redis.test.autoconfigure.AutoConfigureDataRedis.imports
@@ -1,5 +1,5 @@
 org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration
-org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration
-org.springframework.boot.data.redis.autoconfigure.RedisReactiveAutoConfiguration
-org.springframework.boot.data.redis.autoconfigure.RedisRepositoriesAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.DataRedisReactiveAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.DataRedisRepositoriesAutoConfiguration
 optional:org.springframework.boot.testcontainers.service.connection.ServiceConnectionAutoConfiguration
diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesAutoConfigurationTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfigurationTests.java
similarity index 81%
rename from module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesAutoConfigurationTests.java
rename to module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfigurationTests.java
index 76138481bd3..884769a6945 100644
--- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesAutoConfigurationTests.java
+++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfigurationTests.java
@@ -37,12 +37,12 @@ import org.springframework.data.redis.repository.configuration.EnableRedisReposi
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RedisRepositoriesAutoConfiguration}.
+ * Tests for {@link DataRedisRepositoriesAutoConfiguration}.
  *
  * @author Eddú Meléndez
  */
 @Testcontainers(disabledWithoutDocker = true)
-class RedisRepositoriesAutoConfigurationTests {
+class DataRedisRepositoriesAutoConfigurationTests {
 
 	@Container
 	public static RedisContainer redis = TestImage.container(RedisContainer.class);
@@ -63,24 +63,24 @@ class RedisRepositoriesAutoConfigurationTests {
 
 	@Test
 	void testDefaultRepositoryConfiguration() {
-		this.context.register(TestConfiguration.class, RedisAutoConfiguration.class,
-				RedisRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class);
+		this.context.register(TestConfiguration.class, DataRedisAutoConfiguration.class,
+				DataRedisRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class);
 		this.context.refresh();
 		assertThat(this.context.getBean(CityRepository.class)).isNotNull();
 	}
 
 	@Test
 	void testNoRepositoryConfiguration() {
-		this.context.register(EmptyConfiguration.class, RedisAutoConfiguration.class,
-				RedisRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class);
+		this.context.register(EmptyConfiguration.class, DataRedisAutoConfiguration.class,
+				DataRedisRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class);
 		this.context.refresh();
 		assertThat(this.context.getBean("redisTemplate")).isNotNull();
 	}
 
 	@Test
 	void doesNotTriggerDefaultRepositoryDetectionIfCustomized() {
-		this.context.register(CustomizedConfiguration.class, RedisAutoConfiguration.class,
-				RedisRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class);
+		this.context.register(CustomizedConfiguration.class, DataRedisAutoConfiguration.class,
+				DataRedisRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class);
 		this.context.refresh();
 		assertThat(this.context.getBean(CityRepository.class)).isNotNull();
 	}
@@ -98,7 +98,7 @@ class RedisRepositoriesAutoConfigurationTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@TestAutoConfigurationPackage(RedisRepositoriesAutoConfigurationTests.class)
+	@TestAutoConfigurationPackage(DataRedisRepositoriesAutoConfigurationTests.class)
 	@EnableRedisRepositories(basePackageClasses = CityRepository.class)
 	static class CustomizedConfiguration {
 
diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/DataRedisDockerComposeConnectionDetailsFactoryIntegrationTests.java
similarity index 78%
rename from module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java
rename to module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/DataRedisDockerComposeConnectionDetailsFactoryIntegrationTests.java
index 2abfe1b29ce..aec2e5a51d8 100644
--- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactoryIntegrationTests.java
+++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/docker/compose/DataRedisDockerComposeConnectionDetailsFactoryIntegrationTests.java
@@ -18,8 +18,8 @@ package org.springframework.boot.data.redis.docker.compose;
 
 import javax.net.ssl.SSLContext;
 
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Standalone;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails.Standalone;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.boot.testsupport.container.TestImage;
@@ -35,16 +35,16 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Scott Frederick
  * @author Eddú Meléndez
  */
-class RedisDockerComposeConnectionDetailsFactoryIntegrationTests {
+class DataRedisDockerComposeConnectionDetailsFactoryIntegrationTests {
 
 	@DockerComposeTest(composeFile = "redis-compose.yaml", image = TestImage.REDIS)
-	void runCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
+	void runCreatesConnectionDetails(DataRedisConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}
 
 	@DockerComposeTest(composeFile = "redis-ssl-compose.yaml", image = TestImage.REDIS,
 			additionalResources = { "ca.crt", "server.crt", "server.key", "client.crt", "client.key" })
-	void runWithSslCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
+	void runWithSslCreatesConnectionDetails(DataRedisConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 		Standalone standalone = connectionDetails.getStandalone();
 		SslBundle sslBundle = standalone.getSslBundle();
@@ -54,16 +54,16 @@ class RedisDockerComposeConnectionDetailsFactoryIntegrationTests {
 	}
 
 	@DockerComposeTest(composeFile = "redis-compose.yaml", image = TestImage.REDIS_STACK)
-	void runWithRedisStackCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
+	void runWithRedisStackCreatesConnectionDetails(DataRedisConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}
 
 	@DockerComposeTest(composeFile = "redis-compose.yaml", image = TestImage.REDIS_STACK_SERVER)
-	void runWithRedisStackServerCreatesConnectionDetails(RedisConnectionDetails connectionDetails) {
+	void runWithRedisStackServerCreatesConnectionDetails(DataRedisConnectionDetails connectionDetails) {
 		assertConnectionDetails(connectionDetails);
 	}
 
-	private void assertConnectionDetails(RedisConnectionDetails connectionDetails) {
+	private void assertConnectionDetails(DataRedisConnectionDetails connectionDetails) {
 		assertThat(connectionDetails.getUsername()).isNull();
 		assertThat(connectionDetails.getPassword()).isNull();
 		assertThat(connectionDetails.getCluster()).isNull();
diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/CustomRedisContainerConnectionDetailsFactoryTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/CustomRedisContainerConnectionDetailsFactoryTests.java
index b56d46b73ac..6c14213d3f2 100644
--- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/CustomRedisContainerConnectionDetailsFactoryTests.java
+++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/CustomRedisContainerConnectionDetailsFactoryTests.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
 import org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactories;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails;
 import org.springframework.boot.testcontainers.service.connection.ContainerConnectionSource;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.boot.testcontainers.service.connection.TestContainerConnectionSource;
@@ -48,7 +48,7 @@ class CustomRedisContainerConnectionDetailsFactoryTests {
 		ContainerConnectionSource<RedisContainer> source = TestContainerConnectionSource.create("test", null,
 				RedisContainer.class, "mycustomimage", annotation, null);
 		Map<Class<?>, ConnectionDetails> connectionDetails = factories.getConnectionDetails(source, true);
-		assertThat(connectionDetails.get(RedisConnectionDetails.class)).isNotNull();
+		assertThat(connectionDetails.get(DataRedisConnectionDetails.class)).isNotNull();
 	}
 
 	@Test
@@ -59,7 +59,7 @@ class CustomRedisContainerConnectionDetailsFactoryTests {
 		ContainerConnectionSource<RedisStackContainer> source = TestContainerConnectionSource.create("test", null,
 				RedisStackContainer.class, "mycustomimage", annotation, null);
 		Map<Class<?>, ConnectionDetails> connectionDetails = factories.getConnectionDetails(source, true);
-		assertThat(connectionDetails.get(RedisConnectionDetails.class)).isNotNull();
+		assertThat(connectionDetails.get(DataRedisConnectionDetails.class)).isNotNull();
 	}
 
 }
diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java
index 5c1ea8ca3f8..ceca9ec4392 100644
--- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java
+++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java
@@ -23,8 +23,8 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.boot.testsupport.container.TestImage;
 import org.springframework.context.annotation.Configuration;
@@ -48,7 +48,7 @@ class RedisContainerConnectionDetailsFactoryTests {
 	static final RedisContainer redis = TestImage.container(RedisContainer.class);
 
 	@Autowired(required = false)
-	private RedisConnectionDetails connectionDetails;
+	private DataRedisConnectionDetails connectionDetails;
 
 	@Autowired
 	private RedisConnectionFactory connectionFactory;
@@ -62,7 +62,7 @@ class RedisContainerConnectionDetailsFactoryTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ImportAutoConfiguration(RedisAutoConfiguration.class)
+	@ImportAutoConfiguration(DataRedisAutoConfiguration.class)
 	static class TestConfiguration {
 
 	}
diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java
index 583819788b1..d2162dd0042 100644
--- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java
+++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java
@@ -23,8 +23,8 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.boot.testsupport.container.TestImage;
 import org.springframework.context.annotation.Configuration;
@@ -49,7 +49,7 @@ class RedisStackContainerConnectionDetailsFactoryTests {
 	static final RedisStackContainer redis = TestImage.container(RedisStackContainer.class);
 
 	@Autowired(required = false)
-	private RedisConnectionDetails connectionDetails;
+	private DataRedisConnectionDetails connectionDetails;
 
 	@Autowired
 	private RedisConnectionFactory connectionFactory;
@@ -63,7 +63,7 @@ class RedisStackContainerConnectionDetailsFactoryTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ImportAutoConfiguration(RedisAutoConfiguration.class)
+	@ImportAutoConfiguration(DataRedisAutoConfiguration.class)
 	static class TestConfiguration {
 
 	}
diff --git a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java
index 1a089a62c34..498121bde89 100644
--- a/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java
+++ b/module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java
@@ -22,8 +22,8 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.boot.testsupport.container.RedisStackServerContainer;
 import org.springframework.boot.testsupport.container.TestImage;
@@ -49,7 +49,7 @@ class RedisStackServerContainerConnectionDetailsFactoryTests {
 	static final RedisStackServerContainer redis = TestImage.container(RedisStackServerContainer.class);
 
 	@Autowired(required = false)
-	private RedisConnectionDetails connectionDetails;
+	private DataRedisConnectionDetails connectionDetails;
 
 	@Autowired
 	private RedisConnectionFactory connectionFactory;
@@ -63,7 +63,7 @@ class RedisStackServerContainerConnectionDetailsFactoryTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ImportAutoConfiguration(RedisAutoConfiguration.class)
+	@ImportAutoConfiguration(DataRedisAutoConfiguration.class)
 	static class TestConfiguration {
 
 	}
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfiguration.java
similarity index 88%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfiguration.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfiguration.java
index ec2deb7d5e1..c0f1d007367 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfiguration.java
@@ -47,15 +47,15 @@ import org.springframework.data.redis.core.StringRedisTemplate;
  */
 @AutoConfiguration
 @ConditionalOnClass(RedisOperations.class)
-@EnableConfigurationProperties(RedisProperties.class)
+@EnableConfigurationProperties(DataRedisProperties.class)
 @Import({ LettuceConnectionConfiguration.class, JedisConnectionConfiguration.class })
-public final class RedisAutoConfiguration {
+public final class DataRedisAutoConfiguration {
 
 	@Bean
-	@ConditionalOnMissingBean(RedisConnectionDetails.class)
-	PropertiesRedisConnectionDetails redisConnectionDetails(RedisProperties properties,
+	@ConditionalOnMissingBean(DataRedisConnectionDetails.class)
+	PropertiesDataRedisConnectionDetails redisConnectionDetails(DataRedisProperties properties,
 			ObjectProvider<SslBundles> sslBundles) {
-		return new PropertiesRedisConnectionDetails(properties, sslBundles.getIfAvailable());
+		return new PropertiesDataRedisConnectionDetails(properties, sslBundles.getIfAvailable());
 	}
 
 	@Bean
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionConfiguration.java
similarity index 86%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionConfiguration.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionConfiguration.java
index 024d7519b24..29a12a37515 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionConfiguration.java
@@ -22,11 +22,11 @@ import java.util.List;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Cluster;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Node;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Sentinel;
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Standalone;
-import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Pool;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails.Cluster;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails.Node;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails.Sentinel;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails.Standalone;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties.Pool;
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
 import org.springframework.data.redis.connection.RedisNode;
@@ -49,12 +49,12 @@ import org.springframework.util.ClassUtils;
  * @author Phillip Webb
  * @author Yanming Zhou
  */
-abstract class RedisConnectionConfiguration {
+abstract class DataRedisConnectionConfiguration {
 
 	private static final boolean COMMONS_POOL2_AVAILABLE = ClassUtils.isPresent("org.apache.commons.pool2.ObjectPool",
-			RedisConnectionConfiguration.class.getClassLoader());
+			DataRedisConnectionConfiguration.class.getClassLoader());
 
-	private final RedisProperties properties;
+	private final DataRedisProperties properties;
 
 	private final @Nullable RedisStandaloneConfiguration standaloneConfiguration;
 
@@ -62,11 +62,12 @@ abstract class RedisConnectionConfiguration {
 
 	private final @Nullable RedisClusterConfiguration clusterConfiguration;
 
-	private final RedisConnectionDetails connectionDetails;
+	private final DataRedisConnectionDetails connectionDetails;
 
 	protected final Mode mode;
 
-	protected RedisConnectionConfiguration(RedisProperties properties, RedisConnectionDetails connectionDetails,
+	protected DataRedisConnectionConfiguration(DataRedisProperties properties,
+			DataRedisConnectionDetails connectionDetails,
 			ObjectProvider<RedisStandaloneConfiguration> standaloneConfigurationProvider,
 			ObjectProvider<RedisSentinelConfiguration> sentinelConfigurationProvider,
 			ObjectProvider<RedisClusterConfiguration> clusterConfigurationProvider) {
@@ -125,7 +126,7 @@ abstract class RedisConnectionConfiguration {
 		if (this.clusterConfiguration != null) {
 			return this.clusterConfiguration;
 		}
-		RedisProperties.Cluster clusterProperties = this.properties.getCluster();
+		DataRedisProperties.Cluster clusterProperties = this.properties.getCluster();
 		if (this.connectionDetails.getCluster() != null) {
 			RedisClusterConfiguration config = new RedisClusterConfiguration();
 			config.setClusterNodes(getNodes(this.connectionDetails.getCluster()));
@@ -150,7 +151,7 @@ abstract class RedisConnectionConfiguration {
 		return new RedisNode(node.host(), node.port());
 	}
 
-	protected final RedisProperties getProperties() {
+	protected final DataRedisProperties getProperties() {
 		return this.properties;
 	}
 
@@ -170,7 +171,7 @@ abstract class RedisConnectionConfiguration {
 	}
 
 	protected final boolean urlUsesSsl(String url) {
-		return RedisUrl.of(url).useSsl();
+		return DataRedisUrl.of(url).useSsl();
 	}
 
 	protected boolean isPoolEnabled(Pool pool) {
@@ -186,7 +187,7 @@ abstract class RedisConnectionConfiguration {
 		return nodes;
 	}
 
-	protected final RedisConnectionDetails getConnectionDetails() {
+	protected final DataRedisConnectionDetails getConnectionDetails() {
 		return this.connectionDetails;
 	}
 
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionDetails.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionDetails.java
similarity index 98%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionDetails.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionDetails.java
index 2a72c78eea7..cfebee1246f 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisConnectionDetails.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisConnectionDetails.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * @author Andy Wilkinson
  * @since 4.0.0
  */
-public interface RedisConnectionDetails extends ConnectionDetails {
+public interface DataRedisConnectionDetails extends ConnectionDetails {
 
 	/**
 	 * Login username of the redis server.
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisProperties.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisProperties.java
similarity index 99%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisProperties.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisProperties.java
index 344a3387850..4c3761bf229 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisProperties.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisProperties.java
@@ -37,7 +37,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @since 4.0.0
  */
 @ConfigurationProperties("spring.data.redis")
-public class RedisProperties {
+public class DataRedisProperties {
 
 	/**
 	 * Database index used by the connection factory.
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisReactiveAutoConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisReactiveAutoConfiguration.java
similarity index 96%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisReactiveAutoConfiguration.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisReactiveAutoConfiguration.java
index c64abd81a33..71c50a03c1b 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisReactiveAutoConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisReactiveAutoConfiguration.java
@@ -39,9 +39,9 @@ import org.springframework.data.redis.serializer.RedisSerializer;
  * @author Stephane Nicoll
  * @since 4.0.0
  */
-@AutoConfiguration(after = RedisAutoConfiguration.class)
+@AutoConfiguration(after = DataRedisAutoConfiguration.class)
 @ConditionalOnClass({ ReactiveRedisConnectionFactory.class, ReactiveRedisTemplate.class, Flux.class })
-public final class RedisReactiveAutoConfiguration {
+public final class DataRedisReactiveAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(name = "reactiveRedisTemplate")
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesAutoConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfiguration.java
similarity index 91%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesAutoConfiguration.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfiguration.java
index afbc271f4c9..50b70678790 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesAutoConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfiguration.java
@@ -36,12 +36,12 @@ import org.springframework.data.redis.repository.support.RedisRepositoryFactoryB
  * @since 4.0.0
  * @see EnableRedisRepositories
  */
-@AutoConfiguration(after = RedisAutoConfiguration.class)
+@AutoConfiguration(after = DataRedisAutoConfiguration.class)
 @ConditionalOnClass(EnableRedisRepositories.class)
 @ConditionalOnBean(RedisConnectionFactory.class)
 @ConditionalOnBooleanProperty(name = "spring.data.redis.repositories.enabled", matchIfMissing = true)
 @ConditionalOnMissingBean(RedisRepositoryFactoryBean.class)
-@Import(RedisRepositoriesRegistrar.class)
-public final class RedisRepositoriesAutoConfiguration {
+@Import(DataRedisRepositoriesRegistrar.class)
+public final class DataRedisRepositoriesAutoConfiguration {
 
 }
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesRegistrar.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesRegistrar.java
similarity index 95%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesRegistrar.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesRegistrar.java
index db3dd541ac3..4afa19534e4 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisRepositoriesRegistrar.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesRegistrar.java
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
  *
  * @author Eddú Meléndez
  */
-class RedisRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
+class DataRedisRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
 
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrl.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrl.java
similarity index 88%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrl.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrl.java
index d18c96275be..6bcc0c70fbb 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrl.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrl.java
@@ -42,18 +42,18 @@ import org.springframework.util.StringUtils;
  * @author Yanming Zhou
  * @author Phillip Webb
  */
-record RedisUrl(URI uri, boolean useSsl, Credentials credentials, int database) {
+record DataRedisUrl(URI uri, boolean useSsl, Credentials credentials, int database) {
 
 	@Contract("!null -> !null")
-	static @Nullable RedisUrl of(@Nullable String url) {
+	static @Nullable DataRedisUrl of(@Nullable String url) {
 		return (url != null) ? of(toUri(url)) : null;
 	}
 
-	private static RedisUrl of(URI uri) {
+	private static DataRedisUrl of(URI uri) {
 		boolean useSsl = ("rediss".equals(uri.getScheme()));
 		Credentials credentials = Credentials.fromUserInfo(uri.getUserInfo());
 		int database = getDatabase(uri);
-		return new RedisUrl(uri, useSsl, credentials, database);
+		return new DataRedisUrl(uri, useSsl, credentials, database);
 	}
 
 	private static int getDatabase(URI uri) {
@@ -67,12 +67,12 @@ record RedisUrl(URI uri, boolean useSsl, Credentials credentials, int database)
 			URI uri = new URI(url);
 			String scheme = uri.getScheme();
 			if (!"redis".equals(scheme) && !"rediss".equals(scheme)) {
-				throw new RedisUrlSyntaxException(url);
+				throw new DataRedisUrlSyntaxException(url);
 			}
 			return uri;
 		}
 		catch (URISyntaxException ex) {
-			throw new RedisUrlSyntaxException(url, ex);
+			throw new DataRedisUrlSyntaxException(url, ex);
 		}
 	}
 
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxException.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrlSyntaxException.java
similarity index 86%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxException.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrlSyntaxException.java
index 5729319c531..9c1fc7dc3ef 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxException.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrlSyntaxException.java
@@ -21,16 +21,16 @@ package org.springframework.boot.data.redis.autoconfigure;
  *
  * @author Scott Frederick
  */
-class RedisUrlSyntaxException extends RuntimeException {
+class DataRedisUrlSyntaxException extends RuntimeException {
 
 	private final String url;
 
-	RedisUrlSyntaxException(String url, Exception cause) {
+	DataRedisUrlSyntaxException(String url, Exception cause) {
 		super(buildMessage(url), cause);
 		this.url = url;
 	}
 
-	RedisUrlSyntaxException(String url) {
+	DataRedisUrlSyntaxException(String url) {
 		super(buildMessage(url));
 		this.url = url;
 	}
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxFailureAnalyzer.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrlSyntaxFailureAnalyzer.java
similarity index 91%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxFailureAnalyzer.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrlSyntaxFailureAnalyzer.java
index 0ca1542f8b9..6036a371477 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxFailureAnalyzer.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/DataRedisUrlSyntaxFailureAnalyzer.java
@@ -24,14 +24,14 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
 
 /**
  * A {@code FailureAnalyzer} that performs analysis of failures caused by a
- * {@link RedisUrlSyntaxException}.
+ * {@link DataRedisUrlSyntaxException}.
  *
  * @author Scott Frederick
  */
-class RedisUrlSyntaxFailureAnalyzer extends AbstractFailureAnalyzer<RedisUrlSyntaxException> {
+class DataRedisUrlSyntaxFailureAnalyzer extends AbstractFailureAnalyzer<DataRedisUrlSyntaxException> {
 
 	@Override
-	protected FailureAnalysis analyze(Throwable rootFailure, RedisUrlSyntaxException cause) {
+	protected FailureAnalysis analyze(Throwable rootFailure, DataRedisUrlSyntaxException cause) {
 		try {
 			URI uri = new URI(cause.getUrl());
 			if ("redis-sentinel".equals(uri.getScheme())) {
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java
index 8ff0da512d5..956e5434188 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java
@@ -60,12 +60,13 @@ import org.springframework.util.StringUtils;
 @ConditionalOnClass({ GenericObjectPool.class, JedisConnection.class, Jedis.class })
 @ConditionalOnMissingBean(RedisConnectionFactory.class)
 @ConditionalOnProperty(name = "spring.data.redis.client-type", havingValue = "jedis", matchIfMissing = true)
-class JedisConnectionConfiguration extends RedisConnectionConfiguration {
+class JedisConnectionConfiguration extends DataRedisConnectionConfiguration {
 
-	JedisConnectionConfiguration(RedisProperties properties,
+	JedisConnectionConfiguration(DataRedisProperties properties,
 			ObjectProvider<RedisStandaloneConfiguration> standaloneConfigurationProvider,
 			ObjectProvider<RedisSentinelConfiguration> sentinelConfiguration,
-			ObjectProvider<RedisClusterConfiguration> clusterConfiguration, RedisConnectionDetails connectionDetails) {
+			ObjectProvider<RedisClusterConfiguration> clusterConfiguration,
+			DataRedisConnectionDetails connectionDetails) {
 		super(properties, connectionDetails, standaloneConfigurationProvider, sentinelConfiguration,
 				clusterConfiguration);
 	}
@@ -110,7 +111,7 @@ class JedisConnectionConfiguration extends RedisConnectionConfiguration {
 			ObjectProvider<JedisClientConfigurationBuilderCustomizer> builderCustomizers) {
 		JedisClientConfigurationBuilder builder = applyProperties(JedisClientConfiguration.builder());
 		applySslIfNeeded(builder);
-		RedisProperties.Pool pool = getProperties().getJedis().getPool();
+		DataRedisProperties.Pool pool = getProperties().getJedis().getPool();
 		if (isPoolEnabled(pool)) {
 			applyPooling(pool, builder);
 		}
@@ -145,12 +146,12 @@ class JedisConnectionConfiguration extends RedisConnectionConfiguration {
 		sslBuilder.sslParameters(sslParameters);
 	}
 
-	private void applyPooling(RedisProperties.Pool pool,
+	private void applyPooling(DataRedisProperties.Pool pool,
 			JedisClientConfiguration.JedisClientConfigurationBuilder builder) {
 		builder.usePooling().poolConfig(jedisPoolConfig(pool));
 	}
 
-	private JedisPoolConfig jedisPoolConfig(RedisProperties.Pool pool) {
+	private JedisPoolConfig jedisPoolConfig(DataRedisProperties.Pool pool) {
 		JedisPoolConfig config = new JedisPoolConfig();
 		config.setMaxTotal(pool.getMaxActive());
 		config.setMaxIdle(pool.getMaxIdle());
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceConnectionConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceConnectionConfiguration.java
index b840cd6db3e..cba87781dfa 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceConnectionConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceConnectionConfiguration.java
@@ -37,8 +37,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnThreading;
-import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Lettuce.Cluster.Refresh;
-import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Pool;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties.Lettuce.Cluster.Refresh;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties.Pool;
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.boot.ssl.SslOptions;
 import org.springframework.boot.thread.Threading;
@@ -68,13 +68,13 @@ import org.springframework.util.StringUtils;
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(RedisClient.class)
 @ConditionalOnProperty(name = "spring.data.redis.client-type", havingValue = "lettuce", matchIfMissing = true)
-class LettuceConnectionConfiguration extends RedisConnectionConfiguration {
+class LettuceConnectionConfiguration extends DataRedisConnectionConfiguration {
 
-	LettuceConnectionConfiguration(RedisProperties properties,
+	LettuceConnectionConfiguration(DataRedisProperties properties,
 			ObjectProvider<RedisStandaloneConfiguration> standaloneConfigurationProvider,
 			ObjectProvider<RedisSentinelConfiguration> sentinelConfigurationProvider,
 			ObjectProvider<RedisClusterConfiguration> clusterConfigurationProvider,
-			RedisConnectionDetails connectionDetails) {
+			DataRedisConnectionDetails connectionDetails) {
 		super(properties, connectionDetails, standaloneConfigurationProvider, sentinelConfigurationProvider,
 				clusterConfigurationProvider);
 	}
@@ -167,7 +167,7 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration {
 			builder.commandTimeout(getProperties().getTimeout());
 		}
 		if (getProperties().getLettuce() != null) {
-			RedisProperties.Lettuce lettuce = getProperties().getLettuce();
+			DataRedisProperties.Lettuce lettuce = getProperties().getLettuce();
 			if (lettuce.getShutdownTimeout() != null && !lettuce.getShutdownTimeout().isZero()) {
 				builder.shutdownTimeout(getProperties().getLettuce().getShutdownTimeout());
 			}
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesRedisConnectionDetails.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesDataRedisConnectionDetails.java
similarity index 80%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesRedisConnectionDetails.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesDataRedisConnectionDetails.java
index b1328a42492..515b2f9d672 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesRedisConnectionDetails.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesDataRedisConnectionDetails.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Adapts {@link RedisProperties} to {@link RedisConnectionDetails}.
+ * Adapts {@link DataRedisProperties} to {@link DataRedisConnectionDetails}.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson
@@ -36,32 +36,32 @@ import org.springframework.util.StringUtils;
  * @author Yanming Zhou
  * @author Phillip Webb
  */
-class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
+class PropertiesDataRedisConnectionDetails implements DataRedisConnectionDetails {
 
-	private final RedisProperties properties;
+	private final DataRedisProperties properties;
 
 	private final @Nullable SslBundles sslBundles;
 
-	PropertiesRedisConnectionDetails(RedisProperties properties, @Nullable SslBundles sslBundles) {
+	PropertiesDataRedisConnectionDetails(DataRedisProperties properties, @Nullable SslBundles sslBundles) {
 		this.properties = properties;
 		this.sslBundles = sslBundles;
 	}
 
 	@Override
 	public @Nullable String getUsername() {
-		RedisUrl redisUrl = getRedisUrl();
+		DataRedisUrl redisUrl = getRedisUrl();
 		return (redisUrl != null) ? redisUrl.credentials().username() : this.properties.getUsername();
 	}
 
 	@Override
 	public @Nullable String getPassword() {
-		RedisUrl redisUrl = getRedisUrl();
+		DataRedisUrl redisUrl = getRedisUrl();
 		return (redisUrl != null) ? redisUrl.credentials().password() : this.properties.getPassword();
 	}
 
 	@Override
 	public Standalone getStandalone() {
-		RedisUrl redisUrl = getRedisUrl();
+		DataRedisUrl redisUrl = getRedisUrl();
 		return (redisUrl != null)
 				? Standalone.of(redisUrl.uri().getHost(), redisUrl.uri().getPort(), redisUrl.database(), getSslBundle())
 				: Standalone.of(this.properties.getHost(), this.properties.getPort(), this.properties.getDatabase(),
@@ -82,18 +82,18 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
 
 	@Override
 	public @Nullable Sentinel getSentinel() {
-		RedisProperties.Sentinel sentinel = this.properties.getSentinel();
+		DataRedisProperties.Sentinel sentinel = this.properties.getSentinel();
 		return (sentinel != null) ? new PropertiesSentinel(getStandalone().getDatabase(), sentinel) : null;
 	}
 
 	@Override
 	public @Nullable Cluster getCluster() {
-		RedisProperties.Cluster cluster = this.properties.getCluster();
+		DataRedisProperties.Cluster cluster = this.properties.getCluster();
 		return (cluster != null) ? new PropertiesCluster(cluster) : null;
 	}
 
-	private @Nullable RedisUrl getRedisUrl() {
-		return RedisUrl.of(this.properties.getUrl());
+	private @Nullable DataRedisUrl getRedisUrl() {
+		return DataRedisUrl.of(this.properties.getUrl());
 	}
 
 	private List<Node> asNodes(@Nullable List<String> nodes) {
@@ -117,7 +117,7 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
 
 		private final List<Node> nodes;
 
-		PropertiesCluster(RedisProperties.Cluster properties) {
+		PropertiesCluster(DataRedisProperties.Cluster properties) {
 			this.nodes = asNodes(properties.getNodes());
 		}
 
@@ -128,7 +128,7 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
 
 		@Override
 		public @Nullable SslBundle getSslBundle() {
-			return PropertiesRedisConnectionDetails.this.getSslBundle();
+			return PropertiesDataRedisConnectionDetails.this.getSslBundle();
 		}
 
 	}
@@ -140,9 +140,9 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
 
 		private final int database;
 
-		private final RedisProperties.Sentinel properties;
+		private final DataRedisProperties.Sentinel properties;
 
-		PropertiesSentinel(int database, RedisProperties.Sentinel properties) {
+		PropertiesSentinel(int database, DataRedisProperties.Sentinel properties) {
 			this.database = database;
 			this.properties = properties;
 		}
@@ -176,7 +176,7 @@ class PropertiesRedisConnectionDetails implements RedisConnectionDetails {
 
 		@Override
 		public @Nullable SslBundle getSslBundle() {
-			return PropertiesRedisConnectionDetails.this.getSslBundle();
+			return PropertiesDataRedisConnectionDetails.this.getSslBundle();
 		}
 
 	}
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisHealthContributorAutoConfiguration.java
similarity index 77%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfiguration.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisHealthContributorAutoConfiguration.java
index 0ddd7853c32..05e09ccd2eb 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisHealthContributorAutoConfiguration.java
@@ -22,8 +22,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
-import org.springframework.boot.data.redis.health.RedisHealthIndicator;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.health.DataRedisHealthIndicator;
 import org.springframework.boot.health.autoconfigure.contributor.CompositeHealthContributorConfiguration;
 import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.health.contributor.HealthContributor;
@@ -32,7 +32,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 
 /**
- * {@link EnableAutoConfiguration Auto-configuration} for {@link RedisHealthIndicator}.
+ * {@link EnableAutoConfiguration Auto-configuration} for
+ * {@link DataRedisHealthIndicator}.
  *
  * @author Christian Dupuis
  * @author Richard Santana
@@ -40,15 +41,16 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
  * @author Mark Paluch
  * @since 4.0.0
  */
-@AutoConfiguration(after = { RedisAutoConfiguration.class, RedisReactiveHealthContributorAutoConfiguration.class })
+@AutoConfiguration(
+		after = { DataRedisAutoConfiguration.class, DataRedisReactiveHealthContributorAutoConfiguration.class })
 @ConditionalOnClass({ RedisConnectionFactory.class, HealthIndicator.class, ConditionalOnEnabledHealthIndicator.class })
 @ConditionalOnBean(RedisConnectionFactory.class)
 @ConditionalOnEnabledHealthIndicator("redis")
-public final class RedisHealthContributorAutoConfiguration
-		extends CompositeHealthContributorConfiguration<RedisHealthIndicator, RedisConnectionFactory> {
+public final class DataRedisHealthContributorAutoConfiguration
+		extends CompositeHealthContributorConfiguration<DataRedisHealthIndicator, RedisConnectionFactory> {
 
-	RedisHealthContributorAutoConfiguration() {
-		super(RedisHealthIndicator::new);
+	DataRedisHealthContributorAutoConfiguration() {
+		super(DataRedisHealthIndicator::new);
 	}
 
 	@Bean
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisReactiveHealthContributorAutoConfiguration.java
similarity index 80%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfiguration.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisReactiveHealthContributorAutoConfiguration.java
index 24afc2a32c3..555ea721976 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/health/DataRedisReactiveHealthContributorAutoConfiguration.java
@@ -24,8 +24,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.data.redis.autoconfigure.RedisReactiveAutoConfiguration;
-import org.springframework.boot.data.redis.health.RedisReactiveHealthIndicator;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisReactiveAutoConfiguration;
+import org.springframework.boot.data.redis.health.DataRedisReactiveHealthIndicator;
 import org.springframework.boot.health.autoconfigure.contributor.CompositeReactiveHealthContributorConfiguration;
 import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.health.contributor.ReactiveHealthContributor;
@@ -35,7 +35,7 @@ import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for
- * {@link RedisReactiveHealthIndicator}.
+ * {@link DataRedisReactiveHealthIndicator}.
  *
  * @author Christian Dupuis
  * @author Richard Santana
@@ -43,16 +43,16 @@ import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
  * @author Mark Paluch
  * @since 4.0.0
  */
-@AutoConfiguration(after = RedisReactiveAutoConfiguration.class)
+@AutoConfiguration(after = DataRedisReactiveAutoConfiguration.class)
 @ConditionalOnClass({ ReactiveRedisConnectionFactory.class, Flux.class, ReactiveHealthIndicator.class,
 		ConditionalOnEnabledHealthIndicator.class })
 @ConditionalOnBean(ReactiveRedisConnectionFactory.class)
 @ConditionalOnEnabledHealthIndicator("redis")
-public final class RedisReactiveHealthContributorAutoConfiguration extends
-		CompositeReactiveHealthContributorConfiguration<RedisReactiveHealthIndicator, ReactiveRedisConnectionFactory> {
+public final class DataRedisReactiveHealthContributorAutoConfiguration extends
+		CompositeReactiveHealthContributorConfiguration<DataRedisReactiveHealthIndicator, ReactiveRedisConnectionFactory> {
 
-	RedisReactiveHealthContributorAutoConfiguration() {
-		super(RedisReactiveHealthIndicator::new);
+	DataRedisReactiveHealthContributorAutoConfiguration() {
+		super(DataRedisReactiveHealthIndicator::new);
 	}
 
 	@Bean
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceMetricsAutoConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/metrics/LettuceMetricsAutoConfiguration.java
similarity index 86%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceMetricsAutoConfiguration.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/metrics/LettuceMetricsAutoConfiguration.java
index 9a7a2477ecb..0e084c74371 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/LettuceMetricsAutoConfiguration.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/metrics/LettuceMetricsAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.data.redis.autoconfigure;
+package org.springframework.boot.data.redis.autoconfigure.metrics;
 
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.metrics.MicrometerCommandLatencyRecorder;
@@ -25,6 +25,8 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.data.redis.autoconfigure.ClientResourcesBuilderCustomizer;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -34,7 +36,7 @@ import org.springframework.context.annotation.Bean;
  * @author Yanming Zhou
  * @since 4.0.0
  */
-@AutoConfiguration(before = RedisAutoConfiguration.class,
+@AutoConfiguration(before = DataRedisAutoConfiguration.class,
 		afterName = "org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration")
 @ConditionalOnClass({ RedisClient.class, MicrometerCommandLatencyRecorder.class, MeterRegistry.class })
 @ConditionalOnBean(MeterRegistry.class)
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/metrics/package-info.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/metrics/package-info.java
new file mode 100644
index 00000000000..8e44b394cf5
--- /dev/null
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/metrics/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Auto-configuration for Spring Data Redis metrics.
+ */
+@NullMarked
+package org.springframework.boot.data.redis.autoconfigure.metrics;
+
+import org.jspecify.annotations.NullMarked;
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactory.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactory.java
index f276d3b2b13..92b89b39c81 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactory.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/docker/compose/RedisDockerComposeConnectionDetailsFactory.java
@@ -16,14 +16,14 @@
 
 package org.springframework.boot.data.redis.docker.compose;
 
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails;
 import org.springframework.boot.docker.compose.core.RunningService;
 import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory;
 import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionSource;
 
 /**
- * {@link DockerComposeConnectionDetailsFactory} to create {@link RedisConnectionDetails}
- * for a {@code redis} service.
+ * {@link DockerComposeConnectionDetailsFactory} to create
+ * {@link DataRedisConnectionDetails} for a {@code redis} service.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson
@@ -31,7 +31,8 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC
  * @author Scott Frederick
  * @author Eddú Meléndez
  */
-class RedisDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory<RedisConnectionDetails> {
+class RedisDockerComposeConnectionDetailsFactory
+		extends DockerComposeConnectionDetailsFactory<DataRedisConnectionDetails> {
 
 	private static final String[] REDIS_CONTAINER_NAMES = { "redis", "redis/redis-stack", "redis/redis-stack-server" };
 
@@ -42,15 +43,16 @@ class RedisDockerComposeConnectionDetailsFactory extends DockerComposeConnection
 	}
 
 	@Override
-	protected RedisConnectionDetails getDockerComposeConnectionDetails(DockerComposeConnectionSource source) {
+	protected DataRedisConnectionDetails getDockerComposeConnectionDetails(DockerComposeConnectionSource source) {
 		return new RedisDockerComposeConnectionDetails(source.getRunningService());
 	}
 
 	/**
-	 * {@link RedisConnectionDetails} backed by a {@code redis} {@link RunningService}.
+	 * {@link DataRedisConnectionDetails} backed by a {@code redis}
+	 * {@link RunningService}.
 	 */
 	static class RedisDockerComposeConnectionDetails extends DockerComposeConnectionDetails
-			implements RedisConnectionDetails {
+			implements DataRedisConnectionDetails {
 
 		private final Standalone standalone;
 
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisHealth.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisHealth.java
similarity index 89%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisHealth.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisHealth.java
index 415597bcffd..b0c63cb33d6 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisHealth.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisHealth.java
@@ -22,14 +22,14 @@ import org.springframework.boot.health.contributor.Health;
 import org.springframework.data.redis.connection.ClusterInfo;
 
 /**
- * Shared class used by {@link RedisHealthIndicator} and
- * {@link RedisReactiveHealthIndicator} to provide health details.
+ * Shared class used by {@link DataRedisHealthIndicator} and
+ * {@link DataRedisReactiveHealthIndicator} to provide health details.
  *
  * @author Phillip Webb
  */
-final class RedisHealth {
+final class DataRedisHealth {
 
-	private RedisHealth() {
+	private DataRedisHealth() {
 	}
 
 	static Health.Builder up(Health.Builder builder, Properties info) {
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisHealthIndicator.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisHealthIndicator.java
similarity index 87%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisHealthIndicator.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisHealthIndicator.java
index a218a8607ba..014429a61b0 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisHealthIndicator.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisHealthIndicator.java
@@ -34,11 +34,11 @@ import org.springframework.util.Assert;
  * @author Scott Frederick
  * @since 4.0.0
  */
-public class RedisHealthIndicator extends AbstractHealthIndicator {
+public class DataRedisHealthIndicator extends AbstractHealthIndicator {
 
 	private final RedisConnectionFactory redisConnectionFactory;
 
-	public RedisHealthIndicator(RedisConnectionFactory connectionFactory) {
+	public DataRedisHealthIndicator(RedisConnectionFactory connectionFactory) {
 		super("Redis health check failed");
 		Assert.notNull(connectionFactory, "'connectionFactory' must not be null");
 		this.redisConnectionFactory = connectionFactory;
@@ -57,10 +57,10 @@ public class RedisHealthIndicator extends AbstractHealthIndicator {
 
 	private void doHealthCheck(Health.Builder builder, RedisConnection connection) {
 		if (connection instanceof RedisClusterConnection clusterConnection) {
-			RedisHealth.fromClusterInfo(builder, clusterConnection.clusterGetClusterInfo());
+			DataRedisHealth.fromClusterInfo(builder, clusterConnection.clusterGetClusterInfo());
 		}
 		else {
-			RedisHealth.up(builder, connection.serverCommands().info());
+			DataRedisHealth.up(builder, connection.serverCommands().info());
 		}
 	}
 
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicator.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisReactiveHealthIndicator.java
similarity index 90%
rename from module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicator.java
rename to module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisReactiveHealthIndicator.java
index 900c2d29965..2d6b74f2871 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicator.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/health/DataRedisReactiveHealthIndicator.java
@@ -38,11 +38,11 @@ import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
  * @author Scott Frederick
  * @since 4.0.0
  */
-public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
+public class DataRedisReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
 
 	private final ReactiveRedisConnectionFactory connectionFactory;
 
-	public RedisReactiveHealthIndicator(ReactiveRedisConnectionFactory connectionFactory) {
+	public DataRedisReactiveHealthIndicator(ReactiveRedisConnectionFactory connectionFactory) {
 		super("Redis health check failed");
 		this.connectionFactory = connectionFactory;
 	}
@@ -70,11 +70,11 @@ public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicato
 	}
 
 	private Health up(Health.Builder builder, Properties info) {
-		return RedisHealth.up(builder, info).build();
+		return DataRedisHealth.up(builder, info).build();
 	}
 
 	private Health fromClusterInfo(Health.Builder builder, ClusterInfo clusterInfo) {
-		return RedisHealth.fromClusterInfo(builder, clusterInfo).build();
+		return DataRedisHealth.fromClusterInfo(builder, clusterInfo).build();
 	}
 
 }
diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactory.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactory.java
index aa666617a40..697eb67cefa 100644
--- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactory.java
+++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactory.java
@@ -23,15 +23,15 @@ import com.redis.testcontainers.RedisStackContainer;
 import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails;
 import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory;
 import org.springframework.boot.testcontainers.service.connection.ContainerConnectionSource;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 
 /**
- * {@link ContainerConnectionDetailsFactory} to create {@link RedisConnectionDetails} from
- * a {@link ServiceConnection @ServiceConnection}-annotated {@link GenericContainer} using
- * the {@code "redis"} image.
+ * {@link ContainerConnectionDetailsFactory} to create {@link DataRedisConnectionDetails}
+ * from a {@link ServiceConnection @ServiceConnection}-annotated {@link GenericContainer}
+ * using the {@code "redis"} image.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson
@@ -39,7 +39,7 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect
  * @author Eddú Meléndez
  */
 class RedisContainerConnectionDetailsFactory
-		extends ContainerConnectionDetailsFactory<Container<?>, RedisConnectionDetails> {
+		extends ContainerConnectionDetailsFactory<Container<?>, DataRedisConnectionDetails> {
 
 	private static final List<String> REDIS_IMAGE_NAMES = List.of("redis", "redis/redis-stack",
 			"redis/redis-stack-server");
@@ -61,15 +61,15 @@ class RedisContainerConnectionDetailsFactory
 	}
 
 	@Override
-	protected RedisConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<Container<?>> source) {
+	protected DataRedisConnectionDetails getContainerConnectionDetails(ContainerConnectionSource<Container<?>> source) {
 		return new RedisContainerConnectionDetails(source);
 	}
 
 	/**
-	 * {@link RedisConnectionDetails} backed by a {@link ContainerConnectionSource}.
+	 * {@link DataRedisConnectionDetails} backed by a {@link ContainerConnectionSource}.
 	 */
 	private static final class RedisContainerConnectionDetails extends ContainerConnectionDetails<Container<?>>
-			implements RedisConnectionDetails {
+			implements DataRedisConnectionDetails {
 
 		private RedisContainerConnectionDetails(ContainerConnectionSource<Container<?>> source) {
 			super(source);
diff --git a/module/spring-boot-data-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-data-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index f1539990526..05e28bd7c6e 100644
--- a/module/spring-boot-data-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/module/spring-boot-data-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -31,7 +31,7 @@
     },
     {
       "name": "spring.redis.client-type",
-      "type": "org.springframework.boot.data.redis.autoconfigure.RedisProperties$ClientType",
+      "type": "org.springframework.boot.data.redis.autoconfigure.DataRedisProperties$ClientType",
       "deprecation": {
         "replacement": "spring.data.redis.client-type",
         "level": "error"
diff --git a/module/spring-boot-data-redis/src/main/resources/META-INF/spring.factories b/module/spring-boot-data-redis/src/main/resources/META-INF/spring.factories
index ba4c19ec20e..15e409a4ee6 100644
--- a/module/spring-boot-data-redis/src/main/resources/META-INF/spring.factories
+++ b/module/spring-boot-data-redis/src/main/resources/META-INF/spring.factories
@@ -5,5 +5,5 @@ org.springframework.boot.data.redis.testcontainers.RedisContainerConnectionDetai
 
 # Failure Analyzers
 org.springframework.boot.diagnostics.FailureAnalyzer=\
-org.springframework.boot.data.redis.autoconfigure.RedisUrlSyntaxFailureAnalyzer
+org.springframework.boot.data.redis.autoconfigure.DataRedisUrlSyntaxFailureAnalyzer
 
diff --git a/module/spring-boot-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 3e923829fb8..c2adccbf23a 100644
--- a/module/spring-boot-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,6 +1,6 @@
-org.springframework.boot.data.redis.autoconfigure.LettuceMetricsAutoConfiguration
-org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration
-org.springframework.boot.data.redis.autoconfigure.RedisReactiveAutoConfiguration
-org.springframework.boot.data.redis.autoconfigure.RedisRepositoriesAutoConfiguration
-org.springframework.boot.data.redis.autoconfigure.health.RedisHealthContributorAutoConfiguration
-org.springframework.boot.data.redis.autoconfigure.health.RedisReactiveHealthContributorAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.DataRedisReactiveAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.DataRedisRepositoriesAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.health.DataRedisHealthContributorAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.health.DataRedisReactiveHealthContributorAutoConfiguration
+org.springframework.boot.data.redis.autoconfigure.metrics.LettuceMetricsAutoConfiguration
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationJedisTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationJedisTests.java
similarity index 97%
rename from module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationJedisTests.java
rename to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationJedisTests.java
index bbe6f7845f8..bfe5279440c 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationJedisTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationJedisTests.java
@@ -40,7 +40,7 @@ import org.springframework.test.util.ReflectionTestUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RedisAutoConfiguration} when Lettuce is not on the classpath.
+ * Tests for {@link DataRedisAutoConfiguration} when Lettuce is not on the classpath.
  *
  * @author Mark Paluch
  * @author Stephane Nicoll
@@ -51,10 +51,10 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Scott Frederick
  */
 @ClassPathExclusions("lettuce-core-*.jar")
-class RedisAutoConfigurationJedisTests {
+class DataRedisAutoConfigurationJedisTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class, SslAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class, SslAutoConfiguration.class));
 
 	@Test
 	void connectionFactoryDefaultsToJedis() {
@@ -316,8 +316,8 @@ class RedisAutoConfigurationJedisTests {
 	static class ConnectionDetailsConfiguration {
 
 		@Bean
-		RedisConnectionDetails redisConnectionDetails() {
-			return new RedisConnectionDetails() {
+		DataRedisConnectionDetails redisConnectionDetails() {
+			return new DataRedisConnectionDetails() {
 
 				@Override
 				public Standalone getStandalone() {
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java
similarity index 87%
rename from module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java
rename to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java
index de6367c7a74..6f035650ba7 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationLettuceWithoutCommonsPool2Tests.java
@@ -27,15 +27,16 @@ import org.springframework.data.redis.connection.lettuce.LettucePoolingClientCon
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RedisAutoConfiguration} when commons-pool2 is not on the classpath.
+ * Tests for {@link DataRedisAutoConfiguration} when commons-pool2 is not on the
+ * classpath.
  *
  * @author Stephane Nicoll
  */
 @ClassPathExclusions("commons-pool2-*.jar")
-class RedisAutoConfigurationLettuceWithoutCommonsPool2Tests {
+class DataRedisAutoConfigurationLettuceWithoutCommonsPool2Tests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class));
 
 	@Test
 	void poolWithoutCommonsPool2IsDisabledByDefault() {
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationTests.java
similarity index 96%
rename from module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationTests.java
rename to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationTests.java
index fc1b8dba6f5..d7556a4814e 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisAutoConfigurationTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAutoConfigurationTests.java
@@ -46,7 +46,7 @@ import org.junit.jupiter.params.provider.MethodSource;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Pool;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties.Pool;
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.context.runner.ContextConsumer;
@@ -76,7 +76,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link RedisAutoConfiguration}.
+ * Tests for {@link DataRedisAutoConfiguration}.
  *
  * @author Dave Syer
  * @author Christian Dupuis
@@ -92,10 +92,10 @@ import static org.mockito.Mockito.mock;
  * @author Andy Wilkinson
  * @author Phillip Webb
  */
-class RedisAutoConfigurationTests {
+class DataRedisAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class, SslAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class, SslAutoConfiguration.class));
 
 	@Test
 	void testDefaultRedisConfiguration() {
@@ -252,7 +252,7 @@ class RedisAutoConfigurationTests {
 
 	@Test
 	void testRedisConfigurationUsePoolByDefault() {
-		Pool defaultPool = new RedisProperties().getLettuce().getPool();
+		Pool defaultPool = new DataRedisProperties().getLettuce().getPool();
 		this.contextRunner.withPropertyValues("spring.data.redis.host:foo").run((context) -> {
 			LettuceConnectionFactory cf = context.getBean(LettuceConnectionFactory.class);
 			assertThat(cf.getHostName()).isEqualTo("foo");
@@ -462,7 +462,7 @@ class RedisAutoConfigurationTests {
 					"spring.data.redis.url=redis-sentinel://username:password@127.0.0.1:26379,127.0.0.1:26380/mymaster")
 			.run((context) -> assertThatIllegalStateException()
 				.isThrownBy(() -> context.getBean(LettuceConnectionFactory.class))
-				.withRootCauseInstanceOf(RedisUrlSyntaxException.class)
+				.withRootCauseInstanceOf(DataRedisUrlSyntaxException.class)
 				.havingRootCause()
 				.withMessageContaining(
 						"Invalid Redis URL 'redis-sentinel://username:password@127.0.0.1:26379,127.0.0.1:26380/mymaster'"));
@@ -573,14 +573,15 @@ class RedisAutoConfigurationTests {
 
 	@Test
 	void definesPropertiesBasedConnectionDetailsByDefault() {
-		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(PropertiesRedisConnectionDetails.class));
+		this.contextRunner
+			.run((context) -> assertThat(context).hasSingleBean(PropertiesDataRedisConnectionDetails.class));
 	}
 
 	@Test
 	void usesStandaloneFromCustomConnectionDetails() {
 		this.contextRunner.withUserConfiguration(ConnectionDetailsStandaloneConfiguration.class).run((context) -> {
-			assertThat(context).hasSingleBean(RedisConnectionDetails.class)
-				.doesNotHaveBean(PropertiesRedisConnectionDetails.class);
+			assertThat(context).hasSingleBean(DataRedisConnectionDetails.class)
+				.doesNotHaveBean(PropertiesDataRedisConnectionDetails.class);
 			LettuceConnectionFactory cf = context.getBean(LettuceConnectionFactory.class);
 			assertThat(cf.isUseSsl()).isFalse();
 			RedisStandaloneConfiguration configuration = cf.getStandaloneConfiguration();
@@ -595,8 +596,8 @@ class RedisAutoConfigurationTests {
 	@Test
 	void usesSentinelFromCustomConnectionDetails() {
 		this.contextRunner.withUserConfiguration(ConnectionDetailsSentinelConfiguration.class).run((context) -> {
-			assertThat(context).hasSingleBean(RedisConnectionDetails.class)
-				.doesNotHaveBean(PropertiesRedisConnectionDetails.class);
+			assertThat(context).hasSingleBean(DataRedisConnectionDetails.class)
+				.doesNotHaveBean(PropertiesDataRedisConnectionDetails.class);
 			LettuceConnectionFactory cf = context.getBean(LettuceConnectionFactory.class);
 			assertThat(cf.isUseSsl()).isFalse();
 			RedisSentinelConfiguration configuration = cf.getSentinelConfiguration();
@@ -614,8 +615,8 @@ class RedisAutoConfigurationTests {
 	@Test
 	void usesClusterFromCustomConnectionDetails() {
 		this.contextRunner.withUserConfiguration(ConnectionDetailsClusterConfiguration.class).run((context) -> {
-			assertThat(context).hasSingleBean(RedisConnectionDetails.class)
-				.doesNotHaveBean(PropertiesRedisConnectionDetails.class);
+			assertThat(context).hasSingleBean(DataRedisConnectionDetails.class)
+				.doesNotHaveBean(PropertiesDataRedisConnectionDetails.class);
 			LettuceConnectionFactory cf = context.getBean(LettuceConnectionFactory.class);
 			assertThat(cf.isUseSsl()).isFalse();
 			RedisClusterConfiguration configuration = cf.getClusterConfiguration();
@@ -755,8 +756,8 @@ class RedisAutoConfigurationTests {
 	static class ConnectionDetailsStandaloneConfiguration {
 
 		@Bean
-		RedisConnectionDetails redisConnectionDetails() {
-			return new RedisConnectionDetails() {
+		DataRedisConnectionDetails redisConnectionDetails() {
+			return new DataRedisConnectionDetails() {
 
 				@Override
 				public String getUsername() {
@@ -799,8 +800,8 @@ class RedisAutoConfigurationTests {
 	static class ConnectionDetailsSentinelConfiguration {
 
 		@Bean
-		RedisConnectionDetails redisConnectionDetails() {
-			return new RedisConnectionDetails() {
+		DataRedisConnectionDetails redisConnectionDetails() {
+			return new DataRedisConnectionDetails() {
 
 				@Override
 				public String getUsername() {
@@ -853,8 +854,8 @@ class RedisAutoConfigurationTests {
 	static class ConnectionDetailsClusterConfiguration {
 
 		@Bean
-		RedisConnectionDetails redisConnectionDetails() {
-			return new RedisConnectionDetails() {
+		DataRedisConnectionDetails redisConnectionDetails() {
+			return new DataRedisConnectionDetails() {
 
 				@Override
 				public String getUsername() {
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisReactiveAutoConfigurationTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisReactiveAutoConfigurationTests.java
similarity index 84%
rename from module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisReactiveAutoConfigurationTests.java
rename to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisReactiveAutoConfigurationTests.java
index d1ac253d586..52f2f0f5c14 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisReactiveAutoConfigurationTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/DataRedisReactiveAutoConfigurationTests.java
@@ -27,14 +27,14 @@ import org.springframework.data.redis.core.ReactiveRedisTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RedisReactiveAutoConfiguration}.
+ * Tests for {@link DataRedisReactiveAutoConfiguration}.
  *
  * @author Stephane Nicoll
  */
-class RedisReactiveAutoConfigurationTests {
+class DataRedisReactiveAutoConfigurationTests {
 
-	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class));
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
+			AutoConfigurations.of(DataRedisAutoConfiguration.class, DataRedisReactiveAutoConfiguration.class));
 
 	@Test
 	void testDefaultRedisConfiguration() {
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/PropertiesRedisConnectionDetailsTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/PropertiesRedisConnectionDetailsTests.java
index 9e87ca435e0..8417258ea95 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/PropertiesRedisConnectionDetailsTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/PropertiesRedisConnectionDetailsTests.java
@@ -21,7 +21,7 @@ import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails.Node;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails.Node;
 import org.springframework.boot.ssl.DefaultSslBundleRegistry;
 import org.springframework.boot.ssl.SslBundle;
 
@@ -29,29 +29,29 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link PropertiesRedisConnectionDetails}.
+ * Tests for {@link PropertiesDataRedisConnectionDetails}.
  *
  * @author Scott Frederick
  * @author Moritz Halbritter
  */
 class PropertiesRedisConnectionDetailsTests {
 
-	private RedisProperties properties;
+	private DataRedisProperties properties;
 
-	private PropertiesRedisConnectionDetails connectionDetails;
+	private PropertiesDataRedisConnectionDetails connectionDetails;
 
 	private DefaultSslBundleRegistry sslBundleRegistry;
 
 	@BeforeEach
 	void setUp() {
-		this.properties = new RedisProperties();
+		this.properties = new DataRedisProperties();
 		this.sslBundleRegistry = new DefaultSslBundleRegistry();
-		this.connectionDetails = new PropertiesRedisConnectionDetails(this.properties, this.sslBundleRegistry);
+		this.connectionDetails = new PropertiesDataRedisConnectionDetails(this.properties, this.sslBundleRegistry);
 	}
 
 	@Test
 	void connectionIsConfiguredWithDefaults() {
-		RedisConnectionDetails.Standalone standalone = this.connectionDetails.getStandalone();
+		DataRedisConnectionDetails.Standalone standalone = this.connectionDetails.getStandalone();
 		assertThat(standalone.getHost()).isEqualTo("localhost");
 		assertThat(standalone.getPort()).isEqualTo(6379);
 		assertThat(standalone.getDatabase()).isEqualTo(0);
@@ -109,7 +109,7 @@ class PropertiesRedisConnectionDetailsTests {
 		this.properties.setHost("notused");
 		this.properties.setPort(9999);
 		this.properties.setDatabase(5);
-		RedisConnectionDetails.Standalone standalone = this.connectionDetails.getStandalone();
+		DataRedisConnectionDetails.Standalone standalone = this.connectionDetails.getStandalone();
 		assertThat(standalone.getHost()).isEqualTo("example.com");
 		assertThat(standalone.getPort()).isEqualTo(1234);
 		assertThat(standalone.getDatabase()).isEqualTo(9999);
@@ -119,9 +119,9 @@ class PropertiesRedisConnectionDetailsTests {
 	void standaloneIsConfiguredFromUrlWithoutDatabase() {
 		this.properties.setUrl("redis://example.com:1234");
 		this.properties.setDatabase(5);
-		PropertiesRedisConnectionDetails connectionDetails = new PropertiesRedisConnectionDetails(this.properties,
-				null);
-		RedisConnectionDetails.Standalone standalone = connectionDetails.getStandalone();
+		PropertiesDataRedisConnectionDetails connectionDetails = new PropertiesDataRedisConnectionDetails(
+				this.properties, null);
+		DataRedisConnectionDetails.Standalone standalone = connectionDetails.getStandalone();
 		assertThat(standalone.getHost()).isEqualTo("example.com");
 		assertThat(standalone.getPort()).isEqualTo(1234);
 		assertThat(standalone.getDatabase()).isEqualTo(0);
@@ -132,7 +132,7 @@ class PropertiesRedisConnectionDetailsTests {
 		this.properties.setHost("example.com");
 		this.properties.setPort(1234);
 		this.properties.setDatabase(5);
-		RedisConnectionDetails.Standalone standalone = this.connectionDetails.getStandalone();
+		DataRedisConnectionDetails.Standalone standalone = this.connectionDetails.getStandalone();
 		assertThat(standalone.getHost()).isEqualTo("example.com");
 		assertThat(standalone.getPort()).isEqualTo(1234);
 		assertThat(standalone.getDatabase()).isEqualTo(5);
@@ -140,7 +140,7 @@ class PropertiesRedisConnectionDetailsTests {
 
 	@Test
 	void clusterIsConfigured() {
-		RedisProperties.Cluster cluster = new RedisProperties.Cluster();
+		DataRedisProperties.Cluster cluster = new DataRedisProperties.Cluster();
 		cluster.setNodes(List.of("localhost:1111", "127.0.0.1:2222", "[::1]:3333"));
 		this.properties.setCluster(cluster);
 		assertThat(this.connectionDetails.getCluster().getNodes()).containsExactly(new Node("localhost", 1111),
@@ -149,12 +149,12 @@ class PropertiesRedisConnectionDetailsTests {
 
 	@Test
 	void sentinelIsConfigured() {
-		RedisProperties.Sentinel sentinel = new RedisProperties.Sentinel();
+		DataRedisProperties.Sentinel sentinel = new DataRedisProperties.Sentinel();
 		sentinel.setNodes(List.of("localhost:1111", "127.0.0.1:2222", "[::1]:3333"));
 		this.properties.setSentinel(sentinel);
 		this.properties.setDatabase(5);
-		PropertiesRedisConnectionDetails connectionDetails = new PropertiesRedisConnectionDetails(this.properties,
-				null);
+		PropertiesDataRedisConnectionDetails connectionDetails = new PropertiesDataRedisConnectionDetails(
+				this.properties, null);
 		assertThat(connectionDetails.getSentinel().getNodes()).containsExactly(new Node("localhost", 1111),
 				new Node("127.0.0.1", 2222), new Node("[::1]", 3333));
 		assertThat(connectionDetails.getSentinel().getDatabase()).isEqualTo(5);
@@ -162,13 +162,13 @@ class PropertiesRedisConnectionDetailsTests {
 
 	@Test
 	void sentinelDatabaseIsConfiguredFromUrl() {
-		RedisProperties.Sentinel sentinel = new RedisProperties.Sentinel();
+		DataRedisProperties.Sentinel sentinel = new DataRedisProperties.Sentinel();
 		sentinel.setNodes(List.of("localhost:1111", "127.0.0.1:2222", "[::1]:3333"));
 		this.properties.setSentinel(sentinel);
 		this.properties.setUrl("redis://example.com:1234/9999");
 		this.properties.setDatabase(5);
-		PropertiesRedisConnectionDetails connectionDetails = new PropertiesRedisConnectionDetails(this.properties,
-				null);
+		PropertiesDataRedisConnectionDetails connectionDetails = new PropertiesDataRedisConnectionDetails(
+				this.properties, null);
 		assertThat(connectionDetails.getSentinel().getDatabase()).isEqualTo(9999);
 	}
 
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisPropertiesTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisPropertiesTests.java
index a71e9a94760..ab1e72d24b3 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisPropertiesTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisPropertiesTests.java
@@ -19,12 +19,12 @@ package org.springframework.boot.data.redis.autoconfigure;
 import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.data.redis.autoconfigure.RedisProperties.Lettuce;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties.Lettuce;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RedisProperties}.
+ * Tests for {@link DataRedisProperties}.
  *
  * @author Stephane Nicoll
  */
@@ -32,7 +32,7 @@ class RedisPropertiesTests {
 
 	@Test
 	void lettuceDefaultsAreConsistent() {
-		Lettuce lettuce = new RedisProperties().getLettuce();
+		Lettuce lettuce = new DataRedisProperties().getLettuce();
 		ClusterTopologyRefreshOptions defaultClusterTopologyRefreshOptions = ClusterTopologyRefreshOptions.builder()
 			.build();
 		assertThat(lettuce.getCluster().getRefresh().isDynamicRefreshSources())
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxFailureAnalyzerTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxFailureAnalyzerTests.java
index 6483aa51f06..8287ac02dfb 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxFailureAnalyzerTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/RedisUrlSyntaxFailureAnalyzerTests.java
@@ -23,7 +23,7 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RedisUrlSyntaxFailureAnalyzer}.
+ * Tests for {@link DataRedisUrlSyntaxFailureAnalyzer}.
  *
  * @author Scott Frederick
  */
@@ -31,16 +31,16 @@ class RedisUrlSyntaxFailureAnalyzerTests {
 
 	@Test
 	void analyzeInvalidUrlSyntax() {
-		RedisUrlSyntaxException exception = new RedisUrlSyntaxException("redis://invalid");
-		FailureAnalysis analysis = new RedisUrlSyntaxFailureAnalyzer().analyze(exception);
+		DataRedisUrlSyntaxException exception = new DataRedisUrlSyntaxException("redis://invalid");
+		FailureAnalysis analysis = new DataRedisUrlSyntaxFailureAnalyzer().analyze(exception);
 		assertThat(analysis.getDescription()).contains("The URL 'redis://invalid' is not valid");
 		assertThat(analysis.getAction()).contains("Review the value of the property 'spring.data.redis.url'");
 	}
 
 	@Test
 	void analyzeRedisHttpUrl() {
-		RedisUrlSyntaxException exception = new RedisUrlSyntaxException("http://127.0.0.1:26379/mymaster");
-		FailureAnalysis analysis = new RedisUrlSyntaxFailureAnalyzer().analyze(exception);
+		DataRedisUrlSyntaxException exception = new DataRedisUrlSyntaxException("http://127.0.0.1:26379/mymaster");
+		FailureAnalysis analysis = new DataRedisUrlSyntaxFailureAnalyzer().analyze(exception);
 		assertThat(analysis.getDescription()).contains("The URL 'http://127.0.0.1:26379/mymaster' is not valid")
 			.contains("The scheme 'http' is not supported");
 		assertThat(analysis.getAction()).contains("Use the scheme 'redis://' for insecure or 'rediss://' for secure");
@@ -48,9 +48,9 @@ class RedisUrlSyntaxFailureAnalyzerTests {
 
 	@Test
 	void analyzeRedisSentinelUrl() {
-		RedisUrlSyntaxException exception = new RedisUrlSyntaxException(
+		DataRedisUrlSyntaxException exception = new DataRedisUrlSyntaxException(
 				"redis-sentinel://username:password@127.0.0.1:26379,127.0.0.1:26380/mymaster");
-		FailureAnalysis analysis = new RedisUrlSyntaxFailureAnalyzer().analyze(exception);
+		FailureAnalysis analysis = new DataRedisUrlSyntaxFailureAnalyzer().analyze(exception);
 		assertThat(analysis.getDescription()).contains(
 				"The URL 'redis-sentinel://username:password@127.0.0.1:26379,127.0.0.1:26380/mymaster' is not valid")
 			.contains("The scheme 'redis-sentinel' is not supported");
@@ -59,8 +59,8 @@ class RedisUrlSyntaxFailureAnalyzerTests {
 
 	@Test
 	void analyzeRedisSocketUrl() {
-		RedisUrlSyntaxException exception = new RedisUrlSyntaxException("redis-socket:///redis/redis.sock");
-		FailureAnalysis analysis = new RedisUrlSyntaxFailureAnalyzer().analyze(exception);
+		DataRedisUrlSyntaxException exception = new DataRedisUrlSyntaxException("redis-socket:///redis/redis.sock");
+		FailureAnalysis analysis = new DataRedisUrlSyntaxFailureAnalyzer().analyze(exception);
 		assertThat(analysis.getDescription()).contains("The URL 'redis-socket:///redis/redis.sock' is not valid")
 			.contains("The scheme 'redis-socket' is not supported");
 		assertThat(analysis.getAction()).contains("Configure the appropriate Spring Data Redis connection beans");
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfigurationTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfigurationTests.java
index 561cb395002..f2d1e10594a 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfigurationTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisHealthContributorAutoConfigurationTests.java
@@ -19,9 +19,9 @@ package org.springframework.boot.data.redis.autoconfigure.health;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
-import org.springframework.boot.data.redis.health.RedisHealthIndicator;
-import org.springframework.boot.data.redis.health.RedisReactiveHealthIndicator;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.health.DataRedisHealthIndicator;
+import org.springframework.boot.data.redis.health.DataRedisReactiveHealthIndicator;
 import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
@@ -29,7 +29,7 @@ import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RedisHealthContributorAutoConfiguration}.
+ * Tests for {@link DataRedisHealthContributorAutoConfiguration}.
  *
  * @author Phillip Webb
  */
@@ -37,20 +37,20 @@ import static org.assertj.core.api.Assertions.assertThat;
 class RedisHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class,
-				RedisHealthContributorAutoConfiguration.class, HealthContributorAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class,
+				DataRedisHealthContributorAutoConfiguration.class, HealthContributorAutoConfiguration.class));
 
 	@Test
 	void runShouldCreateIndicator() {
-		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(RedisHealthIndicator.class)
-			.doesNotHaveBean(RedisReactiveHealthIndicator.class));
+		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(DataRedisHealthIndicator.class)
+			.doesNotHaveBean(DataRedisReactiveHealthIndicator.class));
 	}
 
 	@Test
 	void runWhenDisabledShouldNotCreateIndicator() {
 		this.contextRunner.withPropertyValues("management.health.redis.enabled:false")
-			.run((context) -> assertThat(context).doesNotHaveBean(RedisHealthIndicator.class)
-				.doesNotHaveBean(RedisReactiveHealthIndicator.class));
+			.run((context) -> assertThat(context).doesNotHaveBean(DataRedisHealthIndicator.class)
+				.doesNotHaveBean(DataRedisReactiveHealthIndicator.class));
 	}
 
 }
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfigurationTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfigurationTests.java
index 879fddc92c5..9a1999a0daa 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfigurationTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/health/RedisReactiveHealthContributorAutoConfigurationTests.java
@@ -19,43 +19,43 @@ package org.springframework.boot.data.redis.autoconfigure.health;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
-import org.springframework.boot.data.redis.health.RedisHealthIndicator;
-import org.springframework.boot.data.redis.health.RedisReactiveHealthIndicator;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.health.DataRedisHealthIndicator;
+import org.springframework.boot.data.redis.health.DataRedisReactiveHealthIndicator;
 import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RedisReactiveHealthContributorAutoConfiguration}.
+ * Tests for {@link DataRedisReactiveHealthContributorAutoConfiguration}.
  *
  * @author Phillip Webb
  */
 class RedisReactiveHealthContributorAutoConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class,
-				RedisReactiveHealthContributorAutoConfiguration.class, HealthContributorAutoConfiguration.class));
+		.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class,
+				DataRedisReactiveHealthContributorAutoConfiguration.class, HealthContributorAutoConfiguration.class));
 
 	@Test
 	void runShouldCreateIndicator() {
-		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(RedisReactiveHealthIndicator.class)
+		this.contextRunner.run((context) -> assertThat(context).hasSingleBean(DataRedisReactiveHealthIndicator.class)
 			.hasBean("redisHealthContributor"));
 	}
 
 	@Test
 	void runWithRegularIndicatorShouldOnlyCreateReactiveIndicator() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(RedisHealthContributorAutoConfiguration.class))
-			.run((context) -> assertThat(context).hasSingleBean(RedisReactiveHealthIndicator.class)
+		this.contextRunner.withConfiguration(AutoConfigurations.of(DataRedisHealthContributorAutoConfiguration.class))
+			.run((context) -> assertThat(context).hasSingleBean(DataRedisReactiveHealthIndicator.class)
 				.hasBean("redisHealthContributor")
-				.doesNotHaveBean(RedisHealthIndicator.class));
+				.doesNotHaveBean(DataRedisHealthIndicator.class));
 	}
 
 	@Test
 	void runWhenDisabledShouldNotCreateIndicator() {
 		this.contextRunner.withPropertyValues("management.health.redis.enabled:false")
-			.run((context) -> assertThat(context).doesNotHaveBean(RedisReactiveHealthIndicator.class)
+			.run((context) -> assertThat(context).doesNotHaveBean(DataRedisReactiveHealthIndicator.class)
 				.doesNotHaveBean("redisHealthContributor"));
 	}
 
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/LettuceMetricsAutoConfigurationTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/metrics/LettuceMetricsAutoConfigurationTests.java
similarity index 88%
rename from module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/LettuceMetricsAutoConfigurationTests.java
rename to module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/metrics/LettuceMetricsAutoConfigurationTests.java
index db1fc83423d..2419e3a609f 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/LettuceMetricsAutoConfigurationTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/autoconfigure/metrics/LettuceMetricsAutoConfigurationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.data.redis.autoconfigure;
+package org.springframework.boot.data.redis.autoconfigure.metrics;
 
 import io.lettuce.core.metrics.MicrometerCommandLatencyRecorder;
 import io.lettuce.core.metrics.MicrometerOptions;
@@ -23,6 +23,7 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -43,7 +44,7 @@ class LettuceMetricsAutoConfigurationTests {
 	@Test
 	void whenThereIsAMeterRegistryThenCommandLatencyRecorderIsAdded() {
 		this.contextRunner.withBean(SimpleMeterRegistry.class)
-			.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
 			.run((context) -> {
 				ClientResources clientResources = context.getBean(LettuceConnectionFactory.class).getClientResources();
 				assertThat(clientResources.commandLatencyRecorder())
@@ -54,7 +55,7 @@ class LettuceMetricsAutoConfigurationTests {
 	@Test
 	void autoConfiguredMicrometerOptionsUsesLettucesDefaults() {
 		this.contextRunner.withBean(SimpleMeterRegistry.class)
-			.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
 			.run((context) -> {
 				MicrometerOptions micrometerOptions = context.getBean(MicrometerOptions.class);
 				assertThat(micrometerOptions.isEnabled()).isTrue();
@@ -68,7 +69,7 @@ class LettuceMetricsAutoConfigurationTests {
 	@Test
 	void whenUserDefinesAMicrometerOptionsBeanThenCommandLatencyRecorderUsesIt() {
 		this.contextRunner.withBean(SimpleMeterRegistry.class)
-			.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
 			.withUserConfiguration(CustomMicrometerOptionsConfiguration.class)
 			.run((context) -> {
 				ClientResources clientResources = context.getBean(LettuceConnectionFactory.class).getClientResources();
@@ -81,7 +82,7 @@ class LettuceMetricsAutoConfigurationTests {
 
 	@Test
 	void whenThereIsNoMeterRegistryThenClientResourcesCustomizationBacksOff() {
-		this.contextRunner.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class)).run((context) -> {
+		this.contextRunner.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class)).run((context) -> {
 			ClientResources clientResources = context.getBean(LettuceConnectionFactory.class).getClientResources();
 			assertThat(clientResources.commandLatencyRecorder())
 				.isNotInstanceOf(MicrometerCommandLatencyRecorder.class);
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisHealthIndicatorTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisHealthIndicatorTests.java
index 6c6ccc98527..76a5c6e8f0f 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisHealthIndicatorTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisHealthIndicatorTests.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link RedisHealthIndicator}.
+ * Tests for {@link DataRedisHealthIndicator}.
  *
  * @author Christian Dupuis
  * @author Richard Santana
@@ -55,7 +55,7 @@ class RedisHealthIndicatorTests {
 		RedisServerCommands serverCommands = mock(RedisServerCommands.class);
 		given(redisConnection.serverCommands()).willReturn(serverCommands);
 		given(serverCommands.info()).willReturn(info);
-		RedisHealthIndicator healthIndicator = createHealthIndicator(redisConnection);
+		DataRedisHealthIndicator healthIndicator = createHealthIndicator(redisConnection);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.UP);
 		assertThat(health.getDetails()).containsEntry("version", "2.8.9");
@@ -67,7 +67,7 @@ class RedisHealthIndicatorTests {
 		RedisServerCommands serverCommands = mock(RedisServerCommands.class);
 		given(redisConnection.serverCommands()).willReturn(serverCommands);
 		given(serverCommands.info()).willThrow(new RedisConnectionFailureException("Connection failed"));
-		RedisHealthIndicator healthIndicator = createHealthIndicator(redisConnection);
+		DataRedisHealthIndicator healthIndicator = createHealthIndicator(redisConnection);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
 		assertThat((String) health.getDetails().get("error")).contains("Connection failed");
@@ -76,7 +76,7 @@ class RedisHealthIndicatorTests {
 	@Test
 	void healthWhenClusterStateIsAbsentShouldBeUp() {
 		RedisConnectionFactory redisConnectionFactory = createClusterConnectionFactory(null);
-		RedisHealthIndicator healthIndicator = new RedisHealthIndicator(redisConnectionFactory);
+		DataRedisHealthIndicator healthIndicator = new DataRedisHealthIndicator(redisConnectionFactory);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.UP);
 		assertThat(health.getDetails()).containsEntry("cluster_size", 4L);
@@ -88,7 +88,7 @@ class RedisHealthIndicatorTests {
 	@Test
 	void healthWhenClusterStateIsOkShouldBeUp() {
 		RedisConnectionFactory redisConnectionFactory = createClusterConnectionFactory("ok");
-		RedisHealthIndicator healthIndicator = new RedisHealthIndicator(redisConnectionFactory);
+		DataRedisHealthIndicator healthIndicator = new DataRedisHealthIndicator(redisConnectionFactory);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.UP);
 		assertThat(health.getDetails()).containsEntry("cluster_size", 4L);
@@ -100,7 +100,7 @@ class RedisHealthIndicatorTests {
 	@Test
 	void healthWhenClusterStateIsFailShouldBeDown() {
 		RedisConnectionFactory redisConnectionFactory = createClusterConnectionFactory("fail");
-		RedisHealthIndicator healthIndicator = new RedisHealthIndicator(redisConnectionFactory);
+		DataRedisHealthIndicator healthIndicator = new DataRedisHealthIndicator(redisConnectionFactory);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
 		assertThat(health.getDetails()).containsEntry("cluster_size", 4L);
@@ -109,10 +109,10 @@ class RedisHealthIndicatorTests {
 		then(redisConnectionFactory).should(atLeastOnce()).getConnection();
 	}
 
-	private RedisHealthIndicator createHealthIndicator(RedisConnection redisConnection) {
+	private DataRedisHealthIndicator createHealthIndicator(RedisConnection redisConnection) {
 		RedisConnectionFactory redisConnectionFactory = mock(RedisConnectionFactory.class);
 		given(redisConnectionFactory.getConnection()).willReturn(redisConnection);
-		return new RedisHealthIndicator(redisConnectionFactory);
+		return new DataRedisHealthIndicator(redisConnectionFactory);
 	}
 
 	private RedisConnectionFactory createClusterConnectionFactory(String state) {
diff --git a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicatorTests.java b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicatorTests.java
index 7f0a3112907..b535f37d018 100644
--- a/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicatorTests.java
+++ b/module/spring-boot-data-redis/src/test/java/org/springframework/boot/data/redis/health/RedisReactiveHealthIndicatorTests.java
@@ -39,7 +39,7 @@ import static org.mockito.BDDMockito.then;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link RedisReactiveHealthIndicator}.
+ * Tests for {@link DataRedisReactiveHealthIndicator}.
  *
  * @author Stephane Nicoll
  * @author Mark Paluch
@@ -57,7 +57,7 @@ class RedisReactiveHealthIndicatorTests {
 		given(redisConnection.closeLater()).willReturn(Mono.empty());
 		ReactiveServerCommands commands = mock(ReactiveServerCommands.class);
 		given(commands.info("server")).willReturn(Mono.just(info));
-		RedisReactiveHealthIndicator healthIndicator = createHealthIndicator(redisConnection, commands);
+		DataRedisReactiveHealthIndicator healthIndicator = createHealthIndicator(redisConnection, commands);
 		Mono<Health> health = healthIndicator.health();
 		StepVerifier.create(health).consumeNextWith((h) -> {
 			assertThat(h.getStatus()).isEqualTo(Status.UP);
@@ -70,7 +70,7 @@ class RedisReactiveHealthIndicatorTests {
 	@Test
 	void healthWhenClusterStateIsAbsentShouldBeUp() {
 		ReactiveRedisConnectionFactory redisConnectionFactory = createClusterConnectionFactory(null);
-		RedisReactiveHealthIndicator healthIndicator = new RedisReactiveHealthIndicator(redisConnectionFactory);
+		DataRedisReactiveHealthIndicator healthIndicator = new DataRedisReactiveHealthIndicator(redisConnectionFactory);
 		Mono<Health> health = healthIndicator.health();
 		StepVerifier.create(health).consumeNextWith((h) -> {
 			assertThat(h.getStatus()).isEqualTo(Status.UP);
@@ -84,7 +84,7 @@ class RedisReactiveHealthIndicatorTests {
 	@Test
 	void healthWhenClusterStateIsOkShouldBeUp() {
 		ReactiveRedisConnectionFactory redisConnectionFactory = createClusterConnectionFactory("ok");
-		RedisReactiveHealthIndicator healthIndicator = new RedisReactiveHealthIndicator(redisConnectionFactory);
+		DataRedisReactiveHealthIndicator healthIndicator = new DataRedisReactiveHealthIndicator(redisConnectionFactory);
 		Mono<Health> health = healthIndicator.health();
 		StepVerifier.create(health).consumeNextWith((h) -> {
 			assertThat(h.getStatus()).isEqualTo(Status.UP);
@@ -97,7 +97,7 @@ class RedisReactiveHealthIndicatorTests {
 	@Test
 	void healthWhenClusterStateIsFailShouldBeDown() {
 		ReactiveRedisConnectionFactory redisConnectionFactory = createClusterConnectionFactory("fail");
-		RedisReactiveHealthIndicator healthIndicator = new RedisReactiveHealthIndicator(redisConnectionFactory);
+		DataRedisReactiveHealthIndicator healthIndicator = new DataRedisReactiveHealthIndicator(redisConnectionFactory);
 		Mono<Health> health = healthIndicator.health();
 		StepVerifier.create(health).consumeNextWith((h) -> {
 			assertThat(h.getStatus()).isEqualTo(Status.DOWN);
@@ -112,7 +112,7 @@ class RedisReactiveHealthIndicatorTests {
 		given(commands.info("server")).willReturn(Mono.error(new RedisConnectionFailureException("Connection failed")));
 		ReactiveRedisConnection redisConnection = mock(ReactiveRedisConnection.class);
 		given(redisConnection.closeLater()).willReturn(Mono.empty());
-		RedisReactiveHealthIndicator healthIndicator = createHealthIndicator(redisConnection, commands);
+		DataRedisReactiveHealthIndicator healthIndicator = createHealthIndicator(redisConnection, commands);
 		Mono<Health> health = healthIndicator.health();
 		StepVerifier.create(health)
 			.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
@@ -126,7 +126,7 @@ class RedisReactiveHealthIndicatorTests {
 		ReactiveRedisConnectionFactory redisConnectionFactory = mock(ReactiveRedisConnectionFactory.class);
 		given(redisConnectionFactory.getReactiveConnection())
 			.willThrow(new RedisConnectionException("Unable to connect to localhost:6379"));
-		RedisReactiveHealthIndicator healthIndicator = new RedisReactiveHealthIndicator(redisConnectionFactory);
+		DataRedisReactiveHealthIndicator healthIndicator = new DataRedisReactiveHealthIndicator(redisConnectionFactory);
 		Mono<Health> health = healthIndicator.health();
 		StepVerifier.create(health)
 			.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
@@ -134,12 +134,12 @@ class RedisReactiveHealthIndicatorTests {
 			.verify(Duration.ofSeconds(30));
 	}
 
-	private RedisReactiveHealthIndicator createHealthIndicator(ReactiveRedisConnection redisConnection,
+	private DataRedisReactiveHealthIndicator createHealthIndicator(ReactiveRedisConnection redisConnection,
 			ReactiveServerCommands serverCommands) {
 		ReactiveRedisConnectionFactory redisConnectionFactory = mock(ReactiveRedisConnectionFactory.class);
 		given(redisConnectionFactory.getReactiveConnection()).willReturn(redisConnection);
 		given(redisConnection.serverCommands()).willReturn(serverCommands);
-		return new RedisReactiveHealthIndicator(redisConnectionFactory);
+		return new DataRedisReactiveHealthIndicator(redisConnectionFactory);
 	}
 
 	private ReactiveRedisConnectionFactory createClusterConnectionFactory(String state) {
diff --git a/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestMvcAutoConfiguration.java b/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/DataRestAutoConfiguration.java
similarity index 86%
rename from module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestMvcAutoConfiguration.java
rename to module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/DataRestAutoConfiguration.java
index 717ad7a6f5d..6ba8f72d70d 100644
--- a/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestMvcAutoConfiguration.java
+++ b/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/DataRestAutoConfiguration.java
@@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.data.autoconfigure.web.SpringDataWebAutoConfiguration;
+import org.springframework.boot.data.autoconfigure.web.DataWebAutoConfiguration;
 import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
 import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
@@ -33,8 +33,7 @@ import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
 
 /**
- * {@link EnableAutoConfiguration Auto-configuration} for Spring Data Rest's MVC
- * integration.
+ * {@link EnableAutoConfiguration Auto-configuration} for Spring Data REST.
  * <p>
  * Activates when the application is a web application and no
  * {@link RepositoryRestMvcConfiguration} is found.
@@ -47,18 +46,17 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguratio
  * @author Andy Wilkinson
  * @since 4.0.0
  */
-@AutoConfiguration(before = SpringDataWebAutoConfiguration.class, after = JacksonAutoConfiguration.class)
+@AutoConfiguration(before = DataWebAutoConfiguration.class, after = JacksonAutoConfiguration.class)
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @ConditionalOnMissingBean(RepositoryRestMvcConfiguration.class)
 @ConditionalOnClass(RepositoryRestMvcConfiguration.class)
-@EnableConfigurationProperties(RepositoryRestProperties.class)
+@EnableConfigurationProperties(DataRestProperties.class)
 @Import(RepositoryRestMvcConfiguration.class)
-public final class RepositoryRestMvcAutoConfiguration {
+public final class DataRestAutoConfiguration {
 
 	@Bean
 	SpringBootRepositoryRestConfigurer springBootRepositoryRestConfigurer(
-			ObjectProvider<JsonMapperBuilderCustomizer> jsonMapperBuilderCustomizers,
-			RepositoryRestProperties properties) {
+			ObjectProvider<JsonMapperBuilderCustomizer> jsonMapperBuilderCustomizers, DataRestProperties properties) {
 		return new SpringBootRepositoryRestConfigurer(jsonMapperBuilderCustomizers.orderedStream().toList(),
 				properties);
 	}
diff --git a/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestProperties.java b/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/DataRestProperties.java
similarity index 99%
rename from module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestProperties.java
rename to module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/DataRestProperties.java
index 25991d1a828..78bdbb96a6d 100644
--- a/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestProperties.java
+++ b/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/DataRestProperties.java
@@ -31,7 +31,7 @@ import org.springframework.http.MediaType;
  * @since 4.0.0
  */
 @ConfigurationProperties("spring.data.rest")
-public class RepositoryRestProperties {
+public class DataRestProperties {
 
 	/**
 	 * Base path to be used by Spring Data REST to expose repository resources.
diff --git a/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/SpringBootRepositoryRestConfigurer.java b/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/SpringBootRepositoryRestConfigurer.java
index 3a1f59d28fc..88cea4259be 100644
--- a/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/SpringBootRepositoryRestConfigurer.java
+++ b/module/spring-boot-data-rest/src/main/java/org/springframework/boot/data/rest/autoconfigure/SpringBootRepositoryRestConfigurer.java
@@ -41,10 +41,10 @@ class SpringBootRepositoryRestConfigurer implements RepositoryRestConfigurer {
 
 	private final List<JsonMapperBuilderCustomizer> jsonMapperBuilderCustomizers;
 
-	private final RepositoryRestProperties properties;
+	private final DataRestProperties properties;
 
 	SpringBootRepositoryRestConfigurer(List<JsonMapperBuilderCustomizer> jsonMapperBuilderCustomizers,
-			RepositoryRestProperties properties) {
+			DataRestProperties properties) {
 		this.jsonMapperBuilderCustomizers = jsonMapperBuilderCustomizers;
 		this.properties = properties;
 	}
diff --git a/module/spring-boot-data-rest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-data-rest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 86483ab01f6..a9e755aeab3 100644
--- a/module/spring-boot-data-rest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-data-rest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-org.springframework.boot.data.rest.autoconfigure.RepositoryRestMvcAutoConfiguration
+org.springframework.boot.data.rest.autoconfigure.DataRestAutoConfiguration
diff --git a/module/spring-boot-data-rest/src/test/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestMvcAutoConfigurationTests.java b/module/spring-boot-data-rest/src/test/java/org/springframework/boot/data/rest/autoconfigure/DataRestAutoConfigurationTests.java
similarity index 95%
rename from module/spring-boot-data-rest/src/test/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestMvcAutoConfigurationTests.java
rename to module/spring-boot-data-rest/src/test/java/org/springframework/boot/data/rest/autoconfigure/DataRestAutoConfigurationTests.java
index 9488b1225fb..78ecccc8e7f 100644
--- a/module/spring-boot-data-rest/src/test/java/org/springframework/boot/data/rest/autoconfigure/RepositoryRestMvcAutoConfigurationTests.java
+++ b/module/spring-boot-data-rest/src/test/java/org/springframework/boot/data/rest/autoconfigure/DataRestAutoConfigurationTests.java
@@ -26,7 +26,7 @@ import tools.jackson.databind.json.JsonMapper;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration;
+import org.springframework.boot.data.jpa.autoconfigure.DataJpaRepositoriesAutoConfiguration;
 import org.springframework.boot.data.rest.domain.city.City;
 import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
 import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
@@ -49,13 +49,13 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link RepositoryRestMvcAutoConfiguration}.
+ * Tests for {@link DataRestAutoConfiguration}.
  *
  * @author Rob Winch
  * @author Andy Wilkinson
  * @author Stephane Nicoll
  */
-class RepositoryRestMvcAutoConfigurationTests {
+class DataRestAutoConfigurationTests {
 
 	private AnnotationConfigServletWebApplicationContext context;
 
@@ -135,8 +135,8 @@ class RepositoryRestMvcAutoConfigurationTests {
 
 	@Configuration(proxyBeanMethods = false)
 	@Import(EmbeddedDataSourceConfiguration.class)
-	@ImportAutoConfiguration({ HibernateJpaAutoConfiguration.class, JpaRepositoriesAutoConfiguration.class,
-			PropertyPlaceholderAutoConfiguration.class, RepositoryRestMvcAutoConfiguration.class,
+	@ImportAutoConfiguration({ HibernateJpaAutoConfiguration.class, DataJpaRepositoriesAutoConfiguration.class,
+			PropertyPlaceholderAutoConfiguration.class, DataRestAutoConfiguration.class,
 			JacksonAutoConfiguration.class })
 	static class BaseConfiguration {
 
diff --git a/module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfigurationTests.java b/module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoAutoConfigurationTests.java
similarity index 91%
rename from module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfigurationTests.java
rename to module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoAutoConfigurationTests.java
index fc4181dfabb..57f19a64c97 100644
--- a/module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfigurationTests.java
+++ b/module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoAutoConfigurationTests.java
@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration;
+import org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration;
 import org.springframework.boot.mongodb.autoconfigure.MongoAutoConfiguration;
 import org.springframework.boot.session.autoconfigure.AbstractSessionAutoConfigurationTests;
 import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
@@ -42,12 +42,12 @@ import org.springframework.session.data.mongo.MongoIndexedSessionRepository;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for the servlet support of {@link MongoSessionAutoConfiguration}.
+ * Tests for the servlet support of {@link SessionDataMongoAutoConfiguration}.
  *
  * @author Andy Wilkinson
  */
 @Testcontainers(disabledWithoutDocker = true)
-class MongoSessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTests {
+class SessionDataMongoAutoConfigurationTests extends AbstractSessionAutoConfigurationTests {
 
 	@Container
 	static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class);
@@ -55,8 +55,8 @@ class MongoSessionAutoConfigurationTests extends AbstractSessionAutoConfiguratio
 	@BeforeEach
 	void prepareContextRunner() {
 		this.contextRunner = new WebApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
-					SessionAutoConfiguration.class, MongoSessionAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, DataMongoAutoConfiguration.class,
+					SessionAutoConfiguration.class, SessionDataMongoAutoConfiguration.class))
 			.withPropertyValues("spring.mongodb.uri=" + mongoDb.getReplicaSetUrl());
 	}
 
diff --git a/module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoReactiveSessionAutoConfigurationTests.java b/module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoReactiveAutoConfigurationTests.java
similarity index 90%
rename from module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoReactiveSessionAutoConfigurationTests.java
rename to module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoReactiveAutoConfigurationTests.java
index 93fc57296ac..35e648bdb84 100644
--- a/module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoReactiveSessionAutoConfigurationTests.java
+++ b/module/spring-boot-session-data-mongodb/src/dockerTest/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoReactiveAutoConfigurationTests.java
@@ -26,9 +26,9 @@ import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration;
+import org.springframework.boot.data.mongodb.autoconfigure.DataMongoReactiveAutoConfiguration;
 import org.springframework.boot.mongodb.autoconfigure.MongoReactiveAutoConfiguration;
-import org.springframework.boot.session.autoconfigure.AbstractReactiveSessionAutoConfigurationTests;
+import org.springframework.boot.session.autoconfigure.AbstractSessionReactiveAutoConfigurationTests;
 import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
 import org.springframework.boot.test.context.runner.ContextConsumer;
@@ -42,13 +42,13 @@ import org.springframework.session.data.mongo.ReactiveMongoSessionRepository;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for the reactive support of {@link MongoSessionAutoConfiguration}.
+ * Tests for the reactive support of {@link SessionDataMongoAutoConfiguration}.
  *
  * @author Andy Wilkinson
  * @author Weix Sun
  */
 @Testcontainers(disabledWithoutDocker = true)
-class MongoReactiveSessionAutoConfigurationTests extends AbstractReactiveSessionAutoConfigurationTests {
+class SessionDataMongoReactiveAutoConfigurationTests extends AbstractSessionReactiveAutoConfigurationTests {
 
 	@Container
 	static final MongoDBContainer mongoDb = TestImage.container(MongoDBContainer.class);
@@ -56,8 +56,8 @@ class MongoReactiveSessionAutoConfigurationTests extends AbstractReactiveSession
 	@BeforeEach
 	void prepareContextRunner() {
 		this.contextRunner = new ReactiveWebApplicationContextRunner().withConfiguration(
-				AutoConfigurations.of(SessionAutoConfiguration.class, MongoSessionAutoConfiguration.class,
-						MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class));
+				AutoConfigurations.of(SessionAutoConfiguration.class, SessionDataMongoAutoConfiguration.class,
+						MongoReactiveAutoConfiguration.class, DataMongoReactiveAutoConfiguration.class));
 	}
 
 	@Test
diff --git a/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfiguration.java b/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoAutoConfiguration.java
similarity index 94%
rename from module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfiguration.java
rename to module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoAutoConfiguration.java
index f9b2b50a483..20f941f4598 100644
--- a/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/MongoSessionAutoConfiguration.java
+++ b/module/spring-boot-session-data-mongodb/src/main/java/org/springframework/boot/session/data/mongodb/autoconfigure/SessionDataMongoAutoConfiguration.java
@@ -25,8 +25,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.PropertyMapper;
-import org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration;
-import org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration;
+import org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration;
+import org.springframework.boot.data.mongodb.autoconfigure.DataMongoReactiveAutoConfiguration;
 import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
 import org.springframework.boot.session.autoconfigure.SessionProperties;
 import org.springframework.boot.web.server.autoconfigure.ServerProperties;
@@ -58,11 +58,11 @@ import org.springframework.session.data.mongo.config.annotation.web.reactive.Rea
 @AutoConfiguration(before = SessionAutoConfiguration.class,
 		beforeName = { "org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration",
 				"org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration" },
-		after = { MongoDataAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class },
+		after = { DataMongoAutoConfiguration.class, DataMongoReactiveAutoConfiguration.class },
 		afterName = "org.springframework.boot.webflux.autoconfigure.WebSessionIdResolverAutoConfiguration")
 @ConditionalOnClass(Session.class)
 @EnableConfigurationProperties(SessionDataMongoProperties.class)
-public final class MongoSessionAutoConfiguration {
+public final class SessionDataMongoAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ MongoOperations.class, MongoIndexedSessionRepository.class })
diff --git a/module/spring-boot-session-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-session-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 06b2e2944c4..2177fc14a29 100644
--- a/module/spring-boot-session-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-session-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-org.springframework.boot.session.data.mongodb.autoconfigure.MongoSessionAutoConfiguration
+org.springframework.boot.session.data.mongodb.autoconfigure.SessionDataMongoAutoConfiguration
diff --git a/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfigurationTests.java b/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfigurationTests.java
similarity index 94%
rename from module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfigurationTests.java
rename to module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfigurationTests.java
index b9180eea297..4d895344b49 100644
--- a/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfigurationTests.java
+++ b/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfigurationTests.java
@@ -27,7 +27,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.boot.session.autoconfigure.AbstractSessionAutoConfigurationTests;
 import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
@@ -51,21 +51,22 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
 /**
- * Tests for {@link RedisSessionAutoConfiguration}.
+ * Tests for {@link SessionDataRedisAutoConfiguration}.
  *
  * @author Stephane Nicoll
  * @author Vedran Pavic
  */
 @Testcontainers(disabledWithoutDocker = true)
-class RedisSessionAutoConfigurationTests extends AbstractSessionAutoConfigurationTests {
+class SessionDataRedisAutoConfigurationTests extends AbstractSessionAutoConfigurationTests {
 
 	@Container
 	public static RedisContainer redis = TestImage.container(RedisContainer.class);
 
 	@BeforeEach
 	void prepareContextRunner() {
-		this.contextRunner = new WebApplicationContextRunner().withConfiguration(AutoConfigurations
-			.of(SessionAutoConfiguration.class, RedisSessionAutoConfiguration.class, RedisAutoConfiguration.class));
+		this.contextRunner = new WebApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(SessionAutoConfiguration.class,
+					SessionDataRedisAutoConfiguration.class, DataRedisAutoConfiguration.class));
 	}
 
 	@Test
@@ -73,7 +74,7 @@ class RedisSessionAutoConfigurationTests extends AbstractSessionAutoConfiguratio
 		this.contextRunner
 			.withPropertyValues("spring.data.redis.host=" + redis.getHost(),
 					"spring.data.redis.port=" + redis.getFirstMappedPort())
-			.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
 			.run(validateSpringSessionUsesDefaultRedis("spring:session:", FlushMode.ON_SAVE,
 					SaveMode.ON_SET_ATTRIBUTE));
 	}
@@ -84,7 +85,7 @@ class RedisSessionAutoConfigurationTests extends AbstractSessionAutoConfiguratio
 			.withPropertyValues("spring.data.redis.host=" + redis.getHost(),
 					"spring.data.redis.port=" + redis.getFirstMappedPort(),
 					"spring.session.data.redis.cleanup-cron=0 0 * * * *")
-			.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
 			.run((context) -> {
 				assertThat(context).hasFailed();
 				assertThat(context.getStartupFailure())
@@ -118,7 +119,7 @@ class RedisSessionAutoConfigurationTests extends AbstractSessionAutoConfiguratio
 		this.contextRunner
 			.withPropertyValues("spring.session.data.redis.repository-type=indexed",
 					"spring.data.redis.host=" + redis.getHost(), "spring.data.redis.port=" + redis.getFirstMappedPort())
-			.withConfiguration(AutoConfigurations.of(RedisAutoConfiguration.class))
+			.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
 			.run(validateSpringSessionUsesIndexedRedis("spring:session:", FlushMode.ON_SAVE, SaveMode.ON_SET_ATTRIBUTE,
 					"0 * * * * *"));
 	}
diff --git a/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/ReactiveRedisSessionAutoConfigurationTests.java b/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisReactiveAutoConfigurationTests.java
similarity index 93%
rename from module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/ReactiveRedisSessionAutoConfigurationTests.java
rename to module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisReactiveAutoConfigurationTests.java
index 62ff5d96c40..b677300a168 100644
--- a/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/ReactiveRedisSessionAutoConfigurationTests.java
+++ b/module/spring-boot-session-data-redis/src/dockerTest/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisReactiveAutoConfigurationTests.java
@@ -28,9 +28,9 @@ import org.testcontainers.junit.jupiter.Testcontainers;
 import reactor.core.publisher.Mono;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisReactiveAutoConfiguration;
-import org.springframework.boot.session.autoconfigure.AbstractReactiveSessionAutoConfigurationTests;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisReactiveAutoConfiguration;
+import org.springframework.boot.session.autoconfigure.AbstractSessionReactiveAutoConfigurationTests;
 import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
 import org.springframework.boot.test.context.runner.ContextConsumer;
@@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
 /**
- * Tests for the reactive support of {@link RedisSessionAutoConfiguration}.
+ * Tests for the reactive support of {@link SessionDataRedisAutoConfiguration}.
  *
  * @author Stephane Nicoll
  * @author Andy Wilkinson
@@ -61,7 +61,7 @@ import static org.assertj.core.api.Assertions.entry;
  * @author Weix Sun
  */
 @Testcontainers(disabledWithoutDocker = true)
-class ReactiveRedisSessionAutoConfigurationTests extends AbstractReactiveSessionAutoConfigurationTests {
+class SessionDataRedisReactiveAutoConfigurationTests extends AbstractSessionReactiveAutoConfigurationTests {
 
 	@Container
 	public static RedisContainer redis = TestImage.container(RedisContainer.class);
@@ -70,8 +70,8 @@ class ReactiveRedisSessionAutoConfigurationTests extends AbstractReactiveSession
 	void prepareRunner() {
 		this.contextRunner = new ReactiveWebApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(SessionAutoConfiguration.class,
-					WebSessionIdResolverAutoConfiguration.class, RedisSessionAutoConfiguration.class,
-					RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class));
+					WebSessionIdResolverAutoConfiguration.class, SessionDataRedisAutoConfiguration.class,
+					DataRedisAutoConfiguration.class, DataRedisReactiveAutoConfiguration.class));
 	}
 
 	@Test
diff --git a/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java b/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfiguration.java
similarity index 97%
rename from module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java
rename to module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfiguration.java
index d7bdccf203c..49b81f2aa8a 100644
--- a/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/RedisSessionAutoConfiguration.java
+++ b/module/spring-boot-session-data-redis/src/main/java/org/springframework/boot/session/data/redis/autoconfigure/SessionDataRedisAutoConfiguration.java
@@ -27,8 +27,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplicat
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.boot.context.properties.source.InvalidConfigurationPropertyValueException;
-import org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration;
-import org.springframework.boot.data.redis.autoconfigure.RedisReactiveAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisReactiveAutoConfiguration;
 import org.springframework.boot.session.autoconfigure.SessionAutoConfiguration;
 import org.springframework.boot.session.autoconfigure.SessionProperties;
 import org.springframework.boot.web.server.autoconfigure.ServerProperties;
@@ -71,11 +71,11 @@ import org.springframework.session.data.redis.config.annotation.web.server.Redis
 @AutoConfiguration(before = SessionAutoConfiguration.class,
 		beforeName = { "org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration",
 				"org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration" },
-		after = { RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class },
+		after = { DataRedisAutoConfiguration.class, DataRedisReactiveAutoConfiguration.class },
 		afterName = "org.springframework.boot.webflux.autoconfigure.WebSessionIdResolverAutoConfiguration")
 @ConditionalOnClass(Session.class)
 @EnableConfigurationProperties({ SessionDataRedisProperties.class, ServerProperties.class, SessionProperties.class })
-public final class RedisSessionAutoConfiguration {
+public final class SessionDataRedisAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ RedisTemplate.class, RedisIndexedSessionRepository.class })
diff --git a/module/spring-boot-session-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-session-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index be2f677f57d..83d6723dde3 100644
--- a/module/spring-boot-session-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/module/spring-boot-session-data-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-org.springframework.boot.session.data.redis.autoconfigure.RedisSessionAutoConfiguration
+org.springframework.boot.session.data.redis.autoconfigure.SessionDataRedisAutoConfiguration
diff --git a/module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractSessionAutoConfigurationTests.java b/module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractSessionAutoConfigurationTests.java
index bb9ed83da5d..a21da4db215 100644
--- a/module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractSessionAutoConfigurationTests.java
+++ b/module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractSessionAutoConfigurationTests.java
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Stephane Nicoll
  * @author Weix Sun
- * @see AbstractReactiveSessionAutoConfigurationTests
+ * @see AbstractSessionReactiveAutoConfigurationTests
  */
 public abstract class AbstractSessionAutoConfigurationTests {
 
diff --git a/module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractReactiveSessionAutoConfigurationTests.java b/module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractSessionReactiveAutoConfigurationTests.java
similarity index 98%
rename from module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractReactiveSessionAutoConfigurationTests.java
rename to module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractSessionReactiveAutoConfigurationTests.java
index f1be4c8b359..c14fe756c38 100644
--- a/module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractReactiveSessionAutoConfigurationTests.java
+++ b/module/spring-boot-session/src/testFixtures/java/org/springframework/boot/session/autoconfigure/AbstractSessionReactiveAutoConfigurationTests.java
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Andy Wilkinson
  */
-public abstract class AbstractReactiveSessionAutoConfigurationTests {
+public abstract class AbstractSessionReactiveAutoConfigurationTests {
 
 	private static final MockReactiveWebServerFactory mockReactiveWebServerFactory = new MockReactiveWebServerFactory();
 
diff --git a/settings.gradle b/settings.gradle
index 0d5ac38c128..ead7544c6e8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -329,7 +329,7 @@ include ":smoke-test:spring-boot-smoke-test-data-elasticsearch"
 include ":smoke-test:spring-boot-smoke-test-data-jdbc"
 include ":smoke-test:spring-boot-smoke-test-data-jpa"
 include ":smoke-test:spring-boot-smoke-test-data-ldap"
-include ":smoke-test:spring-boot-smoke-test-data-mongo"
+include ":smoke-test:spring-boot-smoke-test-data-mongodb"
 include ":smoke-test:spring-boot-smoke-test-data-r2dbc"
 include ":smoke-test:spring-boot-smoke-test-data-r2dbc-flyway"
 include ":smoke-test:spring-boot-smoke-test-data-r2dbc-liquibase"
@@ -365,10 +365,10 @@ include ":smoke-test:spring-boot-smoke-test-secure-webflux"
 include ":smoke-test:spring-boot-smoke-test-servlet"
 include ":smoke-test:spring-boot-smoke-test-session-hazelcast"
 include ":smoke-test:spring-boot-smoke-test-session-jdbc"
-include ":smoke-test:spring-boot-smoke-test-session-mongo"
-include ":smoke-test:spring-boot-smoke-test-session-redis"
-include ":smoke-test:spring-boot-smoke-test-session-webflux-mongo"
-include ":smoke-test:spring-boot-smoke-test-session-webflux-redis"
+include ":smoke-test:spring-boot-smoke-test-session-data-mongodb"
+include ":smoke-test:spring-boot-smoke-test-session-data-mongodb-webflux"
+include ":smoke-test:spring-boot-smoke-test-session-data-redis"
+include ":smoke-test:spring-boot-smoke-test-session-data-redis-webflux"
 include ":smoke-test:spring-boot-smoke-test-simple"
 include ":smoke-test:spring-boot-smoke-test-structured-logging"
 include ":smoke-test:spring-boot-smoke-test-structured-logging-log4j2"
diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java b/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationReactiveSslTests.java
similarity index 96%
rename from smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java
rename to smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationReactiveSslTests.java
index df5ee746f45..fb6b3662a7a 100644
--- a/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationReactiveSslTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationReactiveSslTests.java
@@ -38,7 +38,7 @@ import org.springframework.data.cassandra.core.ReactiveCassandraTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for Cassandra with SSL.
+ * Smoke tests for Data Cassandra using reactive repositories with SSL.
  *
  * @author Eddú Meléndez
  */
@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @SpringBootTest(properties = { "spring.cassandra.schema-action=create-if-not-exists",
 		"spring.cassandra.connection.connect-timeout=60s", "spring.cassandra.connection.init-query-timeout=60s",
 		"spring.cassandra.request.timeout=60s" })
-class SampleCassandraApplicationReactiveSslTests {
+class SampleDataCassandraApplicationReactiveSslTests {
 
 	@Container
 	@ServiceConnection
diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationSslTests.java
similarity index 97%
rename from smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java
rename to smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationSslTests.java
index 3f1e87f0233..007fb4f0aeb 100644
--- a/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleCassandraApplicationSslTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-cassandra/src/dockerTest/java/smoketest/data/cassandra/SampleDataCassandraApplicationSslTests.java
@@ -37,7 +37,7 @@ import org.springframework.data.cassandra.core.CassandraTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for Cassandra with SSL.
+ * Smoke tests for Data Cassandra with SSL.
  *
  * @author Scott Frederick
  * @author Eddú Meléndez
@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @DataCassandraTest(properties = { "spring.cassandra.schema-action=create-if-not-exists",
 		"spring.cassandra.connection.connect-timeout=60s", "spring.cassandra.connection.init-query-timeout=60s",
 		"spring.cassandra.request.timeout=60s" })
-class SampleCassandraApplicationSslTests {
+class SampleDataCassandraApplicationSslTests {
 
 	@Container
 	@ServiceConnection
diff --git a/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleCassandraApplication.java b/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleDataCassandraApplication.java
similarity index 94%
rename from smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleCassandraApplication.java
rename to smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleDataCassandraApplication.java
index 563a17bc904..1079f82f09c 100644
--- a/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleCassandraApplication.java
+++ b/smoke-test/spring-boot-smoke-test-data-cassandra/src/main/java/smoketest/data/cassandra/SampleDataCassandraApplication.java
@@ -19,6 +19,6 @@ package smoketest.data.cassandra;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleCassandraApplication {
+public class SampleDataCassandraApplication {
 
 }
diff --git a/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationReactiveSslTests.java b/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationReactiveSslTests.java
similarity index 95%
rename from smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationReactiveSslTests.java
rename to smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationReactiveSslTests.java
index 2213f6d4344..84185517fa0 100644
--- a/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationReactiveSslTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationReactiveSslTests.java
@@ -35,13 +35,13 @@ import org.springframework.data.couchbase.core.ReactiveCouchbaseTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for Couchbase using reactive repositories with SSL.
+ * Smoke tests for Data Couchbase using reactive repositories with SSL.
  *
  * @author Scott Frederick
  */
 @Testcontainers(disabledWithoutDocker = true)
 @SpringBootTest(properties = { "spring.data.couchbase.bucket-name=cbbucket" })
-class SampleCouchbaseApplicationReactiveSslTests {
+class SampleDataCouchbaseApplicationReactiveSslTests {
 
 	private static final String BUCKET_NAME = "cbbucket";
 
diff --git a/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationSslTests.java
similarity index 98%
rename from smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationSslTests.java
rename to smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationSslTests.java
index d8c238a21bb..826e529db9c 100644
--- a/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleCouchbaseApplicationSslTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-couchbase/src/dockerTest/java/smoketest/data/couchbase/SampleDataCouchbaseApplicationSslTests.java
@@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @Testcontainers(disabledWithoutDocker = true)
 @DataCouchbaseTest(
 		properties = { "spring.couchbase.env.timeouts.connect=2m", "spring.data.couchbase.bucket-name=cbbucket" })
-class SampleCouchbaseApplicationSslTests {
+class SampleDataCouchbaseApplicationSslTests {
 
 	private static final String BUCKET_NAME = "cbbucket";
 
diff --git a/smoke-test/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleCouchbaseApplication.java b/smoke-test/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleDataCouchbaseApplication.java
similarity index 94%
rename from smoke-test/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleCouchbaseApplication.java
rename to smoke-test/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleDataCouchbaseApplication.java
index ee254d64da9..14eb4a8f0de 100644
--- a/smoke-test/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleCouchbaseApplication.java
+++ b/smoke-test/spring-boot-smoke-test-data-couchbase/src/main/java/smoketest/data/couchbase/SampleDataCouchbaseApplication.java
@@ -19,6 +19,6 @@ package smoketest.data.couchbase;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleCouchbaseApplication {
+public class SampleDataCouchbaseApplication {
 
 }
diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplicationTests.java
similarity index 96%
rename from smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplicationTests.java
index 2348aa16de0..feaf3fc4e30 100644
--- a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchApplicationTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplicationTests.java
@@ -32,13 +32,13 @@ import org.springframework.data.elasticsearch.client.elc.ElasticsearchTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for Elasticsearch.
+ * Smoke tests for Data Elasticsearch.
  *
  * @author Moritz Halbritter
  */
 @Testcontainers(disabledWithoutDocker = true)
 @DataElasticsearchTest
-class SampleElasticsearchApplicationTests {
+class SampleDataElasticsearchApplicationTests {
 
 	@Container
 	@ServiceConnection
diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchSslApplicationTests.java b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchSslApplicationTests.java
similarity index 96%
rename from smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchSslApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchSslApplicationTests.java
index bcee9c3fb46..aa6962a6c8f 100644
--- a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearchSslApplicationTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchSslApplicationTests.java
@@ -33,14 +33,14 @@ import org.springframework.data.elasticsearch.client.elc.ElasticsearchTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for Elasticsearch with SSL.
+ * Smoke tests for Data Elasticsearch with SSL.
  *
  * @author Moritz Halbritter
  */
 @Testcontainers(disabledWithoutDocker = true)
 @DataElasticsearchTest(
 		properties = { "spring.elasticsearch.connection-timeout=120s", "spring.elasticsearch.socket-timeout=120s" })
-class SampleElasticsearchSslApplicationTests {
+class SampleDataElasticsearchSslApplicationTests {
 
 	@Container
 	@ServiceConnection
diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch8ApplicationTests.java b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchWithElasticsearch8ApplicationTests.java
similarity index 95%
rename from smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch8ApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchWithElasticsearch8ApplicationTests.java
index 3d2e85b69bd..e39ef431ae9 100644
--- a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch8ApplicationTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchWithElasticsearch8ApplicationTests.java
@@ -34,14 +34,14 @@ import org.springframework.data.elasticsearch.client.elc.ElasticsearchTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for Elasticsearch 8.
+ * Smoke tests for Data Elasticsearch with Elasticsearch 8.
  *
  * @author Moritz Halbritter
  */
 @Testcontainers(disabledWithoutDocker = true)
 @DataElasticsearchTest
 @Disabled("Elasticsearch client v9 needs extra config with v8")
-class SampleElasticsearch8ApplicationTests {
+class SampleDataElasticsearchWithElasticsearch8ApplicationTests {
 
 	@Container
 	@ServiceConnection
diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch9ApplicationTests.java b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchWithElasticsearch9ApplicationTests.java
similarity index 95%
rename from smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch9ApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchWithElasticsearch9ApplicationTests.java
index 31050d83854..7e85034cf92 100644
--- a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleElasticsearch9ApplicationTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchWithElasticsearch9ApplicationTests.java
@@ -33,14 +33,14 @@ import org.springframework.data.elasticsearch.client.elc.ElasticsearchTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for Elasticsearch 9.
+ * Smoke tests for Data Elasticsearch with Elasticsearch 9.
  *
  * @author Moritz Halbritter
  * @author Stephane Nicoll
  */
 @Testcontainers(disabledWithoutDocker = true)
 @DataElasticsearchTest
-class SampleElasticsearch9ApplicationTests {
+class SampleDataElasticsearchWithElasticsearch9ApplicationTests {
 
 	@Container
 	@ServiceConnection
diff --git a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleElasticsearchApplication.java b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplication.java
similarity index 94%
rename from smoke-test/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleElasticsearchApplication.java
rename to smoke-test/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplication.java
index 1944d6f1f03..af7286840f2 100644
--- a/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleElasticsearchApplication.java
+++ b/smoke-test/spring-boot-smoke-test-data-elasticsearch/src/main/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplication.java
@@ -28,10 +28,10 @@ import org.springframework.context.ConfigurableApplicationContext;
  * @author Moritz Halbritter
  */
 @SpringBootApplication
-public class SampleElasticsearchApplication {
+public class SampleDataElasticsearchApplication {
 
 	public static void main(String[] args) {
-		ConfigurableApplicationContext context = SpringApplication.run(SampleElasticsearchApplication.class, args);
+		ConfigurableApplicationContext context = SpringApplication.run(SampleDataElasticsearchApplication.class, args);
 		SampleRepository repository = context.getBean(SampleRepository.class);
 		createDocument(repository);
 		listDocuments(repository);
diff --git a/smoke-test/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleLdapApplication.java b/smoke-test/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleDataLdapApplication.java
similarity index 88%
rename from smoke-test/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleLdapApplication.java
rename to smoke-test/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleDataLdapApplication.java
index cffb2447815..db24e022c49 100644
--- a/smoke-test/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleLdapApplication.java
+++ b/smoke-test/spring-boot-smoke-test-data-ldap/src/main/java/smoketest/data/ldap/SampleDataLdapApplication.java
@@ -21,11 +21,11 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleLdapApplication implements CommandLineRunner {
+public class SampleDataLdapApplication implements CommandLineRunner {
 
 	private final PersonRepository repository;
 
-	public SampleLdapApplication(PersonRepository repository) {
+	public SampleDataLdapApplication(PersonRepository repository) {
 		this.repository = repository;
 	}
 
@@ -47,7 +47,7 @@ public class SampleLdapApplication implements CommandLineRunner {
 	}
 
 	public static void main(String[] args) {
-		SpringApplication.run(SampleLdapApplication.class, args).close();
+		SpringApplication.run(SampleDataLdapApplication.class, args).close();
 	}
 
 }
diff --git a/smoke-test/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleLdapApplicationTests.java b/smoke-test/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleDataLdapApplicationTests.java
similarity index 93%
rename from smoke-test/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleLdapApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleDataLdapApplicationTests.java
index 62504461ff1..d5db3826b07 100644
--- a/smoke-test/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleLdapApplicationTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-ldap/src/test/java/smoketest/data/ldap/SampleDataLdapApplicationTests.java
@@ -26,13 +26,13 @@ import org.springframework.boot.test.system.OutputCaptureExtension;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SampleLdapApplication}.
+ * Tests for {@link SampleDataLdapApplication}.
  *
  * @author Phillip Webb
  */
 @ExtendWith(OutputCaptureExtension.class)
 @SpringBootTest
-class SampleLdapApplicationTests {
+class SampleDataLdapApplicationTests {
 
 	@Test
 	void testDefaultSettings(CapturedOutput output) {
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/build.gradle b/smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-data-mongo/build.gradle
rename to smoke-test/spring-boot-smoke-test-data-mongodb/build.gradle
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java
similarity index 93%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java
index 6a38e385d4c..4c532ae873c 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationReactiveSslTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleDataMongoApplicationReactiveSslTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import java.time.Duration;
 
@@ -34,13 +34,13 @@ import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for MongoDB using reactive repositories with SSL.
+ * Smoke tests for Data MongoDB using reactive repositories with SSL.
  *
  * @author Scott Frederick
  */
 @Testcontainers(disabledWithoutDocker = true)
 @SpringBootTest
-class SampleMongoApplicationReactiveSslTests {
+class SampleDataMongoApplicationReactiveSslTests {
 
 	@Container
 	@ServiceConnection
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java
similarity index 96%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationSslTests.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java
index 802d9758cde..1fa82b5b1db 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SampleMongoApplicationSslTests.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SampleMongoApplicationSslTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.MongoDBContainer;
@@ -32,7 +32,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Smoke tests for MongoDB with SSL.
+ * Smoke tests for Data MongoDB with SSL.
  *
  * @author Scott Frederick
  * @author Eddú Meléndez
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SecureMongoContainer.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SecureMongoContainer.java
similarity index 98%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SecureMongoContainer.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SecureMongoContainer.java
index d34c1456886..1027000830c 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/dockerTest/java/smoketest/data/mongo/SecureMongoContainer.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/dockerTest/java/smoketest/data/mongodb/SecureMongoContainer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.testcontainers.containers.MongoDBContainer;
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleMongoApplication.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleDataMongoApplication.java
similarity index 90%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleMongoApplication.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleDataMongoApplication.java
index 709ebb38276..9f7b11a1c5c 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleMongoApplication.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleDataMongoApplication.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SampleMongoApplication {
+public class SampleDataMongoApplication {
 
 }
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleDocument.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleDocument.java
similarity index 97%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleDocument.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleDocument.java
index 48e801b23cf..7029abe90e0 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleDocument.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleDocument.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import org.jspecify.annotations.Nullable;
 
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleReactiveRepository.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleReactiveRepository.java
similarity index 96%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleReactiveRepository.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleReactiveRepository.java
index 46f07cbf392..c456eddf7e6 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleReactiveRepository.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleReactiveRepository.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleRepository.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleRepository.java
similarity index 96%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleRepository.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleRepository.java
index f7b5b146fcf..d8d707d6165 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleRepository.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleRepository.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleService.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleService.java
similarity index 97%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleService.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleService.java
index 9e1a48c9179..1b76b2ee5a5 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/SampleService.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/SampleService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/package-info.java b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/package-info.java
similarity index 95%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/package-info.java
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/package-info.java
index e2d31685803..f9d7d5b436f 100644
--- a/smoke-test/spring-boot-smoke-test-data-mongo/src/main/java/smoketest/data/mongo/package-info.java
+++ b/smoke-test/spring-boot-smoke-test-data-mongodb/src/main/java/smoketest/data/mongodb/package-info.java
@@ -15,6 +15,6 @@
  */
 
 @NullMarked
-package smoketest.data.mongo;
+package smoketest.data.mongodb;
 
 import org.jspecify.annotations.NullMarked;
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-ca.crt b/smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-ca.crt
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-ca.crt
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-ca.crt
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-ca.key b/smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-ca.key
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-ca.key
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-ca.key
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-client.crt b/smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-client.crt
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-client.crt
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-client.crt
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-client.key b/smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-client.key
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-client.key
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-client.key
diff --git a/smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-server.pem b/smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-server.pem
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-data-mongo/src/test/resources/ssl/test-server.pem
rename to smoke-test/spring-boot-smoke-test-data-mongodb/src/test/resources/ssl/test-server.pem
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-mongo/build.gradle b/smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/build.gradle
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-mongo/build.gradle
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/build.gradle
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/dockerTest/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/dockerTest/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/dockerTest/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/dockerTest/java/smoketest/session/SampleSessionWebFluxMongoApplicationTests.java
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/main/java/smoketest/session/HelloRestController.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/main/java/smoketest/session/HelloRestController.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/main/java/smoketest/session/HelloRestController.java
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/main/java/smoketest/session/HelloRestController.java
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/main/java/smoketest/session/SampleSessionWebFluxMongoApplication.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/main/java/smoketest/session/SampleSessionWebFluxMongoApplication.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/main/java/smoketest/session/SampleSessionWebFluxMongoApplication.java
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/main/java/smoketest/session/SampleSessionWebFluxMongoApplication.java
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/main/java/smoketest/session/package-info.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/main/java/smoketest/session/package-info.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/main/java/smoketest/session/package-info.java
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/main/java/smoketest/session/package-info.java
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/main/resources/application.properties b/smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/main/resources/application.properties
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-mongo/src/main/resources/application.properties
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb-webflux/src/main/resources/application.properties
diff --git a/smoke-test/spring-boot-smoke-test-session-mongo/build.gradle b/smoke-test/spring-boot-smoke-test-session-data-mongodb/build.gradle
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-mongo/build.gradle
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb/build.gradle
diff --git a/smoke-test/spring-boot-smoke-test-session-mongo/src/dockerTest/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/dockerTest/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-mongo/src/dockerTest/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb/src/dockerTest/java/smoketest/session/mongodb/SampleSessionMongoApplicationTests.java
diff --git a/smoke-test/spring-boot-smoke-test-session-mongo/src/main/java/smoketest/session/mongodb/SampleSessionMongoApplication.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/SampleSessionMongoApplication.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-mongo/src/main/java/smoketest/session/mongodb/SampleSessionMongoApplication.java
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/SampleSessionMongoApplication.java
diff --git a/smoke-test/spring-boot-smoke-test-session-mongo/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-mongo/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/SecurityConfiguration.java
diff --git a/smoke-test/spring-boot-smoke-test-session-mongo/src/main/java/smoketest/session/mongodb/package-info.java b/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/package-info.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-mongo/src/main/java/smoketest/session/mongodb/package-info.java
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/java/smoketest/session/mongodb/package-info.java
diff --git a/smoke-test/spring-boot-smoke-test-session-mongo/src/main/resources/application.properties b/smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/resources/application.properties
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-mongo/src/main/resources/application.properties
rename to smoke-test/spring-boot-smoke-test-session-data-mongodb/src/main/resources/application.properties
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-redis/build.gradle b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/build.gradle
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-redis/build.gradle
rename to smoke-test/spring-boot-smoke-test-session-data-redis-webflux/build.gradle
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-redis/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-redis/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/dockerTest/java/smoketest/session/SampleSessionWebFluxRedisApplicationTests.java
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-redis/src/main/java/smoketest/session/HelloRestController.java b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/main/java/smoketest/session/HelloRestController.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-redis/src/main/java/smoketest/session/HelloRestController.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/main/java/smoketest/session/HelloRestController.java
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-redis/src/main/java/smoketest/session/SampleSessionWebFluxRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/main/java/smoketest/session/SampleSessionWebFluxRedisApplication.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-redis/src/main/java/smoketest/session/SampleSessionWebFluxRedisApplication.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/main/java/smoketest/session/SampleSessionWebFluxRedisApplication.java
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-redis/src/main/java/smoketest/session/package-info.java b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/main/java/smoketest/session/package-info.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-redis/src/main/java/smoketest/session/package-info.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/main/java/smoketest/session/package-info.java
diff --git a/smoke-test/spring-boot-smoke-test-session-webflux-redis/src/main/resources/application.properties b/smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/main/resources/application.properties
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-webflux-redis/src/main/resources/application.properties
rename to smoke-test/spring-boot-smoke-test-session-data-redis-webflux/src/main/resources/application.properties
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/build.gradle b/smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/build.gradle
rename to smoke-test/spring-boot-smoke-test-session-data-redis/build.gradle
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/SampleSessionRedisApplicationTests.java
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesImportSampleSessionRedisApplication.java
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestPropertiesSampleSessionRedisApplication.java
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionImportSampleSessionRedisApplication.java
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/dockerTest/java/smoketest/session/redis/TestServiceConnectionSampleSessionRedisApplication.java
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/main/java/smoketest/session/redis/SampleSessionRedisApplication.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/SampleSessionRedisApplication.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/main/java/smoketest/session/redis/SampleSessionRedisApplication.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/SampleSessionRedisApplication.java
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/main/java/smoketest/session/redis/SecurityConfiguration.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/SecurityConfiguration.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/main/java/smoketest/session/redis/SecurityConfiguration.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/SecurityConfiguration.java
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/main/java/smoketest/session/redis/package-info.java b/smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/package-info.java
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/main/java/smoketest/session/redis/package-info.java
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/main/java/smoketest/session/redis/package-info.java
diff --git a/smoke-test/spring-boot-smoke-test-session-redis/src/main/resources/application.properties b/smoke-test/spring-boot-smoke-test-session-data-redis/src/main/resources/application.properties
similarity index 100%
rename from smoke-test/spring-boot-smoke-test-session-redis/src/main/resources/application.properties
rename to smoke-test/spring-boot-smoke-test-session-data-redis/src/main/resources/application.properties