Renamed variables and accessors