Rename class refactoring