diff --git a/schemas/2017-12-01-preview/Microsoft.DBforPostgreSQL.json b/schemas/2017-12-01-preview/Microsoft.DBforPostgreSQL.json
index b591fab79a..f73c12a59f 100644
--- a/schemas/2017-12-01-preview/Microsoft.DBforPostgreSQL.json
+++ b/schemas/2017-12-01-preview/Microsoft.DBforPostgreSQL.json
@@ -1,8 +1,8 @@
 {
   "id": "https://schema.management.azure.com/schemas/2017-12-01-preview/Microsoft.DBforPostgreSQL.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBForPostgreSQL",
-  "description": "Microsoft DBForPostgreSQL Resource Types",
+  "title": "Microsoft.DBforPostgreSQL",
+  "description": "Microsoft DBforPostgreSQL Resource Types",
   "resourceDefinitions": {
     "servers": {
       "type": "object",
@@ -86,7 +86,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers"
+            "Microsoft.DBforPostgreSQL/servers"
           ]
         }
       },
@@ -97,7 +97,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers"
+      "description": "Microsoft.DBforPostgreSQL/servers"
     },
     "servers_administrators": {
       "type": "object",
@@ -133,7 +133,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/administrators"
+            "Microsoft.DBforPostgreSQL/servers/administrators"
           ]
         }
       },
@@ -143,7 +143,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/administrators"
+      "description": "Microsoft.DBforPostgreSQL/servers/administrators"
     },
     "servers_configurations": {
       "type": "object",
@@ -172,7 +172,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/configurations"
+            "Microsoft.DBforPostgreSQL/servers/configurations"
           ]
         }
       },
@@ -182,7 +182,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/configurations"
+      "description": "Microsoft.DBforPostgreSQL/servers/configurations"
     },
     "servers_databases": {
       "type": "object",
@@ -211,7 +211,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/databases"
+            "Microsoft.DBforPostgreSQL/servers/databases"
           ]
         }
       },
@@ -221,7 +221,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/databases"
+      "description": "Microsoft.DBforPostgreSQL/servers/databases"
     },
     "servers_firewallRules": {
       "type": "object",
@@ -250,7 +250,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/firewallRules"
+            "Microsoft.DBforPostgreSQL/servers/firewallRules"
           ]
         }
       },
@@ -260,7 +260,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/firewallRules"
+      "description": "Microsoft.DBforPostgreSQL/servers/firewallRules"
     },
     "servers_securityAlertPolicies": {
       "type": "object",
@@ -297,7 +297,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/securityAlertPolicies"
+            "Microsoft.DBforPostgreSQL/servers/securityAlertPolicies"
           ]
         }
       },
@@ -307,7 +307,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/securityAlertPolicies"
+      "description": "Microsoft.DBforPostgreSQL/servers/securityAlertPolicies"
     },
     "servers_virtualNetworkRules": {
       "type": "object",
@@ -336,7 +336,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/virtualNetworkRules"
+            "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules"
           ]
         }
       },
@@ -346,7 +346,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/virtualNetworkRules"
+      "description": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules"
     }
   },
   "definitions": {
@@ -761,7 +761,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/administrators"
+      "description": "Microsoft.DBforPostgreSQL/servers/administrators"
     },
     "servers_configurations_childResource": {
       "type": "object",
@@ -800,7 +800,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/configurations"
+      "description": "Microsoft.DBforPostgreSQL/servers/configurations"
     },
     "servers_databases_childResource": {
       "type": "object",
@@ -839,7 +839,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/databases"
+      "description": "Microsoft.DBforPostgreSQL/servers/databases"
     },
     "servers_firewallRules_childResource": {
       "type": "object",
@@ -878,7 +878,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/firewallRules"
+      "description": "Microsoft.DBforPostgreSQL/servers/firewallRules"
     },
     "servers_securityAlertPolicies_childResource": {
       "type": "object",
@@ -920,7 +920,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/securityAlertPolicies"
+      "description": "Microsoft.DBforPostgreSQL/servers/securityAlertPolicies"
     },
     "servers_virtualNetworkRules_childResource": {
       "type": "object",
@@ -959,7 +959,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/virtualNetworkRules"
+      "description": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules"
     },
     "Sku": {
       "type": "object",
diff --git a/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json b/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json
index 47b16c00ae..915953d2bc 100644
--- a/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json
+++ b/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json
@@ -1,8 +1,8 @@
 {
   "id": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBForPostgreSQL",
-  "description": "Microsoft DBForPostgreSQL Resource Types",
+  "title": "Microsoft.DBforPostgreSQL",
+  "description": "Microsoft DBforPostgreSQL Resource Types",
   "resourceDefinitions": {
     "servers": {
       "type": "object",
@@ -97,7 +97,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers"
+            "Microsoft.DBforPostgreSQL/servers"
           ]
         }
       },
@@ -108,7 +108,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers"
+      "description": "Microsoft.DBforPostgreSQL/servers"
     },
     "servers_administrators": {
       "type": "object",
@@ -144,7 +144,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/administrators"
+            "Microsoft.DBforPostgreSQL/servers/administrators"
           ]
         }
       },
