Rename upvars
query to upvars_mentioned
#714
Merged
upvars
query to upvars_mentioned
#714