Refactoring class name