class name refactoring