Renamed Statement -> Query, Query -> QueryBuilder