Rename types to model_types