diff --git a/navi/core/agent.py b/navi/core/agent.py
index a7ef200..0286234 100644
--- a/navi/core/agent.py
+++ b/navi/core/agent.py
@@ -1181,14 +1181,14 @@
             for server_name, groups in mcp_servers.items():
                 if "*" in groups:
                     # All registered tools for this server
-                    prefix = f"mcp_{server_name}_"
+                    prefix = f"mcp:{server_name}:"
                     for tool in self._tools.all():
                         if tool.name.startswith(prefix) and tool.name not in names:
                             names.append(tool.name)
                 else:
                     for group_name in groups:
                         for tool_name in self._mcp_manager.resolve_group(server_name, group_name):
-                            full_name = f"mcp_{server_name}_{tool_name}"
+                            full_name = f"mcp:{server_name}:{tool_name}"
                             if full_name not in names:
                                 names.append(full_name)
 
diff --git a/navi/mcp/tools.py b/navi/mcp/tools.py
index 72aa371..87e9c35 100644
--- a/navi/mcp/tools.py
+++ b/navi/mcp/tools.py
@@ -10,7 +10,7 @@
 class McpTool(Tool):
     """A :class:`Tool` proxy that forwards execution to an MCP server.
 
-    The name is ``mcp_<server>_<tool>`` to avoid collisions with built-in
+    The name is ``mcp:<server>:<tool>`` to avoid collisions with built-in
     and user-defined tools.
     """