Refactor to persistent option name