Rename the remaining queries