diff --git a/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/properties/McpClientCommonProperties.java b/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/properties/McpClientCommonProperties.java
index 28124e559c2..da3e4c7f142 100644
--- a/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/properties/McpClientCommonProperties.java
+++ b/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/properties/McpClientCommonProperties.java
@@ -103,7 +103,7 @@ public enum ClientType {
 	 * <p>
 	 * This configuration is used to enable or disable tool callbacks in the MCP client.
 	 */
-	private Toolcallback toolcallback = new Toolcallback();
+	private ToolCallback toolCallback = new ToolCallback();
 
 	public boolean isEnabled() {
 		return this.enabled;
@@ -161,22 +161,22 @@ public void setRootChangeNotification(boolean rootChangeNotification) {
 		this.rootChangeNotification = rootChangeNotification;
 	}
 
-	public Toolcallback getToolcallback() {
-		return this.toolcallback;
+	public ToolCallback getToolCallback() {
+		return this.toolCallback;
 	}
 
-	public void setToolcallback(Toolcallback toolcallback) {
-		this.toolcallback = toolcallback;
+	public void setToolCallback(ToolCallback toolCallback) {
+		this.toolCallback = toolCallback;
 	}
 
 	/**
 	 * Represents a callback configuration for tools.
 	 * <p>
-	 * This record is used to encapsulate the configuration for enabling or disabling tool
+	 * This class is used to encapsulate the configuration for enabling or disabling tool
 	 * callbacks in the MCP client.
 	 *
 	 */
-	public static class Toolcallback {
+	public static class ToolCallback {
 
 		/**
 		 * A boolean flag indicating whether the tool callback is enabled. If true, the
diff --git a/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/properties/McpStreamableHttpClientProperties.java b/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/properties/McpStreamableHttpClientProperties.java
index 312c5af4e2f..50e12321119 100644
--- a/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/properties/McpStreamableHttpClientProperties.java
+++ b/auto-configurations/mcp/spring-ai-autoconfigure-mcp-client-common/src/main/java/org/springframework/ai/mcp/client/common/autoconfigure/properties/McpStreamableHttpClientProperties.java
@@ -63,7 +63,7 @@ public Map<String, ConnectionParameters> getConnections() {
 	}
 
 	/**
-	 * Parameters for configuring an Streamable Http connection to an MCP server.
+	 * Parameters for configuring a Streamable Http connection to an MCP server.
 	 *
 	 * @param url the URL endpoint for Streamable Http communication with the MCP server
 	 * @param endpoint the endpoint for the MCP server