Cleanup for dns-origin and yumrepo name changes