Rename CategoricalOrBinnedCC. Fix build