Renamed classes and variables to correct names (quest)