diff --git a/mcpgateway/services/gateway_service.py b/mcpgateway/services/gateway_service.py
index 739cc0d30..7dcde43d9 100644
--- a/mcpgateway/services/gateway_service.py
+++ b/mcpgateway/services/gateway_service.py
@@ -653,7 +653,8 @@ async def fetch_tools_after_oauth(self, db: Session, gateway_id: str) -> Dict[st
                     try:
                         db_tool = DbTool(
                             original_name=tool.name,
-                            original_name_slug=slugify(tool.name),
+                            custom_name=tool.name,
+                            custom_name_slug=slugify(tool.name),
                             url=gateway.url.rstrip("/"),
                             description=tool.description,
                             integration_type="MCP",  # Gateway-discovered tools are MCP type
diff --git a/tests/unit/mcpgateway/test_main.py b/tests/unit/mcpgateway/test_main.py
index 84bd90c30..37db2fd2c 100644
--- a/tests/unit/mcpgateway/test_main.py
+++ b/tests/unit/mcpgateway/test_main.py
@@ -98,6 +98,7 @@
     "gatewayId": "gateway_id",
     "gatewaySlug": "gateway_slug",
     "originalNameSlug": "original_name_slug",
+    "customNameSlug": "custom_name_slug",
 }