diff --git a/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/service/ExecuteService.java b/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/service/ExecuteService.java
index bf2c581..cacf21a 100644
--- a/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/service/ExecuteService.java
+++ b/axhub-gateway/src/main/java/io/shinhanlife/axhub/biz/mcp/gateway/service/ExecuteService.java
@@ -51,7 +51,7 @@ public class ExecuteService {
         }
 
         // Dynamic Routing: Find the target Pod from the Redis registry
-        String targetUrl = "http://localhost:8082"; // Fallback
+        String targetUrl = "http://localhost:8084"; // Fallback (tool-other)
         if (plan.getPodUrl() != null && !plan.getPodUrl().isEmpty()) {
             targetUrl = plan.getPodUrl();
         }
diff --git a/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/presentation/BusinessToolController.java b/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/presentation/BusinessToolController.java
index 936615f..3df28d0 100644
--- a/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/presentation/BusinessToolController.java
+++ b/axhub-tool-core/src/main/java/io/shinhanlife/axhub/biz/mcp/tool/presentation/BusinessToolController.java
@@ -88,7 +88,7 @@ public class BusinessToolController {
                             ? mcpProperties.getNamespace() + "_" + baseName
                             : baseName;
                     
-                    if (expectedName.equals(functionName)) {
+                    if (expectedName.equals(functionName) || baseName.equals(functionName)) {
                         targetBean = bean;
                         targetMethod = method;
                         targetFunctionAnnotation = mcpFunc;