@@ -154,7 +154,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/administrators"
+      "description": "Microsoft.DBforPostgreSQL/servers/administrators"
     },
     "servers_configurations": {
       "type": "object",
@@ -183,7 +183,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/configurations"
+            "Microsoft.DBforPostgreSQL/servers/configurations"
           ]
         }
       },
@@ -193,7 +193,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/configurations"
+      "description": "Microsoft.DBforPostgreSQL/servers/configurations"
     },
     "servers_databases": {
       "type": "object",
@@ -222,7 +222,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/databases"
+            "Microsoft.DBforPostgreSQL/servers/databases"
           ]
         }
       },
@@ -232,7 +232,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/databases"
+      "description": "Microsoft.DBforPostgreSQL/servers/databases"
     },
     "servers_firewallRules": {
       "type": "object",
@@ -261,7 +261,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/firewallRules"
+            "Microsoft.DBforPostgreSQL/servers/firewallRules"
           ]
         }
       },
@@ -271,7 +271,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/firewallRules"
+      "description": "Microsoft.DBforPostgreSQL/servers/firewallRules"
     },
     "servers_securityAlertPolicies": {
       "type": "object",
@@ -347,7 +347,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSQL/servers/virtualNetworkRules"
+            "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules"
           ]
         }
       },
@@ -357,7 +357,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/virtualNetworkRules"
+      "description": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules"
     }
   },
   "definitions": {
@@ -822,7 +822,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/administrators"
+      "description": "Microsoft.DBforPostgreSQL/servers/administrators"
     },
     "servers_configurations_childResource": {
       "type": "object",
@@ -861,7 +861,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/configurations"
+      "description": "Microsoft.DBforPostgreSQL/servers/configurations"
     },
     "servers_databases_childResource": {
       "type": "object",
@@ -900,7 +900,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/databases"
+      "description": "Microsoft.DBforPostgreSQL/servers/databases"
     },
     "servers_firewallRules_childResource": {
       "type": "object",
@@ -939,7 +939,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/firewallRules"
+      "description": "Microsoft.DBforPostgreSQL/servers/firewallRules"
     },
     "servers_securityAlertPolicies_childResource": {
       "type": "object",
@@ -1020,7 +1020,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSQL/servers/virtualNetworkRules"
+      "description": "Microsoft.DBforPostgreSQL/servers/virtualNetworkRules"
     },
     "Sku": {
       "type": "object",
diff --git a/schemas/2018-05-01/subscriptionDeploymentTemplate.json b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
index 4cc4f2546a..d334f61b6d 100644
--- a/schemas/2018-05-01/subscriptionDeploymentTemplate.json
+++ b/schemas/2018-05-01/subscriptionDeploymentTemplate.json
@@ -49,7 +49,7 @@
     },
     "resources": {
       "description": "Collection of resources to be deployed",
-      "oneOf":[
+      "oneOf": [
         {
           "$ref": "#/definitions/resourcesWithoutSymbolicNames"
         },
@@ -987,14 +987,14 @@
         }
       ]
     },
