[ChrisClark13] Updated for MCP renames