Refactor chat memory repository autoconfigurations and Spring Boot starters for clarity

- Rename chat memory repository autoconfiguration modules to include the "repository" suffix:
    - spring-ai-autoconfigure-model-chat-memory-cassandra -> spring-ai-autoconfigure-model-chat-memory-repository-cassandra
    - spring-ai-autoconfigure-model-chat-memory-jdbc -> spring-ai-autoconfigure-model-chat-memory-repository-jdbc
    - spring-ai-autoconfigure-model-chat-memory-neo4j -> spring-ai-autoconfigure-model-chat-memory-repository-neo4j
- Update Spring Boot starter modules to match the new naming convention.
- Rename packages to include `.repository.` for improved clarity and consistency.
- Rename configuration and related classes to use the `ChatMemoryRepository` suffix.
- Update Spring AI BOM and parent POM files to reference the new artifact names.
- Update all imports, references, and configuration to use the new package and class names.

BREAKING CHANGE:
These changes require users to update their dependencies, imports, and configuration to use the new artifact, package, and class names. See the upgrade notes for migration instructions.

Signed-off-by: Ilayaperumal Gopinathan <[email protected]>

Author: ilayaperumalg

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/pom.xml renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/pom.xml

@@ -7,12 +7,12 @@
 		<groupId>org.springframework.ai</groupId>
 		<artifactId>spring-ai-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../../../../pom.xml</relativePath>
+		<relativePath>../../../../../../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-ai-autoconfigure-model-chat-memory-cassandra</artifactId>
+	<artifactId>spring-ai-autoconfigure-model-chat-memory-repository-cassandra</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI Apache Cassandra Chat Memory Auto Configuration</name>
-	<description>Spring AI Apache Cassandra Chat Memory Auto Configuration</description>
+	<name>Spring AI Apache Cassandra Chat Memory Repository Auto Configuration</name>
+	<description>Spring AI Apache Cassandra Chat Memory Repository Auto Configuration</description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
 	<scm>

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryAutoConfiguration.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/main/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryAutoConfiguration.java

@@ -29,20 +29,21 @@
 import org.springframework.context.annotation.Bean;
 
 /**
- * {@link AutoConfiguration Auto-configuration} for {@link CassandraChatMemory}.
+ * {@link AutoConfiguration Auto-configuration} for {@link CassandraChatMemoryRepository}.
  *
  * @author Mick Semb Wever
  * @author Jihoon Kim
  * @since 1.0.0
  */
 @AutoConfiguration(after = CassandraAutoConfiguration.class, before = ChatMemoryAutoConfiguration.class)
 @ConditionalOnClass({ CassandraChatMemoryRepository.class, CqlSession.class })
