Rename Classes to use "CC" naming convention