More PEP8 refactoring of property names