refactored renaming