diff --git a/model-context-protocol/brave/pom.xml b/model-context-protocol/brave/pom.xml
index 425ad8e..c309c2b 100644
--- a/model-context-protocol/brave/pom.xml
+++ b/model-context-protocol/brave/pom.xml
@@ -42,8 +42,8 @@
 
 		<dependency>
 			<groupId>org.springframework.experimental</groupId>
-			<artifactId>spring-ai-mcp-spring</artifactId>
-			<version>0.1.0</version>
+			<artifactId>spring-ai-mcp</artifactId>
+			<version>0.2.0</version>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/brave/src/main/java/org/springframework/ai/mcp/samples/brave/Application.java b/model-context-protocol/brave/src/main/java/org/springframework/ai/mcp/samples/brave/Application.java
index 2e97fbe..f5921c3 100644
--- a/model-context-protocol/brave/src/main/java/org/springframework/ai/mcp/samples/brave/Application.java
+++ b/model-context-protocol/brave/src/main/java/org/springframework/ai/mcp/samples/brave/Application.java
@@ -1,12 +1,10 @@
 package org.springframework.ai.mcp.samples.brave;
 
-import java.util.List;
-
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.mcp.client.McpClient;
 import org.springframework.ai.mcp.client.McpSyncClient;
 import org.springframework.ai.mcp.client.stdio.ServerParameters;
