Update CCMenu for new naming conventions
Merge pull request #1631 from Cottser/ccmenu

Update CCMenu for new naming conventions