Rename query arguments