-@EnableConfigurationProperties(CassandraChatMemoryProperties.class)
-public class CassandraChatMemoryAutoConfiguration {
+@EnableConfigurationProperties(CassandraChatMemoryRepositoryProperties.class)
+public class CassandraChatMemoryRepositoryAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public CassandraChatMemoryRepository chatMemory(CassandraChatMemoryProperties properties, CqlSession cqlSession) {
+	public CassandraChatMemoryRepository cassandraChatMemoryRepository(
+			CassandraChatMemoryRepositoryProperties properties, CqlSession cqlSession) {
 
 		var builder = CassandraChatMemoryConfig.builder().withCqlSession(cqlSession);
 

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryProperties.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/main/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryProperties.java

@@ -32,12 +32,12 @@
  * @author Jihoon Kim
  * @since 1.0.0
  */
-@ConfigurationProperties(CassandraChatMemoryProperties.CONFIG_PREFIX)
-public class CassandraChatMemoryProperties {
+@ConfigurationProperties(CassandraChatMemoryRepositoryProperties.CONFIG_PREFIX)
+public class CassandraChatMemoryRepositoryProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.chat.memory.repository.cassandra";
 
-	private static final Logger logger = LoggerFactory.getLogger(CassandraChatMemoryProperties.class);
+	private static final Logger logger = LoggerFactory.getLogger(CassandraChatMemoryRepositoryProperties.class);
 
 	private String keyspace = CassandraChatMemoryConfig.DEFAULT_KEYSPACE_NAME;
 

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-org.springframework.ai.model.chat.memory.repository.cassandra.autoconfigure.CassandraChatMemoryAutoConfiguration
+org.springframework.ai.model.chat.memory.repository.cassandra.autoconfigure.CassandraChatMemoryRepositoryAutoConfiguration

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/test/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryAutoConfigurationIT.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/test/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryAutoConfigurationIT.java

@@ -42,16 +42,16 @@
  * @since 1.0.0
  */
 @Testcontainers
-class CassandraChatMemoryAutoConfigurationIT {
+class CassandraChatMemoryRepositoryAutoConfigurationIT {
 
 	static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("cassandra");
 
 	@Container
 	static CassandraContainer cassandraContainer = new CassandraContainer(DEFAULT_IMAGE_NAME.withTag("5.0"));
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(
-				AutoConfigurations.of(CassandraChatMemoryAutoConfiguration.class, CassandraAutoConfiguration.class))
+		.withConfiguration(AutoConfigurations.of(CassandraChatMemoryRepositoryAutoConfiguration.class,
+				CassandraAutoConfiguration.class))
 		.withPropertyValues("spring.ai.chat.memory.cassandra.keyspace=test_autoconfigure");
 
 	@Test
@@ -85,7 +85,8 @@ void addAndGet() {
 				assertThat(memory.findByConversationId(sessionId).get(0).getMessageType()).isEqualTo(MessageType.USER);
 				assertThat(memory.findByConversationId(sessionId).get(0).getText()).isEqualTo("test question");
 
-				CassandraChatMemoryProperties properties = context.getBean(CassandraChatMemoryProperties.class);
+				CassandraChatMemoryRepositoryProperties properties = context
+					.getBean(CassandraChatMemoryRepositoryProperties.class);
 				assertThat(properties.getTimeToLive()).isEqualTo(getTimeToLive());
 			});
 	}
@@ -97,7 +98,8 @@ void compareTimeToLive_ISO8601Format() {
 			.withPropertyValues("spring.cassandra.localDatacenter=" + cassandraContainer.getLocalDatacenter())
 			.withPropertyValues("spring.ai.chat.memory.repository.cassandra.time-to-live=" + getTimeToLiveString())
 			.run(context -> {
-				CassandraChatMemoryProperties properties = context.getBean(CassandraChatMemoryProperties.class);
+				CassandraChatMemoryRepositoryProperties properties = context
+					.getBean(CassandraChatMemoryRepositoryProperties.class);
 				assertThat(properties.getTimeToLive()).isEqualTo(Duration.parse(getTimeToLiveString()));
 			});
 	}

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra/src/test/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryPropertiesTest.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/test/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryPropertiesTest.java

@@ -29,11 +29,11 @@
  * @author Jihoon Kim
  * @since 1.0.0
  */
-class CassandraChatMemoryPropertiesTest {
+class CassandraChatMemoryRepositoryPropertiesTest {
 
 	@Test
 	void defaultValues() {
-		var props = new CassandraChatMemoryProperties();
+		var props = new CassandraChatMemoryRepositoryProperties();
 		assertThat(props.getKeyspace()).isEqualTo(CassandraChatMemoryConfig.DEFAULT_KEYSPACE_NAME);
 		assertThat(props.getTable()).isEqualTo(CassandraChatMemoryConfig.DEFAULT_TABLE_NAME);
 		assertThat(props.getAssistantColumn()).isEqualTo(CassandraChatMemoryConfig.DEFAULT_ASSISTANT_COLUMN_NAME);
@@ -44,7 +44,7 @@ void defaultValues() {
 
 	@Test
 	void customValues() {
-		var props = new CassandraChatMemoryProperties();
+		var props = new CassandraChatMemoryRepositoryProperties();
 		props.setKeyspace("my_keyspace");
 		props.setTable("my_table");
 		props.setAssistantColumn("my_assistant_column");

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/pom.xml renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/pom.xml

@@ -7,12 +7,12 @@
 		<groupId>org.springframework.ai</groupId>
 		<artifactId>spring-ai-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../../../../pom.xml</relativePath>
+		<relativePath>../../../../../../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-ai-autoconfigure-model-chat-memory-jdbc</artifactId>
+	<artifactId>spring-ai-autoconfigure-model-chat-memory-repository-jdbc</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI JDBC Chat Memory Auto Configuration</name>
-	<description>Spring JDBC AI Chat Memory Auto Configuration</description>
+	<name>Spring AI JDBC Chat Memory Repository Auto Configuration</name>
+	<description>Spring JDBC AI Chat Memory Repository Auto Configuration</description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
 	<scm>

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryAutoConfiguration.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryAutoConfiguration.java

@@ -42,11 +42,9 @@
 @EnableConfigurationProperties(JdbcChatMemoryRepositoryProperties.class)
 public class JdbcChatMemoryRepositoryAutoConfiguration {
 
-	private static final Logger logger = LoggerFactory.getLogger(JdbcChatMemoryRepositoryAutoConfiguration.class);
-
 	@Bean
 	@ConditionalOnMissingBean
-	JdbcChatMemoryRepository chatMemoryRepository(JdbcTemplate jdbcTemplate, DataSource dataSource) {
+	JdbcChatMemoryRepository jdbcChatMemoryRepository(JdbcTemplate jdbcTemplate, DataSource dataSource) {
 		JdbcChatMemoryDialect dialect = JdbcChatMemoryDialect.from(dataSource);
 		return JdbcChatMemoryRepository.builder().jdbcTemplate(jdbcTemplate).dialect(dialect).build();
 	}

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryProperties.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryProperties.java

@@ -7,12 +7,12 @@
 		<groupId>org.springframework.ai</groupId>
 		<artifactId>spring-ai-parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../../../../pom.xml</relativePath>
+		<relativePath>../../../../../../pom.xml</relativePath>
 	</parent>
-	<artifactId>spring-ai-autoconfigure-model-chat-memory-neo4j</artifactId>
+	<artifactId>spring-ai-autoconfigure-model-chat-memory-repository-neo4j</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring AI Neo4j Chat Memory Auto Configuration</name>
-	<description>Spring Neo4j AI Chat Memory Auto Configuration</description>
+	<name>Spring AI Neo4j Chat Memory Repository Auto Configuration</name>
+	<description>Spring Neo4j AI Chat Memory Repository Auto Configuration</description>
 	<url>https://github.com/spring-projects/spring-ai</url>
 
 	<scm>

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositorySchemaInitializer.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositorySchemaInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.neo4j.autoconfigure;
+package org.springframework.ai.model.chat.memory.repository.neo4j.autoconfigure;
 
 import org.neo4j.driver.Driver;
 
@@ -36,12 +36,13 @@
  */
 @AutoConfiguration(after = Neo4jAutoConfiguration.class, before = ChatMemoryAutoConfiguration.class)
 @ConditionalOnClass({ Neo4jChatMemoryRepository.class, Driver.class })
-@EnableConfigurationProperties(Neo4jChatMemoryProperties.class)
-public class Neo4jChatMemoryAutoConfiguration {
+@EnableConfigurationProperties(Neo4jChatMemoryRepositoryProperties.class)
+public class Neo4jChatMemoryRepositoryAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public Neo4jChatMemoryRepository chatMemoryRepository(Neo4jChatMemoryProperties properties, Driver driver) {
+	public Neo4jChatMemoryRepository neo4jChatMemoryRepository(Neo4jChatMemoryRepositoryProperties properties,
+			Driver driver) {
 
 		var builder = Neo4jChatMemoryConfig.builder()
 			.withMediaLabel(properties.getMediaLabel())

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.neo4j.autoconfigure;
+package org.springframework.ai.model.chat.memory.repository.neo4j.autoconfigure;
 
 import org.springframework.ai.chat.memory.neo4j.Neo4jChatMemoryConfig;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -24,8 +24,8 @@
  *
  * @author Enrico Rampazzo
  */
-@ConfigurationProperties(Neo4jChatMemoryProperties.CONFIG_PREFIX)
-public class Neo4jChatMemoryProperties {
+@ConfigurationProperties(Neo4jChatMemoryRepositoryProperties.CONFIG_PREFIX)
+public class Neo4jChatMemoryRepositoryProperties {
 
 	public static final String CONFIG_PREFIX = "spring.ai.chat.memory.neo4j";
 

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryHsqldbAutoConfigurationIT.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryHsqldbAutoConfigurationIT.java

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-org.springframework.ai.model.chat.memory.neo4j.autoconfigure.Neo4jChatMemoryAutoConfiguration
+org.springframework.ai.model.chat.memory.repository.neo4j.autoconfigure.Neo4jChatMemoryRepositoryAutoConfiguration

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryPostgresqlAutoConfigurationIT.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryPostgresqlAutoConfigurationIT.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.neo4j.autoconfigure;
+package org.springframework.ai.model.chat.memory.repository.neo4j.autoconfigure;
 
 import org.junit.jupiter.api.Test;
 
@@ -26,11 +26,11 @@
  * @author Enrico Rampazzo
  * @since 1.0.0
  */
-class Neo4jChatMemoryPropertiesTest {
+class Neo4JChatMemoryRepositoryPropertiesTest {
 
 	@Test
 	void defaultValues() {
-		var props = new Neo4jChatMemoryProperties();
+		var props = new Neo4jChatMemoryRepositoryProperties();
 		assertThat(props.getMediaLabel()).isEqualTo(Neo4jChatMemoryConfig.DEFAULT_MEDIA_LABEL);
 		assertThat(props.getMessageLabel()).isEqualTo(Neo4jChatMemoryConfig.DEFAULT_MESSAGE_LABEL);
 		assertThat(props.getMetadataLabel()).isEqualTo(Neo4jChatMemoryConfig.DEFAULT_METADATA_LABEL);

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryPropertiesTests.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryPropertiesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ai.model.chat.memory.neo4j.autoconfigure;
+package org.springframework.ai.model.chat.memory.repository.neo4j.autoconfigure;
 
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -23,7 +23,7 @@
 import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.ai.chat.memory.ChatMemory;
+
 import org.springframework.ai.chat.memory.ChatMemoryRepository;
 import org.springframework.ai.chat.memory.neo4j.Neo4jChatMemoryRepository;
 import org.testcontainers.containers.Neo4jContainer;
@@ -63,8 +63,8 @@ class Neo4jChatMemoryRepositoryAutoConfigurationIT {
 		.withoutAuthentication()
 		.withExposedPorts(7474, 7687);
 
-	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-		.withConfiguration(AutoConfigurations.of(Neo4jChatMemoryAutoConfiguration.class, Neo4jAutoConfiguration.class));
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner().withConfiguration(
+			AutoConfigurations.of(Neo4jChatMemoryRepositoryAutoConfiguration.class, Neo4jAutoConfiguration.class));
 
 	@Test
 	void addAndGet() {

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositorySchemaInitializerPostgresqlTests.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositorySchemaInitializerPostgresqlTests.java

@@ -87,9 +87,9 @@
 		<module>auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client</module>
 
 		<module>auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory</module>
-		<module>auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-cassandra</module>
-		<module>auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc</module>
-		<module>auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j</module>
+		<module>auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra</module>
+		<module>auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc</module>
+		<module>auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-neo4j</module>
 
 		<module>auto-configurations/models/chat/observation/spring-ai-autoconfigure-model-chat-observation</module>
 
@@ -180,9 +180,6 @@
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-azure-openai</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-bedrock</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-bedrock-converse</module>
-		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-chat-memory-cassandra</module>
-		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-chat-memory-jdbc</module>
-		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-chat-memory-neo4j</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-huggingface</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-minimax</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-mistral-ai</module>
@@ -197,6 +194,10 @@
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-zhipuai</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-deepseek</module>
 
+		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-chat-memory-repository-cassandra</module>
+		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-chat-memory-repository-jdbc</module>
+		<module>spring-ai-spring-boot-starters/spring-ai-starter-model-chat-memory-repository-neo4j</module>
+
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-mcp-client</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-mcp-server</module>
 		<module>spring-ai-spring-boot-starters/spring-ai-starter-mcp-client-webflux</module>

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemorySqlServerAutoConfigurationIT.java renamed to auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemorySqlServerAutoConfigurationIT.java

@@ -481,21 +481,23 @@
 				<version>${project.version}</version>
 			</dependency>
 
+			<!-- Spring AI Chat memory Repository auto-configurations -->
+
 			<dependency>
 				<groupId>org.springframework.ai</groupId>
-				<artifactId>spring-ai-autoconfigure-model-chat-memory-cassandra</artifactId>
+				<artifactId>spring-ai-autoconfigure-model-chat-memory-repository-cassandra</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.ai</groupId>
-				<artifactId>spring-ai-autoconfigure-model-chat-memory-jdbc</artifactId>
+				<artifactId>spring-ai-autoconfigure-model-chat-memory-repository-jdbc</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.ai</groupId>
-				<artifactId>spring-ai-autoconfigure-model-chat-memory-neo4j</artifactId>
+				<artifactId>spring-ai-autoconfigure-model-chat-memory-repository-neo4j</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
@@ -1017,23 +1019,23 @@
 				<version>${project.version}</version>
 			</dependency>
 
-			<!-- Spring AI Spring Boot starters for Chat Memory -->
+			<!-- Spring AI Spring Boot starters for Chat Memory Repository -->
 
 			<dependency>
 				<groupId>org.springframework.ai</groupId>
-				<artifactId>spring-ai-starter-model-chat-memory-cassandra</artifactId>
+				<artifactId>spring-ai-starter-model-chat-memory-repository-cassandra</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.ai</groupId>
-				<artifactId>spring-ai-starter-model-chat-memory-jdbc</artifactId>
+				<artifactId>spring-ai-starter-model-chat-memory-repository-jdbc</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springframework.ai</groupId>
-				<artifactId>spring-ai-starter-model-chat-memory-neo4j</artifactId>
+				<artifactId>spring-ai-starter-model-chat-memory-repository-neo4j</artifactId>
 				<version>${project.version}</version>
 			</dependency>