diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/dscNode.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/dscNode.json
index 633ca5efd3c7..cd8d1b6e0905 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/dscNode.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/dscNode.json
@@ -695,6 +695,10 @@
           "items": {
             "$ref": "#/definitions/DscReportError"
           },
+          "x-ms-identifiers": [
+            "errorMessage",
+            "resourceId"
+          ],
           "description": "Gets or sets the errors for the node report."
         },
         "resources": {
@@ -702,6 +706,9 @@
           "items": {
             "$ref": "#/definitions/DscReportResource"
           },
+          "x-ms-identifiers": [
+            "resourceId"
+          ],
           "description": "Gets or sets the resource for the node report."
         },
         "metaConfiguration": {
@@ -753,6 +760,9 @@
           "items": {
             "$ref": "#/definitions/DscReportResourceNavigation"
           },
+          "x-ms-identifiers": [
+            "resourceId"
+          ],
           "description": "Gets or sets the Resource Navigation values for resources the resource depends on."
         },
         "moduleName": {
@@ -917,7 +927,10 @@
           "description": "Gets or sets the list of extensionHandler properties for a Node.",
           "items": {
             "$ref": "#/definitions/DscNodeExtensionHandlerAssociationProperty"
-          }
+          },
+          "x-ms-identifiers": [
+            "name"
+          ]
         }
       }
     },
diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/dscNodeCounts.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/dscNodeCounts.json
index 49015d524fcc..a3ccb64d762c 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/dscNodeCounts.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/dscNodeCounts.json
@@ -96,6 +96,9 @@
           "items": {
             "$ref": "#/definitions/NodeCount"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "Gets an array of counts"
         },
         "totalCount": {
diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/module.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/module.json
index ac5e33b46b28..1108344c5683 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/module.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/module.json
@@ -293,14 +293,14 @@
           }
         ],
         "responses": {
-          "201": {
-            "description": "Created",
+          "200": {
+            "description": "OK",
             "schema": {
               "$ref": "#/definitions/Module"
             }
           },
-          "200": {
-            "description": "OK",
+          "201": {
+            "description": "Created",
             "schema": {
               "$ref": "#/definitions/Module"
             }
@@ -646,6 +646,7 @@
           "items": {
             "$ref": "#/definitions/ActivityParameterValidationSet"
           },
+          "x-ms-identifiers": [],
           "description": "Gets or sets the validation set of activity parameter."
         }
       },
@@ -662,6 +663,7 @@
           "items": {
             "$ref": "#/definitions/ActivityParameter"
           },
+          "x-ms-identifiers": [],
           "description": "Gets or sets the parameters of the activity parameter set."
         }
       },
@@ -700,6 +702,9 @@
           "items": {
             "$ref": "#/definitions/ActivityParameterSet"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "Gets or sets the parameter sets of the activity."
         },
         "outputTypes": {
@@ -707,6 +712,9 @@
           "items": {
             "$ref": "#/definitions/ActivityOutputType"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "Gets or sets the output types of the activity."
         },
         "creationTime": {
@@ -1016,6 +1024,9 @@
           "items": {
             "$ref": "#/definitions/TypeField"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "Gets or sets a list of fields."
         }
       },
diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/python2package.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/python2package.json
index 1d2648cb0d52..b8709c3422ce 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/python2package.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/python2package.json
@@ -179,14 +179,14 @@
           }
         ],
         "responses": {
-          "201": {
-            "description": "Created",
+          "200": {
+            "description": "OK",
             "schema": {
               "$ref": "#/definitions/Module"
             }
           },
-          "200": {
-            "description": "OK",
+          "201": {
+            "description": "Created",
             "schema": {
               "$ref": "#/definitions/Module"
             }
@@ -353,6 +353,7 @@
           "items": {
             "$ref": "#/definitions/ActivityParameterValidationSet"
           },
+          "x-ms-identifiers": [],
           "description": "Gets or sets the validation set of activity parameter."
         }
       },
@@ -369,6 +370,7 @@
           "items": {
             "$ref": "#/definitions/ActivityParameter"
           },
+          "x-ms-identifiers": [],
           "description": "Gets or sets the parameters of the activity parameter set."
         }
       },
