Renamed parameters to be consistent