Fix new option name handling (again)