Refactor argument order to match command calls