Naming tweaks after discussion

* Query -> QueryParams (make clear it's not a DB query)
* with/without rather than add/remove