diff --git a/model-context-protocol/brave/.DS_Store b/model-context-protocol/brave/.DS_Store
new file mode 100644
index 0000000..ee77193
Binary files /dev/null and b/model-context-protocol/brave/.DS_Store differ
diff --git a/model-context-protocol/brave/pom.xml b/model-context-protocol/brave/pom.xml
index e719089..a541e2f 100644
--- a/model-context-protocol/brave/pom.xml
+++ b/model-context-protocol/brave/pom.xml
@@ -40,12 +40,12 @@
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client</artifactId>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/brave/src/main/resources/application.properties b/model-context-protocol/brave/src/main/resources/application.properties
index 70c8077..7b98bbc 100644
--- a/model-context-protocol/brave/src/main/resources/application.properties
+++ b/model-context-protocol/brave/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+debug=true
 spring.application.name=mcp
 spring.main.web-application-type=none
 
diff --git a/model-context-protocol/client-starter/starter-default-client/pom.xml b/model-context-protocol/client-starter/starter-default-client/pom.xml
index 4735fb9..40b5ef2 100644
--- a/model-context-protocol/client-starter/starter-default-client/pom.xml
+++ b/model-context-protocol/client-starter/starter-default-client/pom.xml
@@ -36,17 +36,17 @@
 	
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client</artifactId>
 		</dependency>
 
 		<!-- <dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency> -->
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-anthropic-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-anthropic</artifactId>
 		</dependency>
 		
 	</dependencies>
diff --git a/model-context-protocol/client-starter/starter-webflux-client/pom.xml b/model-context-protocol/client-starter/starter-webflux-client/pom.xml
index e4408f3..9220872 100644
--- a/model-context-protocol/client-starter/starter-webflux-client/pom.xml
+++ b/model-context-protocol/client-starter/starter-webflux-client/pom.xml
@@ -36,17 +36,17 @@
 	
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-webflux-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client-webflux</artifactId>
 		</dependency>
 
 		<!-- <dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency> -->
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-anthropic-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-anthropic</artifactId>
 		</dependency>
 		
 	</dependencies>
diff --git a/model-context-protocol/filesystem/pom.xml b/model-context-protocol/filesystem/pom.xml
index fe874d7..3ec9025 100644
--- a/model-context-protocol/filesystem/pom.xml
+++ b/model-context-protocol/filesystem/pom.xml
@@ -37,12 +37,12 @@
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client</artifactId>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/sampling/mcp-sampling-client/pom.xml b/model-context-protocol/sampling/mcp-sampling-client/pom.xml
index 7f7576e..d8b498c 100644
--- a/model-context-protocol/sampling/mcp-sampling-client/pom.xml
+++ b/model-context-protocol/sampling/mcp-sampling-client/pom.xml
@@ -36,17 +36,17 @@
 	
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-anthropic-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-anthropic</artifactId>
 		</dependency>
 		
 	</dependencies>
diff --git a/model-context-protocol/sampling/mcp-sampling-client/src/main/java/org/springframework/ai/mcp/samples/client/McpClientApplication.java b/model-context-protocol/sampling/mcp-sampling-client/src/main/java/org/springframework/ai/mcp/samples/client/McpClientApplication.java
index 5016d21..cca303f 100644
--- a/model-context-protocol/sampling/mcp-sampling-client/src/main/java/org/springframework/ai/mcp/samples/client/McpClientApplication.java
+++ b/model-context-protocol/sampling/mcp-sampling-client/src/main/java/org/springframework/ai/mcp/samples/client/McpClientApplication.java
@@ -28,7 +28,6 @@ import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.mcp.SyncMcpToolCallbackProvider;
 import org.springframework.ai.mcp.customizer.McpSyncClientCustomizer;
 import org.springframework.ai.openai.OpenAiChatModel;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/model-context-protocol/sampling/mcp-weather-webmvc-server/pom.xml b/model-context-protocol/sampling/mcp-weather-webmvc-server/pom.xml
index d0eab1c..5c75521 100644
--- a/model-context-protocol/sampling/mcp-weather-webmvc-server/pom.xml
+++ b/model-context-protocol/sampling/mcp-weather-webmvc-server/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-server-webmvc-spring-boot-starter</artifactId>
+            <artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/model-context-protocol/sqlite/chatbot/pom.xml b/model-context-protocol/sqlite/chatbot/pom.xml
index ef7d1c1..f6ce845 100644
--- a/model-context-protocol/sqlite/chatbot/pom.xml
+++ b/model-context-protocol/sqlite/chatbot/pom.xml
@@ -37,12 +37,12 @@
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client</artifactId>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/sqlite/simple/pom.xml b/model-context-protocol/sqlite/simple/pom.xml
index b52dec3..dc5ebd9 100644
--- a/model-context-protocol/sqlite/simple/pom.xml
+++ b/model-context-protocol/sqlite/simple/pom.xml
@@ -37,12 +37,12 @@
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client</artifactId>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/weather/starter-stdio-server/pom.xml b/model-context-protocol/weather/starter-stdio-server/pom.xml
index 18ec531..e472a2d 100644
--- a/model-context-protocol/weather/starter-stdio-server/pom.xml
+++ b/model-context-protocol/weather/starter-stdio-server/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-server-spring-boot-starter</artifactId>
+            <artifactId>spring-ai-starter-mcp-server</artifactId>
         </dependency>
         
         <dependency>
diff --git a/model-context-protocol/weather/starter-webflux-server/pom.xml b/model-context-protocol/weather/starter-webflux-server/pom.xml
index 93bae11..78a8fe6 100644
--- a/model-context-protocol/weather/starter-webflux-server/pom.xml
+++ b/model-context-protocol/weather/starter-webflux-server/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-server-webflux-spring-boot-starter</artifactId>
+            <artifactId>spring-ai-starter-mcp-server-webflux</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/model-context-protocol/weather/starter-webmvc-server/pom.xml b/model-context-protocol/weather/starter-webmvc-server/pom.xml
index 49ce75e..9eefa09 100644
--- a/model-context-protocol/weather/starter-webmvc-server/pom.xml
+++ b/model-context-protocol/weather/starter-webmvc-server/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-server-webmvc-spring-boot-starter</artifactId>
+            <artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/model-context-protocol/web-search/brave-chatbot/pom.xml b/model-context-protocol/web-search/brave-chatbot/pom.xml
index 6adddc9..c41dcad 100644
--- a/model-context-protocol/web-search/brave-chatbot/pom.xml
+++ b/model-context-protocol/web-search/brave-chatbot/pom.xml
@@ -35,12 +35,12 @@
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-anthropic-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-anthropic</artifactId>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/web-search/brave-starter/pom.xml b/model-context-protocol/web-search/brave-starter/pom.xml
index 54d1749..f143841 100644
--- a/model-context-protocol/web-search/brave-starter/pom.xml
+++ b/model-context-protocol/web-search/brave-starter/pom.xml
@@ -34,16 +34,16 @@
 	
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-mcp-client-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-mcp-client</artifactId>
 		</dependency>
 
 		<!-- <dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-openai</artifactId>
 		</dependency> -->
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
-			<artifactId>spring-ai-anthropic-spring-boot-starter</artifactId>
+			<artifactId>spring-ai-starter-model-anthropic</artifactId>
 		</dependency>
 		
 	</dependencies>