Lots and lots of renaming to pep standard