Improve the consistency of predicate names