Rename where endpoints to query