fix internal model class references