Change *-pred fn names, since they are no longer predicates