Fix bug when renaming data

Reapply pull request lost