Renaming other references to CCIs