Renamed variables in a few setters