Provided Aliases for the Query function/class for each type, to allow mixing different query types in the same unit more easily.
Merge branch 'Query-Aliases'