Query naming cleanup/shortening. The great "Enumerator" removal.
Merge branch 'refactor-query-names'