Rename QueryServer helper methods
Refactor QueryServer helper methods