Replace fields and methods name for later MCP.
Merge pull request #17 from FirstSpring/master

Replace fields and methods name for later MCP.