Refactoring of class titles