diff --git a/spring-ai-docs/src/main/asciidoc/mcp.md b/spring-ai-docs/src/main/asciidoc/mcp.md
index 3644d3fde..0a91c518f 100644
--- a/spring-ai-docs/src/main/asciidoc/mcp.md
+++ b/spring-ai-docs/src/main/asciidoc/mcp.md
@@ -9,7 +9,7 @@ To use the MCP server functionality, add the following dependency to your projec
 ```xml
 <dependency>
     <groupId>org.springframework.ai</groupId>
-    <artifactId>spring-ai-mcp-spring-boot-starter</artifactId>
+    <artifactId>spring-ai-starter-mcp-server</artifactId>
     <version>${spring-ai.version}</version>
 </dependency>
 ```
diff --git a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-client-webflux/pom.xml b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-client-webflux/pom.xml
index 531a90b25..b3ba8435e 100644
--- a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-client-webflux/pom.xml
+++ b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-client-webflux/pom.xml
@@ -25,7 +25,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>spring-ai-mcp-client-webflux-spring-boot-starter</artifactId>
+    <artifactId>spring-ai-starter-mcp-client-webflux</artifactId>
     <packaging>jar</packaging>
     <name>Spring AI Starter - MCP Client Webflux</name>
     <description>Spring AI MCP Client WebFlux Spring Boot Starter</description>
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-client-spring-boot-autoconfigure</artifactId>
+            <artifactId>spring-ai-autoconfigure-mcp-client</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 
diff --git a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-client/pom.xml b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-client/pom.xml
index acef84588..226a61b7a 100644
--- a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-client/pom.xml
+++ b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-client/pom.xml
@@ -23,7 +23,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+    <artifactId>spring-ai-starter-mcp-client</artifactId>
     <packaging>jar</packaging>
     <name>Spring AI Starter - MCP Client</name>
     <description>Spring AI MCP Client Spring Boot Starter</description>
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-client-spring-boot-autoconfigure</artifactId>
+            <artifactId>spring-ai-autoconfigure-mcp-client</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 
diff --git a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server-webflux/pom.xml b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server-webflux/pom.xml
index ddb133f8f..12275ee03 100644
--- a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server-webflux/pom.xml
+++ b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server-webflux/pom.xml
@@ -25,7 +25,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>spring-ai-mcp-server-webflux-spring-boot-starter</artifactId>
+    <artifactId>spring-ai-starter-mcp-server-webflux</artifactId>
     <packaging>jar</packaging>
     <name>Spring AI Starter - MCP Server Webflux</name>
     <description>Spring AI MCP Server WebFlux Spring Boot Starter</description>
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-server-spring-boot-autoconfigure</artifactId>
+            <artifactId>spring-ai-autoconfigure-mcp-server</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 
diff --git a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server-webmvc/pom.xml b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server-webmvc/pom.xml
index 824b37007..a6896e55c 100644
--- a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server-webmvc/pom.xml
+++ b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server-webmvc/pom.xml
@@ -25,7 +25,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>spring-ai-mcp-server-webmvc-spring-boot-starter</artifactId>
+    <artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
     <packaging>jar</packaging>
     <name>Spring AI Starter - MCP Server WebMvc</name>
     <description>Spring AI MCP Server WebMvc Spring Boot Starter</description>
@@ -46,7 +46,7 @@
 
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-server-spring-boot-autoconfigure</artifactId>
+            <artifactId>spring-ai-autoconfigure-mcp-server</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 
diff --git a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server/pom.xml b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server/pom.xml
index 1d7dc35bb..87bc820ab 100644
--- a/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server/pom.xml
+++ b/spring-ai-spring-boot-starters/spring-ai-starter-mcp-server/pom.xml
@@ -23,7 +23,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>spring-ai-mcp-server-spring-boot-starter</artifactId>
+    <artifactId>spring-ai-starter-mcp-server</artifactId>
     <packaging>jar</packaging>
     <name>Spring AI Starter - MCP Server</name>
     <description>Spring AI MCP Server Spring Boot Starter</description>
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-server-spring-boot-autoconfigure</artifactId>
+            <artifactId>spring-ai-autoconfigure-mcp-server</artifactId>
             <version>${project.parent.version}</version>
         </dependency>