diff --git a/schemas/2018-09-01-preview/Microsoft.Attestation.json b/schemas/2018-09-01-preview/Microsoft.Attestation.json
index 16a793d319..d0233af084 100644
--- a/schemas/2018-09-01-preview/Microsoft.Attestation.json
+++ b/schemas/2018-09-01-preview/Microsoft.Attestation.json
@@ -15,11 +15,19 @@
         },
         "location": {
           "type": "string",
-          "description": "The supported Azure location where the attestation service instance should be created."
+          "description": "The supported Azure location where the attestation provider should be created."
         },
         "name": {
-          "type": "string",
-          "description": "Name of the attestation service instance."
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9-]{3,24}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Name of the attestation provider."
         },
         "properties": {
           "oneOf": [
@@ -45,7 +53,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The tags that will be assigned to the attestation service instance."
+          "description": "The tags that will be assigned to the attestation provider."
         },
         "type": {
           "type": "string",
@@ -194,4 +202,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/2020-10-01/Microsoft.Attestation.json b/schemas/2020-10-01/Microsoft.Attestation.json
index a7f00d1f2e..6398fd6d6d 100644
--- a/schemas/2020-10-01/Microsoft.Attestation.json
+++ b/schemas/2020-10-01/Microsoft.Attestation.json
@@ -15,11 +15,19 @@
         },
         "location": {
           "type": "string",
-          "description": "The supported Azure location where the attestation service instance should be created."
+          "description": "The supported Azure location where the attestation provider should be created."
         },
         "name": {
-          "type": "string",
-          "description": "Name of the attestation service instance."
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^[a-zA-Z0-9-]{3,24}$"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Name of the attestation provider."
         },
         "properties": {
           "oneOf": [
@@ -30,7 +38,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Client supplied parameters used to create a new attestation service instance."
+          "description": "Client supplied parameters used to create a new attestation provider."
         },
         "tags": {
           "oneOf": [
@@ -45,7 +53,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The tags that will be assigned to the attestation service instance."
+          "description": "The tags that will be assigned to the attestation provider."
         },
         "type": {
           "type": "string",
@@ -79,7 +87,7 @@
           ]
         }
       },
-      "description": "Client supplied parameters used to create a new attestation service instance."
+      "description": "Client supplied parameters used to create a new attestation provider."
     },
     "JSONWebKey": {
       "type": "object",
@@ -190,4 +198,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}