Reverted data-* renaming back to be implemented on major version bump