Renamed class names and variables