Undo over greedy renaming!