rename query variables