Revert "Revert "rename-data""

This reverts commit df5496da22c4bcaa4e25ead41b279e9ca7590f38.