Renamed classes, variables & methods to meet Python naming conventions