1004623 - References to old collection names and content_unit_count needs to be updated

https://bugzilla.redhat.com/show_bug.cgi?id=1004623