refactoring renaming classes