Rename of config objects, and other cleanup