diff --git a/schemas/2014-04-01/Microsoft.Sql.json b/schemas/2014-04-01/Microsoft.Sql.json
index 046df89586..2e7a453195 100644
--- a/schemas/2014-04-01/Microsoft.Sql.json
+++ b/schemas/2014-04-01/Microsoft.Sql.json
@@ -24,7 +24,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ServerPropertiesModel"
+              "$ref": "#/definitions/ServerProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -160,7 +160,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/AdvisorPropertiesModel"
+              "$ref": "#/definitions/AdvisorProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -422,7 +422,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/AdvisorPropertiesModel"
+              "$ref": "#/definitions/AdvisorProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -874,7 +874,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ElasticPoolPropertiesModel"
+              "$ref": "#/definitions/ElasticPoolProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -954,7 +954,7 @@
     }
   },
   "definitions": {
-    "AdvisorPropertiesModel": {
+    "AdvisorProperties": {
       "type": "object",
       "properties": {
         "autoExecuteValue": {
@@ -1032,10 +1032,7 @@
                 "PointInTimeRestore",
                 "Recovery",
                 "Restore",
-                "RestoreLongTermRetentionBackup",
-                "Secondary",
-                "RestoreExternalBackup",
-                "RestoreExternalBackupSecondary"
+                "RestoreLongTermRetentionBackup"
               ]
             },
             {
@@ -1191,16 +1188,14 @@
         "restorePointInTime": {
           "type": "string",
           "format": "date-time",
-          "description": "Specifies the point in time (ISO8601 format) of the source database that will be restored to create the new database."
+          "description": "Conditional. If createMode is PointInTimeRestore, this value is required. If createMode is Restore, this value is optional. Specifies the point in time (ISO8601 format) of the source database that will be restored to create the new database. Must be greater than or equal to the source database's earliestRestoreDate value."
         },
         "sampleName": {
           "oneOf": [
             {
               "type": "string",
               "enum": [
-                "AdventureWorksLT",
-                "WideWorldImportersStd",
-                "WideWorldImportersFull"
+                "AdventureWorksLT"
               ]
             },
             {
@@ -1212,11 +1207,11 @@
         "sourceDatabaseDeletionDate": {
           "type": "string",
           "format": "date-time",
-          "description": "Specifies the time that the database was deleted."
+          "description": "Conditional. If createMode is Restore and sourceDatabaseId is the deleted database's original resource id when it existed (as opposed to its current restorable dropped database id), then this value is required. Specifies the time that the database was deleted."
         },
         "sourceDatabaseId": {
           "type": "string",
-          "description": "The resource identifier of the source database associated with create operation of this database."
+          "description": "Conditional. If createMode is Copy, NonReadableSecondary, OnlineSecondary, PointInTimeRestore, Recovery, or Restore, then this value is required. Specifies the resource ID of the source database. If createMode is NonReadableSecondary or OnlineSecondary, the name of the source database must be the same as the new database being created."
         },
         "zoneRedundant": {
           "oneOf": [
@@ -1486,7 +1481,7 @@
       ],
       "description": "The properties of a database data masking rule."
     },
-    "ElasticPoolPropertiesModel": {
+    "ElasticPoolProperties": {
       "type": "object",
       "properties": {
         "databaseDtuMax": {
@@ -1773,7 +1768,7 @@
       ],
       "description": "The properties of a server secure connection policy."
     },
-    "ServerPropertiesModel": {
+    "ServerProperties": {
       "type": "object",
       "properties": {
         "administratorLogin": {
@@ -1860,7 +1855,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/AdvisorPropertiesModel"
+              "$ref": "#/definitions/AdvisorProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2022,7 +2017,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/AdvisorPropertiesModel"
+              "$ref": "#/definitions/AdvisorProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2488,7 +2483,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/ElasticPoolPropertiesModel"
+              "$ref": "#/definitions/ElasticPoolProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2646,4 +2641,4 @@
       "description": "Represents the properties of a database transparent data encryption."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2015-05-01-preview/Microsoft.Sql.json b/schemas/2015-05-01-preview/Microsoft.Sql.json
index b0d4ffc0d7..09306b0051 100644
--- a/schemas/2015-05-01-preview/Microsoft.Sql.json
+++ b/schemas/2015-05-01-preview/Microsoft.Sql.json
@@ -243,7 +243,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/SyncGroupPropertiesModel"
+              "$ref": "#/definitions/SyncGroupProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -292,7 +292,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/SyncMemberPropertiesModel"
+              "$ref": "#/definitions/SyncMemberProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -824,7 +824,7 @@
       ],
       "description": "Read-write endpoint of the failover group instance."
     },
-    "FirewallRuleModel": {
+    "FirewallRule": {
       "type": "object",
       "properties": {
         "name": {
@@ -1093,7 +1093,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/SyncMemberPropertiesModel"
+              "$ref": "#/definitions/SyncMemberProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1418,7 +1418,7 @@
       },
       "description": "Properties of an Azure SQL Database sync agent."
     },
-    "SyncGroupPropertiesModel": {
+    "SyncGroupProperties": {
       "type": "object",
       "properties": {
         "conflictResolutionPolicy": {
@@ -1539,7 +1539,7 @@
       },
       "description": "Properties of column in sync group table."
     },
-    "SyncMemberPropertiesModel": {
+    "SyncMemberProperties": {
       "type": "object",
       "properties": {
         "databaseName": {
@@ -1633,4 +1633,4 @@
       "description": "Properties of a virtual network rule."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2017-03-01-preview/Microsoft.Sql.json b/schemas/2017-03-01-preview/Microsoft.Sql.json
index 19b22c572d..e30dea911b 100644
--- a/schemas/2017-03-01-preview/Microsoft.Sql.json
+++ b/schemas/2017-03-01-preview/Microsoft.Sql.json
@@ -378,7 +378,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/DatabasePropertiesModel"
+              "$ref": "#/definitions/DatabaseProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1247,7 +1247,7 @@
       ],
       "description": "Properties of a database blob auditing policy."
     },
-    "DatabasePropertiesModel": {
+    "DatabaseProperties": {
       "type": "object",
       "properties": {
         "catalogCollation": {
@@ -1274,17 +1274,16 @@
             {
               "type": "string",
               "enum": [
-                "Copy",
                 "Default",
-                "NonReadableSecondary",
+                "Copy",
+                "Secondary",
                 "OnlineSecondary",
                 "PointInTimeRestore",
-                "Recovery",
                 "Restore",
-                "RestoreLongTermRetentionBackup",
-                "Secondary",
+                "Recovery",
                 "RestoreExternalBackup",
-                "RestoreExternalBackupSecondary"
+                "RestoreExternalBackupSecondary",
+                "RestoreLongTermRetentionBackup"
               ]
             },
             {
@@ -1840,7 +1839,7 @@
           "oneOf": [
             {
               "type": "number",
-              "default": 2
+              "default": 2.0
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2992,4 +2991,4 @@
       "description": "Properties of a Vulnerability Assessment recurring scans."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2017-10-01-preview/Microsoft.Sql.json b/schemas/2017-10-01-preview/Microsoft.Sql.json
index 86f5bf98f7..99ebd18f0a 100644
--- a/schemas/2017-10-01-preview/Microsoft.Sql.json
+++ b/schemas/2017-10-01-preview/Microsoft.Sql.json
@@ -480,17 +480,16 @@
             {
               "type": "string",
               "enum": [
-                "Copy",
                 "Default",
-                "NonReadableSecondary",
-                "OnlineSecondary",
+                "Copy",
+                "Secondary",
                 "PointInTimeRestore",
-                "Recovery",
                 "Restore",
-                "RestoreLongTermRetentionBackup",
-                "Secondary",
+                "Recovery",
                 "RestoreExternalBackup",
-                "RestoreExternalBackupSecondary"
+                "RestoreExternalBackupSecondary",
+                "RestoreLongTermRetentionBackup",
+                "OnlineSecondary"
               ]
             },
             {
@@ -1102,4 +1101,4 @@
       "description": "Properties of a Vulnerability Assessment recurring scans."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2018-06-01-preview/Microsoft.Sql.json b/schemas/2018-06-01-preview/Microsoft.Sql.json
index 850e9335ae..0139f07098 100644
--- a/schemas/2018-06-01-preview/Microsoft.Sql.json
+++ b/schemas/2018-06-01-preview/Microsoft.Sql.json
@@ -1358,4 +1358,4 @@
       "description": "Properties of a Vulnerability Assessment recurring scans."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2019-06-01-preview/Microsoft.Sql.json b/schemas/2019-06-01-preview/Microsoft.Sql.json
index 6fd77337fe..4d21f9273e 100644
--- a/schemas/2019-06-01-preview/Microsoft.Sql.json
+++ b/schemas/2019-06-01-preview/Microsoft.Sql.json
@@ -213,7 +213,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/DatabasePropertiesModel"
+              "$ref": "#/definitions/DatabaseProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -507,7 +507,7 @@
       ],
       "description": "Properties of a active directory administrator."
     },
-    "DatabasePropertiesModel": {
+    "DatabaseProperties": {
       "type": "object",
       "properties": {
         "autoPauseDelay": {
@@ -545,17 +545,16 @@
             {
               "type": "string",
               "enum": [
-                "Copy",
                 "Default",
-                "NonReadableSecondary",
-                "OnlineSecondary",
+                "Copy",
+                "Secondary",
                 "PointInTimeRestore",
-                "Recovery",
                 "Restore",
-                "RestoreLongTermRetentionBackup",
-                "Secondary",
+                "Recovery",
                 "RestoreExternalBackup",
-                "RestoreExternalBackupSecondary"
+                "RestoreExternalBackupSecondary",
+                "RestoreLongTermRetentionBackup",
+                "OnlineSecondary"
               ]
             },
             {
@@ -898,7 +897,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/DatabasePropertiesModel"
+              "$ref": "#/definitions/DatabaseProperties"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1460,4 +1459,4 @@
       "description": "Workload group definition. For more information look at sys.workload_management_workload_groups (DMV)."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2020-02-02-preview/Microsoft.Sql.json b/schemas/2020-02-02-preview/Microsoft.Sql.json
index ba8107539c..78242a729f 100644
--- a/schemas/2020-02-02-preview/Microsoft.Sql.json
+++ b/schemas/2020-02-02-preview/Microsoft.Sql.json
@@ -969,4 +969,4 @@
       "description": "An ARM Resource SKU."
     }
   }
-}
\ No newline at end of file
+}