Refactoring class names.