Rename ambiguous Query class