Removes deprecated names for/references to CCIs