Renamed Query* classes to UriQuery*.