refactoring class name