diff --git a/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/__init__.py b/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/__init__.py
index 87221cb5367d..cbefffc4d583 100644
--- a/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/__init__.py
+++ b/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/__init__.py
@@ -138,16 +138,16 @@
 from ._data_share_management_client_enums import (
     Type,
     ProvisioningState,
-    Status,
+    DataSetMappingStatus,
+    OutputType,
     InvitationStatus,
-    SynchronizationMode,
     DataSetType,
+    Status,
     ShareSubscriptionStatus,
-    ShareKind,
     RecurrenceInterval,
+    SynchronizationMode,
     TriggerStatus,
-    DataSetMappingStatus,
-    OutputType,
+    ShareKind,
 )
 
 __all__ = [
@@ -223,14 +223,14 @@
     'TriggerPaged',
     'Type',
     'ProvisioningState',
-    'Status',
+    'DataSetMappingStatus',
+    'OutputType',
     'InvitationStatus',
-    'SynchronizationMode',
     'DataSetType',
+    'Status',
     'ShareSubscriptionStatus',
-    'ShareKind',
     'RecurrenceInterval',
+    'SynchronizationMode',
     'TriggerStatus',
-    'DataSetMappingStatus',
-    'OutputType',
+    'ShareKind',
 ]
diff --git a/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_data_share_management_client_enums.py b/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_data_share_management_client_enums.py
index 15698f282d9c..371a6751d3a2 100644
--- a/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_data_share_management_client_enums.py
+++ b/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_data_share_management_client_enums.py
@@ -26,14 +26,16 @@ class ProvisioningState(str, Enum):
     failed = "Failed"
 
 
-class Status(str, Enum):
+class DataSetMappingStatus(str, Enum):
 
-    accepted = "Accepted"
-    in_progress = "InProgress"
-    transient_failure = "TransientFailure"
-    succeeded = "Succeeded"
-    failed = "Failed"
-    canceled = "Canceled"
+    ok = "Ok"
+    broken = "Broken"
+
+
+class OutputType(str, Enum):
+
+    csv = "Csv"
+    parquet = "Parquet"
 
 
 class InvitationStatus(str, Enum):
@@ -44,12 +46,6 @@ class InvitationStatus(str, Enum):
     withdrawn = "Withdrawn"
 
 
-class SynchronizationMode(str, Enum):
-
-    incremental = "Incremental"
-    full_sync = "FullSync"
-
-
 class DataSetType(str, Enum):
 
     blob = "Blob"
@@ -66,6 +62,16 @@ class DataSetType(str, Enum):
     sql_dw_table = "SqlDWTable"
 
 
+class Status(str, Enum):
+
+    accepted = "Accepted"
+    in_progress = "InProgress"
+    transient_failure = "TransientFailure"
+    succeeded = "Succeeded"
+    failed = "Failed"
+    canceled = "Canceled"
+
+
 class ShareSubscriptionStatus(str, Enum):
 
     active = "Active"
@@ -74,18 +80,18 @@ class ShareSubscriptionStatus(str, Enum):
     revoking = "Revoking"
 
 
-class ShareKind(str, Enum):
-
-    copy_based = "CopyBased"
-    in_place = "InPlace"
-
-
 class RecurrenceInterval(str, Enum):
 
     hour = "Hour"
     day = "Day"
 
 
+class SynchronizationMode(str, Enum):
+
+    incremental = "Incremental"
+    full_sync = "FullSync"
+
+
 class TriggerStatus(str, Enum):
 
     active = "Active"
@@ -93,13 +99,7 @@ class TriggerStatus(str, Enum):
     source_synchronization_setting_deleted = "SourceSynchronizationSettingDeleted"
 
 
-class DataSetMappingStatus(str, Enum):
-
-    ok = "Ok"
-    broken = "Broken"
-
-
-class OutputType(str, Enum):
+class ShareKind(str, Enum):
 
