Rename query -> criteria, fields -> projection, part two