Fixed bug in g.pep8_class_name that ruined the first attempt at refactoring.
Removed clones that were complicating renames.