Fix expanded and QCD slots/overrides not getting updated
properly when renaming a collection.  This was especially
problematic when the name change triggered other name changes.