Fix compile errors and bad names
Merge pull request #3 from afffsdd/master

Update to MCP for 1.7