Fixing names in the model files and cb's