Refactoring of the class-names