Rename some argument objects to avoid confusion.