Removed or renamed CDB objects in order to get rid of duplicates