Name refactoring among the classes.