Minor rearranging in RenameAction...