Renamed classes and variables