Change option name: predicate -> when