Reordering renaming and refactoring