Updated to conform with python standards

Refactored class and variable names to conform with the rest of the
code.