Refactor argument names to convention