option name changes and cleanup