Renamed variables and classes.