rename args to be consistent