Refactor the names of the classes in model