Fix for updated MCP names