Continue renaming queries