Renaming and refactoring of classes