diff --git a/src/Infrastructure/BotSharp.Core/Routing/Executor/FunctionExecutorFactory.cs b/src/Infrastructure/BotSharp.Core/Routing/Executor/FunctionExecutorFactory.cs
index c0c8bec3..3fb89509 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/Executor/FunctionExecutorFactory.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/Executor/FunctionExecutorFactory.cs
@@ -32,7 +32,7 @@ internal class FunctionExecutorFactory
                 {
                     var mcpServerId  = agent?.McpTools?.Where(x => x.Functions.Any(y => y.Name == funDef.Name))
                         .FirstOrDefault().ServerId;
-                    return new MCPFunctionExecutor(mcpServerId, functionName, serviceProvider);
+                    return new MCPToolExecutor(mcpServerId, functionName, serviceProvider);
                 }
             }
         }
diff --git a/src/Infrastructure/BotSharp.Core/Routing/Executor/MCPFunctionExecutor.cs b/src/Infrastructure/BotSharp.Core/Routing/Executor/MCPToolExecutor.cs
similarity index 96%
rename from src/Infrastructure/BotSharp.Core/Routing/Executor/MCPFunctionExecutor.cs
rename to src/Infrastructure/BotSharp.Core/Routing/Executor/MCPToolExecutor.cs
index 0ed6f0ea..f7625b48 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/Executor/MCPFunctionExecutor.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/Executor/MCPToolExecutor.cs
@@ -3,14 +3,14 @@ using ModelContextProtocol.Client;
 
 namespace BotSharp.Core.Routing.Executor;
 
-public class MCPFunctionExecutor: IFunctionExecutor
+public class MCPToolExecutor: IFunctionExecutor
 {
     private readonly McpClientManager _clientManager;
     private string mcpServer;
     private string funcName;
     private readonly IServiceProvider _services;
 
-    public MCPFunctionExecutor(string mcpserver, string functionName, IServiceProvider services)
+    public MCPToolExecutor(string mcpserver, string functionName, IServiceProvider services)
     { 
         _services = services;
         this.mcpServer = mcpserver;