@@ -407,6 +409,9 @@
           "items": {
             "$ref": "#/definitions/ActivityParameterSet"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "Gets or sets the parameter sets of the activity."
         },
         "outputTypes": {
@@ -414,6 +419,9 @@
           "items": {
             "$ref": "#/definitions/ActivityOutputType"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "Gets or sets the output types of the activity."
         },
         "creationTime": {
@@ -693,6 +701,9 @@
           "items": {
             "$ref": "#/definitions/TypeField"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "Gets or sets a list of fields."
         }
       },
diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/schedule.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/schedule.json
index 580f29fddefc..954acfed640a 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/schedule.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2020-01-13-preview/schedule.json
@@ -82,14 +82,14 @@
           }
         ],
         "responses": {
-          "201": {
-            "description": "Created",
+          "200": {
+            "description": "OK",
             "schema": {
               "$ref": "#/definitions/Schedule"
             }
           },
-          "200": {
-            "description": "OK",
+          "201": {
+            "description": "Created",
             "schema": {
               "$ref": "#/definitions/Schedule"
             }
@@ -338,6 +338,7 @@
           "items": {
             "$ref": "#/definitions/AdvancedScheduleMonthlyOccurrence"
           },
+          "x-ms-identifiers": [],
           "description": "Occurrences of days within a month."
         }
       },
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2019-06-01/softwareUpdateConfiguration.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2019-06-01/softwareUpdateConfiguration.json
index 9800e7ff6dd2..c37b0845c4aa 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2019-06-01/softwareUpdateConfiguration.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2019-06-01/softwareUpdateConfiguration.json
@@ -635,6 +635,7 @@
           "items": {
             "$ref": "#/definitions/AdvancedScheduleMonthlyOccurrence"
           },
+          "x-ms-identifiers": [],
           "description": "Occurrences of days within a month."
         }
       },
@@ -762,7 +763,8 @@
           "items": {
             "type": "object",
             "$ref": "#/definitions/AzureQueryProperties"
-          }
+          },
+          "x-ms-identifiers": []
         },
         "nonAzureQueries": {
           "description": "List of non Azure queries in the software update configuration.",
@@ -770,7 +772,10 @@
           "items": {
             "type": "object",
             "$ref": "#/definitions/NonAzureQueryProperties"
-          }
+          },
+          "x-ms-identifiers": [
+            "workspaceId"
+          ]
         }
       }
     },
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/account.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/account.json
index 89b1edb9ed07..7306c73bd486 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/account.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/account.json
@@ -127,14 +127,14 @@
           }
         ],
         "responses": {
-          "201": {
-            "description": "Created",
+          "200": {
+            "description": "OK",
             "schema": {
               "$ref": "#/definitions/AutomationAccount"
             }
           },
-          "200": {
-            "description": "OK",
+          "201": {
+            "description": "Created",
             "schema": {
               "$ref": "#/definitions/AutomationAccount"
             }
@@ -802,6 +802,9 @@
           "items": {
             "$ref": "#/definitions/Key"
           },
+          "x-ms-identifiers": [
+            "KeyName"
+          ],
           "description": "Lists the automation keys."
         }
       }
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/hybridRunbookWorkerGroup.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/hybridRunbookWorkerGroup.json
index 47a98c4a58be..d5492806cec0 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/hybridRunbookWorkerGroup.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/hybridRunbookWorkerGroup.json
@@ -367,6 +367,9 @@
           "items": {
             "$ref": "#/definitions/HybridRunbookWorkerLegacy"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "Gets or sets the list of hybrid runbook workers."
         },
         "credential": {
diff --git a/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/operations.json b/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/operations.json
index 1c0c0b142abb..3a716400158d 100644
--- a/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/operations.json
+++ b/specification/automation/resource-manager/Microsoft.Automation/stable/2021-06-22/operations.json
@@ -130,6 +130,9 @@
           "items": {
             "$ref": "#/definitions/Operation"
           },
+          "x-ms-identifiers": [
+            "name"
+          ],
           "description": "List of Automation operations supported by the Automation resource provider."
         }
       },