PEP8 compatibility
Some renamings