-    csv = "Csv"
-    parquet = "Parquet"
+    copy_based = "CopyBased"
+    in_place = "InPlace"
diff --git a/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_models.py b/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_models.py
index b67c05eb25df..2bd5041e433b 100644
--- a/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_models.py
+++ b/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_models.py
@@ -172,10 +172,10 @@ class DataSet(ProxyDto):
     """A DataSet data transfer object.
 
     You probably want to use the sub-classes and not this class directly. Known
-    sub-classes are: BlobDataSet, BlobFolderDataSet, BlobContainerDataSet,
-    ADLSGen2FileDataSet, ADLSGen2FolderDataSet, ADLSGen2FileSystemDataSet,
-    ADLSGen1FolderDataSet, ADLSGen1FileDataSet, KustoClusterDataSet,
-    KustoDatabaseDataSet, SqlDWTableDataSet, SqlDBTableDataSet
+    sub-classes are: ADLSGen1FileDataSet, ADLSGen1FolderDataSet,
+    ADLSGen2FileDataSet, ADLSGen2FileSystemDataSet, ADLSGen2FolderDataSet,
+    BlobContainerDataSet, BlobDataSet, BlobFolderDataSet, KustoClusterDataSet,
+    KustoDatabaseDataSet, SqlDBTableDataSet, SqlDWTableDataSet
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -207,7 +207,7 @@ class DataSet(ProxyDto):
     }
 
     _subtype_map = {
-        'kind': {'Blob': 'BlobDataSet', 'BlobFolder': 'BlobFolderDataSet', 'Container': 'BlobContainerDataSet', 'AdlsGen2File': 'ADLSGen2FileDataSet', 'AdlsGen2Folder': 'ADLSGen2FolderDataSet', 'AdlsGen2FileSystem': 'ADLSGen2FileSystemDataSet', 'AdlsGen1Folder': 'ADLSGen1FolderDataSet', 'AdlsGen1File': 'ADLSGen1FileDataSet', 'KustoCluster': 'KustoClusterDataSet', 'KustoDatabase': 'KustoDatabaseDataSet', 'SqlDWTable': 'SqlDWTableDataSet', 'SqlDBTable': 'SqlDBTableDataSet'}
+        'kind': {'AdlsGen1File': 'ADLSGen1FileDataSet', 'AdlsGen1Folder': 'ADLSGen1FolderDataSet', 'AdlsGen2File': 'ADLSGen2FileDataSet', 'AdlsGen2FileSystem': 'ADLSGen2FileSystemDataSet', 'AdlsGen2Folder': 'ADLSGen2FolderDataSet', 'Container': 'BlobContainerDataSet', 'Blob': 'BlobDataSet', 'BlobFolder': 'BlobFolderDataSet', 'KustoCluster': 'KustoClusterDataSet', 'KustoDatabase': 'KustoDatabaseDataSet', 'SqlDBTable': 'SqlDBTableDataSet', 'SqlDWTable': 'SqlDWTableDataSet'}
     }
 
     def __init__(self, **kwargs):
@@ -417,11 +417,11 @@ class DataSetMapping(ProxyDto):
     """A data set mapping data transfer object.
 
     You probably want to use the sub-classes and not this class directly. Known
-    sub-classes are: BlobDataSetMapping, BlobFolderDataSetMapping,
-    BlobContainerDataSetMapping, ADLSGen2FileDataSetMapping,
-    ADLSGen2FolderDataSetMapping, ADLSGen2FileSystemDataSetMapping,
+    sub-classes are: ADLSGen2FileDataSetMapping,
+    ADLSGen2FileSystemDataSetMapping, ADLSGen2FolderDataSetMapping,
+    BlobContainerDataSetMapping, BlobDataSetMapping, BlobFolderDataSetMapping,
     KustoClusterDataSetMapping, KustoDatabaseDataSetMapping,
-    SqlDWTableDataSetMapping, SqlDBTableDataSetMapping
+    SqlDBTableDataSetMapping, SqlDWTableDataSetMapping
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -453,7 +453,7 @@ class DataSetMapping(ProxyDto):
     }
 
     _subtype_map = {
-        'kind': {'Blob': 'BlobDataSetMapping', 'BlobFolder': 'BlobFolderDataSetMapping', 'Container': 'BlobContainerDataSetMapping', 'AdlsGen2File': 'ADLSGen2FileDataSetMapping', 'AdlsGen2Folder': 'ADLSGen2FolderDataSetMapping', 'AdlsGen2FileSystem': 'ADLSGen2FileSystemDataSetMapping', 'KustoCluster': 'KustoClusterDataSetMapping', 'KustoDatabase': 'KustoDatabaseDataSetMapping', 'SqlDWTable': 'SqlDWTableDataSetMapping', 'SqlDBTable': 'SqlDBTableDataSetMapping'}
+        'kind': {'AdlsGen2File': 'ADLSGen2FileDataSetMapping', 'AdlsGen2FileSystem': 'ADLSGen2FileSystemDataSetMapping', 'AdlsGen2Folder': 'ADLSGen2FolderDataSetMapping', 'Container': 'BlobContainerDataSetMapping', 'Blob': 'BlobDataSetMapping', 'BlobFolder': 'BlobFolderDataSetMapping', 'KustoCluster': 'KustoClusterDataSetMapping', 'KustoDatabase': 'KustoDatabaseDataSetMapping', 'SqlDBTable': 'SqlDBTableDataSetMapping', 'SqlDWTable': 'SqlDWTableDataSetMapping'}
     }
 
     def __init__(self, **kwargs):
