Renamed SearchCriteria class