MCP_DC_TENANT -> MCP_TENANT