Rename some methods for clarity.
A little python cleanup
Some more name changing
Update generated files.