Fixed some naming conventions,  whichQuery and whichInputData methods