rename QueryBuilder to Query