Another round of renaming - needed a more satisfactory description that 'query' for an object that queries *and* formats the results