Renamed CriteriaBuilder to CriteriaFormatter