diff --git a/schemas/2019-11-01/Microsoft.DataShare.json b/schemas/2019-11-01/Microsoft.DataShare.json
index fc1a3d4e0d..cb6d211c05 100644
--- a/schemas/2019-11-01/Microsoft.DataShare.json
+++ b/schemas/2019-11-01/Microsoft.DataShare.json
@@ -198,22 +198,22 @@
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/BlobDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FileDataSetMapping"
         },
         {
-          "$ref": "#/definitions/BlobFolderDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FileSystemDataSetMapping"
         },
         {
-          "$ref": "#/definitions/BlobContainerDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FolderDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileDataSetMapping"
+          "$ref": "#/definitions/BlobContainerDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FolderDataSetMapping"
+          "$ref": "#/definitions/BlobDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileSystemDataSetMapping"
+          "$ref": "#/definitions/BlobFolderDataSetMapping"
         },
         {
           "$ref": "#/definitions/KustoClusterDataSetMapping"
@@ -222,10 +222,10 @@
           "$ref": "#/definitions/KustoDatabaseDataSetMapping"
         },
         {
-          "$ref": "#/definitions/SqlDWTableDataSetMapping"
+          "$ref": "#/definitions/SqlDBTableDataSetMapping"
         },
         {
-          "$ref": "#/definitions/SqlDBTableDataSetMapping"
+          "$ref": "#/definitions/SqlDWTableDataSetMapping"
         }
       ],
       "properties": {
@@ -289,28 +289,28 @@
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/BlobDataSet"
+          "$ref": "#/definitions/ADLSGen1FileDataSet"
         },
         {
-          "$ref": "#/definitions/BlobFolderDataSet"
+          "$ref": "#/definitions/ADLSGen1FolderDataSet"
         },
         {
-          "$ref": "#/definitions/BlobContainerDataSet"
+          "$ref": "#/definitions/ADLSGen2FileDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileDataSet"
+          "$ref": "#/definitions/ADLSGen2FileSystemDataSet"
         },
         {
           "$ref": "#/definitions/ADLSGen2FolderDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileSystemDataSet"
+          "$ref": "#/definitions/BlobContainerDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen1FolderDataSet"
+          "$ref": "#/definitions/BlobDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen1FileDataSet"
+          "$ref": "#/definitions/BlobFolderDataSet"
         },
         {
           "$ref": "#/definitions/KustoClusterDataSet"
@@ -319,10 +319,10 @@
           "$ref": "#/definitions/KustoDatabaseDataSet"
         },
         {
-          "$ref": "#/definitions/SqlDWTableDataSet"
+          "$ref": "#/definitions/SqlDBTableDataSet"
         },
         {
-          "$ref": "#/definitions/SqlDBTableDataSet"
+          "$ref": "#/definitions/SqlDWTableDataSet"
         }
       ],
       "properties": {
@@ -471,22 +471,22 @@
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/BlobDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FileDataSetMapping"
         },
         {
-          "$ref": "#/definitions/BlobFolderDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FileSystemDataSetMapping"
         },
         {
-          "$ref": "#/definitions/BlobContainerDataSetMapping"
+          "$ref": "#/definitions/ADLSGen2FolderDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileDataSetMapping"
+          "$ref": "#/definitions/BlobContainerDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FolderDataSetMapping"
+          "$ref": "#/definitions/BlobDataSetMapping"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileSystemDataSetMapping"
+          "$ref": "#/definitions/BlobFolderDataSetMapping"
         },
         {
           "$ref": "#/definitions/KustoClusterDataSetMapping"
@@ -495,10 +495,10 @@
           "$ref": "#/definitions/KustoDatabaseDataSetMapping"
         },
         {
-          "$ref": "#/definitions/SqlDWTableDataSetMapping"
+          "$ref": "#/definitions/SqlDBTableDataSetMapping"
         },
         {
-          "$ref": "#/definitions/SqlDBTableDataSetMapping"
+          "$ref": "#/definitions/SqlDWTableDataSetMapping"
         }
       ],
       "properties": {
@@ -601,28 +601,28 @@
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/BlobDataSet"
+          "$ref": "#/definitions/ADLSGen1FileDataSet"
         },
         {
-          "$ref": "#/definitions/BlobFolderDataSet"
+          "$ref": "#/definitions/ADLSGen1FolderDataSet"
         },
         {
-          "$ref": "#/definitions/BlobContainerDataSet"
+          "$ref": "#/definitions/ADLSGen2FileDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileDataSet"
+          "$ref": "#/definitions/ADLSGen2FileSystemDataSet"
         },
         {
           "$ref": "#/definitions/ADLSGen2FolderDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen2FileSystemDataSet"
+          "$ref": "#/definitions/BlobContainerDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen1FolderDataSet"
+          "$ref": "#/definitions/BlobDataSet"
         },
         {
-          "$ref": "#/definitions/ADLSGen1FileDataSet"
+          "$ref": "#/definitions/BlobFolderDataSet"
         },
         {
           "$ref": "#/definitions/KustoClusterDataSet"
@@ -631,10 +631,10 @@
           "$ref": "#/definitions/KustoDatabaseDataSet"
         },
         {
-          "$ref": "#/definitions/SqlDWTableDataSet"
+          "$ref": "#/definitions/SqlDBTableDataSet"
         },
         {
-          "$ref": "#/definitions/SqlDBTableDataSet"
+          "$ref": "#/definitions/SqlDWTableDataSet"
         }
       ],
       "properties": {