Fix for MCP rename