-    "resourcesWithSymbolicNames":{
+    "resourcesWithSymbolicNames": {
       "type": "object",
       "description": "Resources with symbolic names",
       "additionalProperties": {
         "$ref": "#/definitions/resource"
       }
     },
-    "resourcesWithoutSymbolicNames":{
+    "resourcesWithoutSymbolicNames": {
       "type": "array",
       "description": "Resources without symbolic names",
       "items": {
diff --git a/schemas/2019-08-01/managementGroupDeploymentTemplate.json b/schemas/2019-08-01/managementGroupDeploymentTemplate.json
index f416520a44..58373db30f 100644
--- a/schemas/2019-08-01/managementGroupDeploymentTemplate.json
+++ b/schemas/2019-08-01/managementGroupDeploymentTemplate.json
@@ -49,7 +49,7 @@
     },
     "resources": {
       "description": "Collection of resources to be deployed",
-      "oneOf":[
+      "oneOf": [
         {
           "$ref": "#/definitions/resourcesWithoutSymbolicNames"
         },
@@ -678,14 +678,14 @@
         }
       ]
     },
-    "resourcesWithSymbolicNames":{
+    "resourcesWithSymbolicNames": {
       "type": "object",
       "description": "Resources with symbolic names",
       "additionalProperties": {
         "$ref": "#/definitions/resource"
       }
     },
-    "resourcesWithoutSymbolicNames":{
+    "resourcesWithoutSymbolicNames": {
       "type": "array",
       "description": "Resources without symbolic names",
       "items": {
diff --git a/schemas/2019-08-01/tenantDeploymentTemplate.json b/schemas/2019-08-01/tenantDeploymentTemplate.json
index 87842fe07a..3b81972126 100644
--- a/schemas/2019-08-01/tenantDeploymentTemplate.json
+++ b/schemas/2019-08-01/tenantDeploymentTemplate.json
@@ -49,7 +49,7 @@
     },
     "resources": {
       "description": "Collection of resources to be deployed",
-      "oneOf":[
+      "oneOf": [
         {
           "$ref": "#/definitions/resourcesWithoutSymbolicNames"
         },
@@ -798,14 +798,14 @@
         }
       ]
     },
-    "resourcesWithSymbolicNames":{
+    "resourcesWithSymbolicNames": {
       "type": "object",
       "description": "Resources with symbolic names",
       "additionalProperties": {
         "$ref": "#/definitions/resource"
       }
     },
-    "resourcesWithoutSymbolicNames":{
+    "resourcesWithoutSymbolicNames": {
       "type": "array",
       "description": "Resources without symbolic names",
       "items": {
diff --git a/schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json b/schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json
index 63c0a46416..16dda93edd 100644
--- a/schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json
+++ b/schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json
@@ -1,8 +1,8 @@
 {
   "id": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBForPostgreSql",
-  "description": "Microsoft DBForPostgreSql Resource Types",
+  "title": "Microsoft.DBforPostgreSQL",
+  "description": "Microsoft DBforPostgreSQL Resource Types",
   "resourceDefinitions": {
     "flexibleServers": {
       "type": "object",
@@ -85,7 +85,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers"
+            "Microsoft.DBforPostgreSQL/flexibleServers"
           ]
         }
       },
@@ -96,7 +96,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers"
     },
     "flexibleServers_configurations": {
       "type": "object",
@@ -125,7 +125,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers/configurations"
+            "Microsoft.DBforPostgreSQL/flexibleServers/configurations"
           ]
         }
       },
@@ -135,7 +135,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/configurations"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/configurations"
     },
     "flexibleServers_firewallRules": {
       "type": "object",
@@ -164,7 +164,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
+            "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules"
           ]
         }
       },
@@ -174,7 +174,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules"
     }
   },
   "definitions": {
@@ -295,7 +295,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/configurations"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/configurations"
     },
     "flexibleServers_firewallRules_childResource": {
       "type": "object",
@@ -334,7 +334,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules"
     },
     "HighAvailability": {
       "type": "object",
diff --git a/schemas/2021-06-01/Microsoft.DBforPostgreSQL.json b/schemas/2021-06-01/Microsoft.DBforPostgreSQL.json
index 171e0ad967..a73f175314 100644
--- a/schemas/2021-06-01/Microsoft.DBforPostgreSQL.json
+++ b/schemas/2021-06-01/Microsoft.DBforPostgreSQL.json
@@ -1,8 +1,8 @@
 {
   "id": "https://schema.management.azure.com/schemas/2021-06-01/Microsoft.DBforPostgreSQL.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Microsoft.DBForPostgreSql",
-  "description": "Microsoft DBForPostgreSql Resource Types",
+  "title": "Microsoft.DBforPostgreSQL",
+  "description": "Microsoft DBforPostgreSQL Resource Types",
   "resourceDefinitions": {
     "flexibleServers": {
       "type": "object",
@@ -88,7 +88,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers"
+            "Microsoft.DBforPostgreSQL/flexibleServers"
           ]
         }
       },
@@ -99,7 +99,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers"
     },
     "flexibleServers_configurations": {
       "type": "object",
@@ -128,7 +128,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers/configurations"
+            "Microsoft.DBforPostgreSQL/flexibleServers/configurations"
           ]
         }
       },
@@ -138,7 +138,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/configurations"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/configurations"
     },
     "flexibleServers_databases": {
       "type": "object",
@@ -167,7 +167,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers/databases"
+            "Microsoft.DBforPostgreSQL/flexibleServers/databases"
           ]
         }
       },
@@ -177,7 +177,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/databases"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/databases"
     },
     "flexibleServers_firewallRules": {
       "type": "object",
@@ -206,7 +206,7 @@
         "type": {
           "type": "string",
           "enum": [
-            "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
+            "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules"
           ]
         }
       },
@@ -216,7 +216,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules"
     }
   },
   "definitions": {
@@ -351,7 +351,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/configurations"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/configurations"
     },
     "flexibleServers_databases_childResource": {
       "type": "object",
@@ -390,7 +390,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/databases"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/databases"
     },
     "flexibleServers_firewallRules_childResource": {
       "type": "object",
@@ -429,7 +429,7 @@
         "properties",
         "type"
       ],
-      "description": "Microsoft.DBForPostgreSql/flexibleServers/firewallRules"
+      "description": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules"
     },
     "HighAvailability": {
       "type": "object",