Renamed a couple of parameters.