refactor the names of the classes.