minor argument renamings