comply with the evilJavaNamingScheme for attribute names

It seems my love of PEP 8 overrode the need for consistentcy
3 files changed