Update for mcp name changes