Taking the source from MCP and giving fields and classes meaningful names