[master 1/6] Make all names conform to PEP8.