diff --git a/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_list_keys_result.py b/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_list_keys_result.py
index 8da636886258..efa9d72c9d13 100644
--- a/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_list_keys_result.py
+++ b/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_list_keys_result.py
@@ -9,46 +9,44 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .database_account_list_read_only_keys_result import DatabaseAccountListReadOnlyKeysResult
 
 
-class DatabaseAccountListKeysResult(Model):
+class DatabaseAccountListKeysResult(DatabaseAccountListReadOnlyKeysResult):
     """The access keys for the given database account.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar primary_master_key: Base 64 encoded value of the primary read-write
-     key.
-    :vartype primary_master_key: str
-    :ivar secondary_master_key: Base 64 encoded value of the secondary
-     read-write key.
-    :vartype secondary_master_key: str
     :ivar primary_readonly_master_key: Base 64 encoded value of the primary
      read-only key.
     :vartype primary_readonly_master_key: str
     :ivar secondary_readonly_master_key: Base 64 encoded value of the
      secondary read-only key.
     :vartype secondary_readonly_master_key: str
+    :ivar primary_master_key: Base 64 encoded value of the primary read-write
+     key.
+    :vartype primary_master_key: str
+    :ivar secondary_master_key: Base 64 encoded value of the secondary
+     read-write key.
+    :vartype secondary_master_key: str
     """
 
     _validation = {
-        'primary_master_key': {'readonly': True},
-        'secondary_master_key': {'readonly': True},
         'primary_readonly_master_key': {'readonly': True},
         'secondary_readonly_master_key': {'readonly': True},
+        'primary_master_key': {'readonly': True},
+        'secondary_master_key': {'readonly': True},
     }
 
     _attribute_map = {
+        'primary_readonly_master_key': {'key': 'primaryReadonlyMasterKey', 'type': 'str'},
+        'secondary_readonly_master_key': {'key': 'secondaryReadonlyMasterKey', 'type': 'str'},
         'primary_master_key': {'key': 'primaryMasterKey', 'type': 'str'},
         'secondary_master_key': {'key': 'secondaryMasterKey', 'type': 'str'},
-        'primary_readonly_master_key': {'key': 'properties.primaryReadonlyMasterKey', 'type': 'str'},
-        'secondary_readonly_master_key': {'key': 'properties.secondaryReadonlyMasterKey', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(DatabaseAccountListKeysResult, self).__init__(**kwargs)
         self.primary_master_key = None
         self.secondary_master_key = None
-        self.primary_readonly_master_key = None
-        self.secondary_readonly_master_key = None
diff --git a/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_list_keys_result_py3.py b/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_list_keys_result_py3.py
index 3b060e748026..8a8a2f0c0a2d 100644
--- a/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_list_keys_result_py3.py
+++ b/sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/models/database_account_list_keys_result_py3.py
@@ -9,46 +9,44 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .database_account_list_read_only_keys_result_py3 import DatabaseAccountListReadOnlyKeysResult
 
 
-class DatabaseAccountListKeysResult(Model):
+class DatabaseAccountListKeysResult(DatabaseAccountListReadOnlyKeysResult):
     """The access keys for the given database account.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar primary_master_key: Base 64 encoded value of the primary read-write
-     key.
-    :vartype primary_master_key: str
-    :ivar secondary_master_key: Base 64 encoded value of the secondary
-     read-write key.
-    :vartype secondary_master_key: str
     :ivar primary_readonly_master_key: Base 64 encoded value of the primary
      read-only key.
     :vartype primary_readonly_master_key: str
     :ivar secondary_readonly_master_key: Base 64 encoded value of the
      secondary read-only key.
     :vartype secondary_readonly_master_key: str
+    :ivar primary_master_key: Base 64 encoded value of the primary read-write
+     key.
+    :vartype primary_master_key: str
+    :ivar secondary_master_key: Base 64 encoded value of the secondary
+     read-write key.
+    :vartype secondary_master_key: str
     """
 
     _validation = {
-        'primary_master_key': {'readonly': True},
-        'secondary_master_key': {'readonly': True},
         'primary_readonly_master_key': {'readonly': True},
         'secondary_readonly_master_key': {'readonly': True},
+        'primary_master_key': {'readonly': True},
+        'secondary_master_key': {'readonly': True},
     }
 
     _attribute_map = {
+        'primary_readonly_master_key': {'key': 'primaryReadonlyMasterKey', 'type': 'str'},
+        'secondary_readonly_master_key': {'key': 'secondaryReadonlyMasterKey', 'type': 'str'},
         'primary_master_key': {'key': 'primaryMasterKey', 'type': 'str'},
         'secondary_master_key': {'key': 'secondaryMasterKey', 'type': 'str'},
-        'primary_readonly_master_key': {'key': 'properties.primaryReadonlyMasterKey', 'type': 'str'},
-        'secondary_readonly_master_key': {'key': 'properties.secondaryReadonlyMasterKey', 'type': 'str'},
     }
 
     def __init__(self, **kwargs) -> None:
         super(DatabaseAccountListKeysResult, self).__init__(**kwargs)
         self.primary_master_key = None
         self.secondary_master_key = None
-        self.primary_readonly_master_key = None
-        self.secondary_readonly_master_key = None