Renaming some poorly-named methods and reordering some functions in the
query compiler