Improve predicate function names.