MORE missed renaming and cleanup. Also fixed a minor bug in config read that forced an unnecessary reread.