Code cleanup, added missing MCP name mappings