KAZOO-3117 consistency on arg names