Renamed arguments to make them more uniform.