Refactoring of names of model classes.