Refactor renaming.