Normalized the naming of methods and functions in the query builder and tests.