config changes and rename