diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts
index 3fcdff97..aa1e701f 100644
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts
@@ -423,8 +423,8 @@ Add any other context about the problem here.
     it('should display only Gemini CLI tools (filtering out MCP tools)', async () => {
       // Create mock tools - some with serverName property (MCP tools) and some without (Gemini CLI tools)
       const mockTools = [
-        { name: 'tool1' },
-        { name: 'tool2' },
+        { name: 'tool1', displayName: 'Tool1' },
+        { name: 'tool2', displayName: 'Tool2' },
         { name: 'mcp_tool1', serverName: 'mcp-server1' },
         { name: 'mcp_tool2', serverName: 'mcp-server1' },
       ];
@@ -447,7 +447,7 @@ Add any other context about the problem here.
         2,
         expect.objectContaining({
           type: MessageType.INFO,
-          text: 'Available Gemini CLI tools:\n\ntool1\ntool2',
+          text: 'Available Gemini CLI tools:\n\nTool1\nTool2',
         }),
         expect.any(Number),
       );
diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
index 85ae825e..daec0379 100644
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
@@ -350,7 +350,7 @@ export const useSlashCommandProcessor = (
 
           // Filter out MCP tools by checking if they have a serverName property
           const geminiTools = tools.filter((tool) => !('serverName' in tool));
-          const geminiToolList = geminiTools.map((tool) => tool.name);
+          const geminiToolList = geminiTools.map((tool) => tool.displayName);
 
           addMessage({
             type: MessageType.INFO,
diff --git a/packages/core/src/tools/mcp-tool.ts b/packages/core/src/tools/mcp-tool.ts
index ffe12cf7..d5a8ccb5 100644
--- a/packages/core/src/tools/mcp-tool.ts
+++ b/packages/core/src/tools/mcp-tool.ts
@@ -32,7 +32,7 @@ export class DiscoveredMCPTool extends BaseTool<ToolParams, ToolResult> {
   ) {
     super(
       name,
-      name,
+      `${serverToolName} (${serverName} MCP Server)`,
       description,
       parameterSchema,
       true, // isOutputMarkdown