Renaming of Query and other changes arising therefrom