Change: Be compliant with PEP-8 regarding class names