Some name changes in QueryData to make more readable, updated other
classes accordingly.  Also updated code for some failed junit tests.