diff --git a/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_models_py3.py b/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_models_py3.py
index 91cd2c4d872c..c837df5b173d 100644
--- a/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_models_py3.py
+++ b/sdk/datashare/azure-mgmt-datashare/azure/mgmt/datashare/models/_models_py3.py
@@ -172,10 +172,10 @@ class DataSet(ProxyDto):
     """A DataSet data transfer object.
 
     You probably want to use the sub-classes and not this class directly. Known
-    sub-classes are: BlobDataSet, BlobFolderDataSet, BlobContainerDataSet,
-    ADLSGen2FileDataSet, ADLSGen2FolderDataSet, ADLSGen2FileSystemDataSet,
-    ADLSGen1FolderDataSet, ADLSGen1FileDataSet, KustoClusterDataSet,
-    KustoDatabaseDataSet, SqlDWTableDataSet, SqlDBTableDataSet
+    sub-classes are: ADLSGen1FileDataSet, ADLSGen1FolderDataSet,
+    ADLSGen2FileDataSet, ADLSGen2FileSystemDataSet, ADLSGen2FolderDataSet,
+    BlobContainerDataSet, BlobDataSet, BlobFolderDataSet, KustoClusterDataSet,
+    KustoDatabaseDataSet, SqlDBTableDataSet, SqlDWTableDataSet
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -207,7 +207,7 @@ class DataSet(ProxyDto):
     }
 
     _subtype_map = {
-        'kind': {'Blob': 'BlobDataSet', 'BlobFolder': 'BlobFolderDataSet', 'Container': 'BlobContainerDataSet', 'AdlsGen2File': 'ADLSGen2FileDataSet', 'AdlsGen2Folder': 'ADLSGen2FolderDataSet', 'AdlsGen2FileSystem': 'ADLSGen2FileSystemDataSet', 'AdlsGen1Folder': 'ADLSGen1FolderDataSet', 'AdlsGen1File': 'ADLSGen1FileDataSet', 'KustoCluster': 'KustoClusterDataSet', 'KustoDatabase': 'KustoDatabaseDataSet', 'SqlDWTable': 'SqlDWTableDataSet', 'SqlDBTable': 'SqlDBTableDataSet'}
+        'kind': {'AdlsGen1File': 'ADLSGen1FileDataSet', 'AdlsGen1Folder': 'ADLSGen1FolderDataSet', 'AdlsGen2File': 'ADLSGen2FileDataSet', 'AdlsGen2FileSystem': 'ADLSGen2FileSystemDataSet', 'AdlsGen2Folder': 'ADLSGen2FolderDataSet', 'Container': 'BlobContainerDataSet', 'Blob': 'BlobDataSet', 'BlobFolder': 'BlobFolderDataSet', 'KustoCluster': 'KustoClusterDataSet', 'KustoDatabase': 'KustoDatabaseDataSet', 'SqlDBTable': 'SqlDBTableDataSet', 'SqlDWTable': 'SqlDWTableDataSet'}
     }
 
     def __init__(self, **kwargs) -> None:
@@ -417,11 +417,11 @@ class DataSetMapping(ProxyDto):
     """A data set mapping data transfer object.
 
     You probably want to use the sub-classes and not this class directly. Known
-    sub-classes are: BlobDataSetMapping, BlobFolderDataSetMapping,
-    BlobContainerDataSetMapping, ADLSGen2FileDataSetMapping,
-    ADLSGen2FolderDataSetMapping, ADLSGen2FileSystemDataSetMapping,
+    sub-classes are: ADLSGen2FileDataSetMapping,
+    ADLSGen2FileSystemDataSetMapping, ADLSGen2FolderDataSetMapping,
+    BlobContainerDataSetMapping, BlobDataSetMapping, BlobFolderDataSetMapping,
     KustoClusterDataSetMapping, KustoDatabaseDataSetMapping,
-    SqlDWTableDataSetMapping, SqlDBTableDataSetMapping
+    SqlDBTableDataSetMapping, SqlDWTableDataSetMapping
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
@@ -453,7 +453,7 @@ class DataSetMapping(ProxyDto):
     }
 
     _subtype_map = {
-        'kind': {'Blob': 'BlobDataSetMapping', 'BlobFolder': 'BlobFolderDataSetMapping', 'Container': 'BlobContainerDataSetMapping', 'AdlsGen2File': 'ADLSGen2FileDataSetMapping', 'AdlsGen2Folder': 'ADLSGen2FolderDataSetMapping', 'AdlsGen2FileSystem': 'ADLSGen2FileSystemDataSetMapping', 'KustoCluster': 'KustoClusterDataSetMapping', 'KustoDatabase': 'KustoDatabaseDataSetMapping', 'SqlDWTable': 'SqlDWTableDataSetMapping', 'SqlDBTable': 'SqlDBTableDataSetMapping'}
+        'kind': {'AdlsGen2File': 'ADLSGen2FileDataSetMapping', 'AdlsGen2FileSystem': 'ADLSGen2FileSystemDataSetMapping', 'AdlsGen2Folder': 'ADLSGen2FolderDataSetMapping', 'Container': 'BlobContainerDataSetMapping', 'Blob': 'BlobDataSetMapping', 'BlobFolder': 'BlobFolderDataSetMapping', 'KustoCluster': 'KustoClusterDataSetMapping', 'KustoDatabase': 'KustoDatabaseDataSetMapping', 'SqlDBTable': 'SqlDBTableDataSetMapping', 'SqlDWTable': 'SqlDWTableDataSetMapping'}
     }
 
     def __init__(self, **kwargs) -> None: