Rename the query directly