Fixed some of the naming changes in the aggressive PEP8 conversion