Refactoring of classes(renaming)