-import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.client.stdio.StdioClientTransport;
 import org.springframework.ai.mcp.spring.McpFunctionCallback;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -52,7 +50,7 @@ public class Application {
 				.addEnvVar("BRAVE_API_KEY", System.getenv("BRAVE_API_KEY"))
 				.build();
 
-		var mcpClient = McpClient.sync(new StdioServerTransport(stdioParams));
+		var mcpClient = McpClient.using(new StdioClientTransport(stdioParams)).sync();
 		var init = mcpClient.initialize();
 		System.out.println("MCP Initialized: " + init);
 		return mcpClient;
diff --git a/model-context-protocol/filesystem/pom.xml b/model-context-protocol/filesystem/pom.xml
index 62389f9..48a6ef0 100644
--- a/model-context-protocol/filesystem/pom.xml
+++ b/model-context-protocol/filesystem/pom.xml
@@ -42,8 +42,8 @@
 
 		<dependency>
 			<groupId>org.springframework.experimental</groupId>
-			<artifactId>spring-ai-mcp-spring</artifactId>
-			<version>0.1.0</version>
+			<artifactId>spring-ai-mcp</artifactId>
+			<version>0.2.0</version>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/filesystem/src/main/java/org/springframework/ai/mcp/samples/filesystem/Application.java b/model-context-protocol/filesystem/src/main/java/org/springframework/ai/mcp/samples/filesystem/Application.java
index 07940b6..a216fbe 100644
--- a/model-context-protocol/filesystem/src/main/java/org/springframework/ai/mcp/samples/filesystem/Application.java
+++ b/model-context-protocol/filesystem/src/main/java/org/springframework/ai/mcp/samples/filesystem/Application.java
@@ -4,13 +4,11 @@ import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.List;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.mcp.client.McpClient;
 import org.springframework.ai.mcp.client.McpSyncClient;
 import org.springframework.ai.mcp.client.stdio.ServerParameters;
-import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.client.stdio.StdioClientTransport;
 import org.springframework.ai.mcp.spring.McpFunctionCallback;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -72,8 +70,8 @@ public class Application {
 				.args("-y", "@modelcontextprotocol/server-filesystem", getDbPath())
 				.build();
 
-		var mcpClient = McpClient.sync(new StdioServerTransport(stdioParams),
-				Duration.ofSeconds(10), new ObjectMapper());
+		var mcpClient = McpClient.using(new StdioClientTransport(stdioParams))
+				.requestTimeout(Duration.ofSeconds(10)).sync();
 
 		var init = mcpClient.initialize();
 
diff --git a/model-context-protocol/sqlite/chatbot/pom.xml b/model-context-protocol/sqlite/chatbot/pom.xml
index 8b14722..89f3ce4 100644
--- a/model-context-protocol/sqlite/chatbot/pom.xml
+++ b/model-context-protocol/sqlite/chatbot/pom.xml
@@ -42,8 +42,8 @@
 
 		<dependency>
 			<groupId>org.springframework.experimental</groupId>
-			<artifactId>spring-ai-mcp-spring</artifactId>
-			<version>0.1.0</version>
+			<artifactId>spring-ai-mcp</artifactId>
+			<version>0.2.0</version>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/sqlite/chatbot/src/main/java/org/springframework/ai/mcp/samples/sqlite/Application.java b/model-context-protocol/sqlite/chatbot/src/main/java/org/springframework/ai/mcp/samples/sqlite/Application.java
index 0d02f5d..82807cf 100644
--- a/model-context-protocol/sqlite/chatbot/src/main/java/org/springframework/ai/mcp/samples/sqlite/Application.java
+++ b/model-context-protocol/sqlite/chatbot/src/main/java/org/springframework/ai/mcp/samples/sqlite/Application.java
@@ -5,15 +5,13 @@ import java.time.Duration;
 import java.util.List;
 import java.util.Scanner;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
 import org.springframework.ai.chat.memory.InMemoryChatMemory;
 import org.springframework.ai.mcp.client.McpClient;
 import org.springframework.ai.mcp.client.McpSyncClient;
 import org.springframework.ai.mcp.client.stdio.ServerParameters;
-import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.client.stdio.StdioClientTransport;
 import org.springframework.ai.mcp.spring.McpFunctionCallback;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -82,8 +80,8 @@ public class Application {
 						getDbPath())
 				.build();
 
-		var mcpClient = McpClient.sync(new StdioServerTransport(stdioParams),
-				Duration.ofSeconds(10), new ObjectMapper());
+		var mcpClient = McpClient.using(new StdioClientTransport(stdioParams))
+				.requestTimeout(Duration.ofSeconds(10)).sync();
 
 		var init = mcpClient.initialize();
 
diff --git a/model-context-protocol/sqlite/simple/pom.xml b/model-context-protocol/sqlite/simple/pom.xml
index cfb232b..71aa666 100644
--- a/model-context-protocol/sqlite/simple/pom.xml
+++ b/model-context-protocol/sqlite/simple/pom.xml
@@ -42,8 +42,8 @@
 
 		<dependency>
 			<groupId>org.springframework.experimental</groupId>
-			<artifactId>spring-ai-mcp-spring</artifactId>
-			<version>0.1.0</version>
+			<artifactId>spring-ai-mcp</artifactId>
+			<version>0.2.0</version>
 		</dependency>
 
 	</dependencies>
diff --git a/model-context-protocol/sqlite/simple/src/main/java/org/springframework/ai/mcp/samples/sqlite/Application.java b/model-context-protocol/sqlite/simple/src/main/java/org/springframework/ai/mcp/samples/sqlite/Application.java
index c7c26e9..85a78d4 100644
--- a/model-context-protocol/sqlite/simple/src/main/java/org/springframework/ai/mcp/samples/sqlite/Application.java
+++ b/model-context-protocol/sqlite/simple/src/main/java/org/springframework/ai/mcp/samples/sqlite/Application.java
@@ -4,13 +4,11 @@ import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.List;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.mcp.client.McpClient;
 import org.springframework.ai.mcp.client.McpSyncClient;
 import org.springframework.ai.mcp.client.stdio.ServerParameters;
-import org.springframework.ai.mcp.client.stdio.StdioServerTransport;
+import org.springframework.ai.mcp.client.stdio.StdioClientTransport;
 import org.springframework.ai.mcp.spring.McpFunctionCallback;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -80,8 +78,8 @@ public class Application {
 						getDbPath())
 				.build();
 
-		var mcpClient = McpClient.sync(new StdioServerTransport(stdioParams),
-				Duration.ofSeconds(10), new ObjectMapper());
+		var mcpClient = McpClient.using(new StdioClientTransport(stdioParams))
+				.requestTimeout(Duration.ofSeconds(10)).sync();
 
 		var init = mcpClient.initialize();