My only concern is that the terminology exposes the underlying protocol if we keep using query. We have plans to switch to RPC+proto with the new infrastructure and I don't know how "query" will keep being relevant.