Renamed variables and classes