Renamed some classes and standardized some variables