refactor predicate names