Change some more CC -> OC