Refactoring of class names