diff --git a/pkg/mcp/loader.go b/pkg/mcp/loader.go
index 86e2f8d2..b3441719 100644
--- a/pkg/mcp/loader.go
+++ b/pkg/mcp/loader.go
@@ -234,11 +234,12 @@ func (l *Local) sessionToTools(ctx context.Context, session *Session, toolName s
 		}
 
 		if tool.Annotations.Title != "" && !slices.Contains(strings.Fields(tool.Annotations.Title), "as") {
-			toolDef.Name = tool.Annotations.Title + " as " + tool.Name
+			toolNames = append(toolNames, tool.Name+" as "+tool.Annotations.Title)
+		} else {
+			toolNames = append(toolNames, tool.Name)
 		}
 
 		toolDefs = append(toolDefs, toolDef)
-		toolNames = append(toolNames, tool.Name)
 	}
 
 	main := types.Tool{