Follow changes of the option name