Update configuration option to avoid name clashes