Improved dummy index renaming.