Second pass of Cocos2D namespace adoption