Change class names to PEP 8 CapWords convention