Use the new option name in deactivation and uninstallation