fix cxx-model definitions