class names refactoring