class naming refactoring