Renamed and redone predicate checking