Revert change that transform @type to @data-label (f326f7a6)

And transform @type to @data-optional-type