diff --git a/schemas/2020-03-01-preview/Microsoft.DigitalTwins.json b/schemas/2020-03-01-preview/Microsoft.DigitalTwins.json
index 9e1a912450..554c55b1dc 100644
--- a/schemas/2020-03-01-preview/Microsoft.DigitalTwins.json
+++ b/schemas/2020-03-01-preview/Microsoft.DigitalTwins.json
@@ -18,15 +18,23 @@
           "description": "The resource location."
         },
         "name": {
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 64,
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(?!-)[A-Za-z0-9-]{3,63}(?<!-)$",
+              "minLength": 3,
+              "maxLength": 63
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
           "description": "The name of the DigitalTwinsInstance."
         },
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/DigitalTwinsProperties"
+              "$ref": "#/definitions/DigitalTwinsPropertiesModel"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -99,9 +107,9 @@
           "oneOf": [
             {
               "type": "string",
-              "pattern": "^[A-Za-z0-9-._]{1,64}$",
-              "minLength": 1,
-              "maxLength": 64
+              "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$",
+              "minLength": 2,
+              "maxLength": 49
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -112,7 +120,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties"
+              "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesModel"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -137,17 +145,17 @@
     }
   },
   "definitions": {
-    "DigitalTwinsEndpointResourceProperties": {
+    "DigitalTwinsEndpointResourcePropertiesModel": {
       "type": "object",
       "oneOf": [
         {
-          "$ref": "#/definitions/ServiceBus"
+          "$ref": "#/definitions/ServiceBusModel"
         },
         {
-          "$ref": "#/definitions/EventHub"
+          "$ref": "#/definitions/EventHubModel"
         },
         {
-          "$ref": "#/definitions/EventGrid"
+          "$ref": "#/definitions/EventGridModel"
         }
       ],
       "properties": {
@@ -182,9 +190,9 @@
           "oneOf": [
             {
               "type": "string",
-              "pattern": "^[A-Za-z0-9-._]{1,64}$",
-              "minLength": 1,
-              "maxLength": 64
+              "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$",
+              "minLength": 2,
+              "maxLength": 49
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -195,7 +203,7 @@
         "properties": {
           "oneOf": [
             {
-              "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties"
+              "$ref": "#/definitions/DigitalTwinsEndpointResourcePropertiesModel"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -218,7 +226,7 @@
       ],
       "description": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints"
     },
-    "DigitalTwinsProperties": {
+    "DigitalTwinsPropertiesModel": {
       "type": "object",
       "properties": {},
       "description": "The properties of a DigitalTwinsInstance."
@@ -246,7 +254,7 @@
       ],
       "description": "Information about the SKU of the DigitalTwinsInstance."
     },
-    "EventGrid": {
+    "EventGridModel": {
       "type": "object",
       "properties": {
         "accessKey1": {
@@ -275,7 +283,7 @@
       ],
       "description": "properties related to eventgrid."
     },
-    "EventHub": {
+    "EventHubModel": {
       "type": "object",
       "properties": {
         "connectionString-PrimaryKey": {
@@ -300,7 +308,7 @@
       ],
       "description": "properties related to eventhub."
     },
-    "ServiceBus": {
+    "ServiceBusModel": {
       "type": "object",
       "properties": {
         "endpointType": {
diff --git a/schemas/2020-10-31/Microsoft.DigitalTwins.json b/schemas/2020-10-31/Microsoft.DigitalTwins.json
new file mode 100644
index 0000000000..ec69b2aa05
--- /dev/null
+++ b/schemas/2020-10-31/Microsoft.DigitalTwins.json
@@ -0,0 +1,429 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2020-10-31/Microsoft.DigitalTwins.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.DigitalTwins",
+  "description": "Microsoft DigitalTwins Resource Types",
+  "resourceDefinitions": {
+    "digitalTwinsInstances": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-10-31"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "The resource location."
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(?!-)[A-Za-z0-9-]{3,63}(?<!-)$",
+              "minLength": 3,
+              "maxLength": 63
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the DigitalTwinsInstance."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DigitalTwinsProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The properties of a DigitalTwinsInstance."
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/digitalTwinsInstances_endpoints_childResource"
+              }
+            ]
+          }
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The resource tags."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.DigitalTwins/digitalTwinsInstances"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DigitalTwins/digitalTwinsInstances"
+    },
+    "digitalTwinsInstances_endpoints": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-10-31"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$",
+              "minLength": 2,
+              "maxLength": 49
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Name of Endpoint Resource."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties related to Digital Twins Endpoint"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints"
+    }
+  },
+  "definitions": {
+    "DigitalTwinsEndpointResourceProperties": {
+      "type": "object",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/ServiceBus"
+        },
+        {
+          "$ref": "#/definitions/EventHub"
+        },
+        {
+          "$ref": "#/definitions/EventGrid"
+        }
+      ],
+      "properties": {
+        "deadLetterSecret": {
+          "type": "string",
+          "description": "Dead letter storage secret. Will be obfuscated during read."
+        }
+      },
+      "description": "Properties related to Digital Twins Endpoint"
+    },
+    "DigitalTwinsEndpointResourcePropertiesModel": {
+      "type": "object",
+      "oneOf": [
+        {
+          "$ref": "#/definitions/ServiceBusModel"
+        },
+        {
+          "$ref": "#/definitions/EventHubModel"
+        },
+        {
+          "$ref": "#/definitions/EventGridModel"
+        }
+      ],
+      "properties": {
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The resource tags."
+        }
+      },
+      "description": "Properties related to Digital Twins Endpoint"
+    },
+    "digitalTwinsInstances_endpoints_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-10-31"
+          ]
+        },
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(?![0-9]+$)(?!-)[a-zA-Z0-9-]{2,49}[a-zA-Z0-9]$",
+              "minLength": 2,
+              "maxLength": 49
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Name of Endpoint Resource."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DigitalTwinsEndpointResourceProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Properties related to Digital Twins Endpoint"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "endpoints"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.DigitalTwins/digitalTwinsInstances/endpoints"
+    },
+    "DigitalTwinsProperties": {
+      "type": "object",
+      "properties": {},
+      "description": "The properties of a DigitalTwinsInstance."
+    },
+    "DigitalTwinsPropertiesModel": {
+      "type": "object",
+      "properties": {},
+      "description": "The properties of a DigitalTwinsInstance."
+    },
+    "DigitalTwinsSkuInfo": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "F1"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The name of the SKU."
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "Information about the SKU of the DigitalTwinsInstance."
+    },
+    "EventGrid": {
+      "type": "object",
+      "properties": {
+        "accessKey1": {
+          "type": "string",
+          "description": "EventGrid secondary accesskey. Will be obfuscated during read."
+        },
+        "accessKey2": {
+          "type": "string",
+          "description": "EventGrid secondary accesskey. Will be obfuscated during read."
+        },
+        "endpointType": {
+          "type": "string",
+          "enum": [
+            "EventGrid"
+          ]
+        },
+        "TopicEndpoint": {
+          "type": "string",
+          "description": "EventGrid Topic Endpoint"
+        }
+      },
+      "required": [
+        "accessKey1",
+        "endpointType",
+        "TopicEndpoint"
+      ],
+      "description": "Properties related to EventGrid."
+    },
+    "EventGridModel": {
+      "type": "object",
+      "properties": {
+        "accessKey1": {
+          "type": "string",
+          "description": "EventGrid secondary accesskey. Will be obfuscated during read"
+        },
+        "accessKey2": {
+          "type": "string",
+          "description": "EventGrid secondary accesskey. Will be obfuscated during read"
+        },
+        "endpointType": {
+          "type": "string",
+          "enum": [
+            "EventGrid"
+          ]
+        },
+        "TopicEndpoint": {
+          "type": "string",
+          "description": "EventGrid Topic Endpoint"
+        }
+      },
+      "required": [
+        "accessKey1",
+        "accessKey2",
+        "endpointType"
+      ],
+      "description": "properties related to eventgrid."
+    },
+    "EventHub": {
+      "type": "object",
+      "properties": {
+        "connectionStringPrimaryKey": {
+          "type": "string",
+          "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read."
+        },
+        "connectionStringSecondaryKey": {
+          "type": "string",
+          "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read."
+        },
+        "endpointType": {
+          "type": "string",
+          "enum": [
+            "EventHub"
+          ]
+        }
+      },
+      "required": [
+        "connectionStringPrimaryKey",
+        "endpointType"
+      ],
+      "description": "Properties related to EventHub."
+    },
+    "EventHubModel": {
+      "type": "object",
+      "properties": {
+        "connectionString-PrimaryKey": {
+          "type": "string",
+          "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read"
+        },
+        "connectionString-SecondaryKey": {
+          "type": "string",
+          "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read"
+        },
+        "endpointType": {
+          "type": "string",
+          "enum": [
+            "EventHub"
+          ]
+        }
+      },
+      "required": [
+        "connectionString-PrimaryKey",
+        "connectionString-SecondaryKey",
+        "endpointType"
+      ],
+      "description": "properties related to eventhub."
+    },
+    "ServiceBus": {
+      "type": "object",
+      "properties": {
+        "endpointType": {
+          "type": "string",
+          "enum": [
+            "ServiceBus"
+          ]
+        },
+        "primaryConnectionString": {
+          "type": "string",
+          "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read."
+        },
+        "secondaryConnectionString": {
+          "type": "string",
+          "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read."
+        }
+      },
+      "required": [
+        "endpointType",
+        "primaryConnectionString"
+      ],
+      "description": "Properties related to ServiceBus."
+    },
+    "ServiceBusModel": {
+      "type": "object",
+      "properties": {
+        "endpointType": {
+          "type": "string",
+          "enum": [
+            "ServiceBus"
+          ]
+        },
+        "primaryConnectionString": {
+          "type": "string",
+          "description": "PrimaryConnectionString of the endpoint. Will be obfuscated during read"
+        },
+        "secondaryConnectionString": {
+          "type": "string",
+          "description": "SecondaryConnectionString of the endpoint. Will be obfuscated during read"
+        }
+      },
+      "required": [
+        "endpointType",
+        "primaryConnectionString",
+        "secondaryConnectionString"
+      ],
+      "description": "properties related to servicebus."
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
index b24fabf5fe..4aa13c400e 100644
--- a/schemas/common/autogeneratedResources.json
+++ b/schemas/common/autogeneratedResources.json
@@ -2440,6 +2440,12 @@
         {
           "$ref": "https://schema.management.azure.com/schemas/2020-03-01-preview/Microsoft.DigitalTwins.json#/resourceDefinitions/digitalTwinsInstances_endpoints"
         },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-10-31/Microsoft.DigitalTwins.json#/resourceDefinitions/digitalTwinsInstances"
+        },
+        {
+          "$ref": "https://schema.management.azure.com/schemas/2020-10-31/Microsoft.DigitalTwins.json#/resourceDefinitions/digitalTwinsInstances_endpoints"
+        },
         {
           "$ref": "https://schema.management.azure.com/schemas/2015-04-08/Microsoft.DocumentDB.json#/resourceDefinitions/databaseAccounts"
         },