Rename MSF to MCP