diff --git a/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java b/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java
index 986cdbaccd..d17face00b 100644
--- a/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java
+++ b/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java
@@ -256,10 +256,9 @@ public boolean equals(Object o) {
 				&& Objects.equals(this.metadata, that.metadata)
 				&& Objects.equals(this.stopSequences, that.stopSequences)
 				&& Objects.equals(this.temperature, that.temperature) && Objects.equals(this.topP, that.topP)
-				&& Objects.equals(this.topK, that.topK)
-				&& Objects.equals(this.functionCallbacks, that.functionCallbacks)
-				&& Objects.equals(this.functions, that.functions)
-				&& Objects.equals(this.proxyToolCalls, that.proxyToolCalls)
+				&& Objects.equals(this.topK, that.topK) && Objects.equals(this.toolCallbacks, that.toolCallbacks)
+				&& Objects.equals(this.toolNames, that.toolNames)
+				&& Objects.equals(this.internalToolExecutionEnabled, that.internalToolExecutionEnabled)
 				&& Objects.equals(this.toolContext, that.toolContext);
 	}
 
@@ -274,9 +273,10 @@ public int hashCode() {
 		result = prime * result + (this.temperature != null ? this.temperature.hashCode() : 0);
 		result = prime * result + (this.topP != null ? this.topP.hashCode() : 0);
 		result = prime * result + (this.topK != null ? this.topK.hashCode() : 0);
-		result = prime * result + (this.functionCallbacks != null ? this.functionCallbacks.hashCode() : 0);
-		result = prime * result + (this.functions != null ? this.functions.hashCode() : 0);
-		result = prime * result + (this.proxyToolCalls != null ? this.proxyToolCalls.hashCode() : 0);
+		result = prime * result + (this.toolCallbacks != null ? this.toolCallbacks.hashCode() : 0);
+		result = prime * result + (this.toolNames != null ? this.toolNames.hashCode() : 0);
+		result = prime * result
+				+ (this.internalToolExecutionEnabled != null ? this.internalToolExecutionEnabled.hashCode() : 0);
 		result = prime * result + (this.toolContext != null ? this.toolContext.hashCode() : 0);
 		return result;
 	}
diff --git a/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java b/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java
index a333146c83..0c6ab51d0f 100644
--- a/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java
+++ b/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java
@@ -439,9 +439,10 @@ public boolean equals(Object o) {
 				&& Objects.equals(this.n, that.n) && Objects.equals(this.stop, that.stop)
 				&& Objects.equals(this.deploymentName, that.deploymentName)
 				&& Objects.equals(this.responseFormat, that.responseFormat)
-				&& Objects.equals(this.functionCallbacks, that.functionCallbacks)
-				&& Objects.equals(this.functions, that.functions)
-				&& Objects.equals(this.proxyToolCalls, that.proxyToolCalls) && Objects.equals(this.seed, that.seed)
+
+				&& Objects.equals(this.toolCallbacks, that.toolCallbacks)
+				&& Objects.equals(this.toolNames, that.toolNames)
+				&& Objects.equals(this.internalToolExecutionEnabled, that.internalToolExecutionEnabled)
 				&& Objects.equals(this.logprobs, that.logprobs) && Objects.equals(this.topLogProbs, that.topLogProbs)
 				&& Objects.equals(this.enhancements, that.enhancements)
 				&& Objects.equals(this.streamOptions, that.streamOptions)
@@ -461,9 +462,10 @@ public int hashCode() {
 		result = prime * result + (this.stop != null ? this.stop.hashCode() : 0);
 		result = prime * result + (this.deploymentName != null ? this.deploymentName.hashCode() : 0);
 		result = prime * result + (this.responseFormat != null ? this.responseFormat.hashCode() : 0);
-		result = prime * result + (this.functionCallbacks != null ? this.functionCallbacks.hashCode() : 0);
-		result = prime * result + (this.functions != null ? this.functions.hashCode() : 0);
-		result = prime * result + (this.proxyToolCalls != null ? this.proxyToolCalls.hashCode() : 0);
+		result = prime * result + (this.toolCallbacks != null ? this.toolCallbacks.hashCode() : 0);
+		result = prime * result + (this.toolNames != null ? this.toolNames.hashCode() : 0);
+		result = prime * result
+				+ (this.internalToolExecutionEnabled != null ? this.internalToolExecutionEnabled.hashCode() : 0);
 		result = prime * result + (this.seed != null ? this.seed.hashCode() : 0);
 		result = prime * result + (this.logprobs != null ? this.logprobs.hashCode() : 0);
 		result = prime * result + (this.topLogProbs != null ? this.topLogProbs.hashCode() : 0);