Changing some argument names.