Fix mappings for MCP 8.03.