[WIP] Query constructor API changes

I'm using the same terminology in the CRUD API spec. I'll bring this point up with them.