Rename query variables