diff --git a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/IPolicyCertificatesOperations.cs b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/IPolicyCertificatesOperations.cs
index 9ef216e1b229..2885b9eb7ab5 100644
--- a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/IPolicyCertificatesOperations.cs
+++ b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/IPolicyCertificatesOperations.cs
@@ -55,7 +55,7 @@ public partial interface IPolicyCertificatesOperations
         /// </param>
         /// <param name='policyCertificateToAdd'>
         /// An RFC7519 JSON Web Token containing a claim named
-        /// "aas-policyCertificate" whose value is an RFC7517 JSON Web Key
+        /// "maa-policyCertificate" whose value is an RFC7517 JSON Web Key
         /// which specifies a new key to add. The RFC7519 JWT must be signed
         /// with one of the existing signing certificates
         /// </param>
@@ -84,7 +84,7 @@ public partial interface IPolicyCertificatesOperations
         /// </param>
         /// <param name='policyCertificateToRemove'>
         /// An RFC7519 JSON Web Token containing a claim named
-        /// "aas-policyCertificate" whose value is an RFC7517 JSON Web Key
+        /// "maa-policyCertificate" whose value is an RFC7517 JSON Web Key
         /// which specifies a new key to update. The RFC7519 JWT must be signed
         /// with one of the existing signing certificates
         /// </param>
diff --git a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/ISigningCertificatesOperations.cs b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/ISigningCertificatesOperations.cs
index 055aa1857186..9332957a7931 100644
--- a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/ISigningCertificatesOperations.cs
+++ b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/ISigningCertificatesOperations.cs
@@ -24,11 +24,11 @@ namespace Microsoft.Azure.Attestation
     public partial interface ISigningCertificatesOperations
     {
         /// <summary>
-        /// Retrieves the OpenID Configuration data for the Azure Attestation
-        /// Service
+        /// Retrieves the attestation signing keys in use by the attestation
+        /// service
         /// </summary>
         /// <remarks>
-        /// Retrieves attestation signing keys in use by the attestation
+        /// Retrieves metadata signing certificates in use by the attestation
         /// service
         /// </remarks>
         /// <param name='tenantBaseUrl'>
diff --git a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/Models/AttestationPolicy.cs b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/Models/AttestationPolicy.cs
index 07c3ff18252f..52c3313b6fea 100644
--- a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/Models/AttestationPolicy.cs
+++ b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/Models/AttestationPolicy.cs
@@ -26,8 +26,8 @@ public AttestationPolicy()
         /// <summary>
         /// Initializes a new instance of the AttestationPolicy class.
         /// </summary>
-        /// <param name="policy">String-encoded attestation policy
-        /// document.</param>
+        /// <param name="policy">JSON Web Token whose body is an
+        /// AttestationPolicyRequest definition.</param>
         public AttestationPolicy(string policy = default(string))
         {
             Policy = policy;
@@ -40,7 +40,8 @@ public AttestationPolicy()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets string-encoded attestation policy document.
+        /// Gets or sets JSON Web Token whose body is an
+        /// AttestationPolicyRequest definition.
         /// </summary>
         [JsonProperty(PropertyName = "policy")]
         public string Policy { get; set; }
diff --git a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/PolicyCertificatesOperations.cs b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/PolicyCertificatesOperations.cs
index daafe62e8d42..7f0275e4cddb 100644
--- a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/PolicyCertificatesOperations.cs
+++ b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/PolicyCertificatesOperations.cs
@@ -273,7 +273,7 @@ internal PolicyCertificatesOperations(AttestationClient client)
         /// The tenant name, for example https://mytenant.attest.azure.net.
         /// </param>
         /// <param name='policyCertificateToAdd'>
-        /// An RFC7519 JSON Web Token containing a claim named "aas-policyCertificate"
+        /// An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate"
         /// whose value is an RFC7517 JSON Web Key which specifies a new key to add.
         /// The RFC7519 JWT must be signed with one of the existing signing
         /// certificates
@@ -505,7 +505,7 @@ internal PolicyCertificatesOperations(AttestationClient client)
         /// The tenant name, for example https://mytenant.attest.azure.net.
         /// </param>
         /// <param name='policyCertificateToRemove'>
-        /// An RFC7519 JSON Web Token containing a claim named "aas-policyCertificate"
+        /// An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate"
         /// whose value is an RFC7517 JSON Web Key which specifies a new key to update.
         /// The RFC7519 JWT must be signed with one of the existing signing
         /// certificates
diff --git a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/PolicyCertificatesOperationsExtensions.cs b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/PolicyCertificatesOperationsExtensions.cs
index 0e9705d21dac..635e1392e830 100644
--- a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/PolicyCertificatesOperationsExtensions.cs
+++ b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/PolicyCertificatesOperationsExtensions.cs
@@ -68,7 +68,7 @@ public static object Get(this IPolicyCertificatesOperations operations, string t
             /// The tenant name, for example https://mytenant.attest.azure.net.
             /// </param>
             /// <param name='policyCertificateToAdd'>
-            /// An RFC7519 JSON Web Token containing a claim named "aas-policyCertificate"
+            /// An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate"
             /// whose value is an RFC7517 JSON Web Key which specifies a new key to add.
             /// The RFC7519 JWT must be signed with one of the existing signing
             /// certificates
@@ -89,7 +89,7 @@ public static object Add(this IPolicyCertificatesOperations operations, string t
             /// The tenant name, for example https://mytenant.attest.azure.net.
             /// </param>
             /// <param name='policyCertificateToAdd'>
-            /// An RFC7519 JSON Web Token containing a claim named "aas-policyCertificate"
+            /// An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate"
             /// whose value is an RFC7517 JSON Web Key which specifies a new key to add.
             /// The RFC7519 JWT must be signed with one of the existing signing
             /// certificates
@@ -116,7 +116,7 @@ public static object Add(this IPolicyCertificatesOperations operations, string t
             /// The tenant name, for example https://mytenant.attest.azure.net.
             /// </param>
             /// <param name='policyCertificateToRemove'>
-            /// An RFC7519 JSON Web Token containing a claim named "aas-policyCertificate"
+            /// An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate"
             /// whose value is an RFC7517 JSON Web Key which specifies a new key to update.
             /// The RFC7519 JWT must be signed with one of the existing signing
             /// certificates
@@ -137,7 +137,7 @@ public static object Remove(this IPolicyCertificatesOperations operations, strin
             /// The tenant name, for example https://mytenant.attest.azure.net.
             /// </param>
             /// <param name='policyCertificateToRemove'>
-            /// An RFC7519 JSON Web Token containing a claim named "aas-policyCertificate"
+            /// An RFC7519 JSON Web Token containing a claim named "maa-policyCertificate"
             /// whose value is an RFC7517 JSON Web Key which specifies a new key to update.
             /// The RFC7519 JWT must be signed with one of the existing signing
             /// certificates
diff --git a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SdkInfo_AttestationClient.cs b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SdkInfo_AttestationClient.cs
index 616d201d4609..be9067c27f3b 100644
--- a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SdkInfo_AttestationClient.cs
+++ b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SdkInfo_AttestationClient.cs
@@ -26,16 +26,5 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_AttestationClie
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "latest";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/attestation/data-plane/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\\github\\gkostal\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "21460cb6be715578c300a130b9af7acbf277fbc8";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-
diff --git a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SigningCertificatesOperations.cs b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SigningCertificatesOperations.cs
index 935991101a0b..64a9e368a761 100644
--- a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SigningCertificatesOperations.cs
+++ b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SigningCertificatesOperations.cs
@@ -51,10 +51,10 @@ internal SigningCertificatesOperations(AttestationClient client)
         public AttestationClient Client { get; private set; }
 
         /// <summary>
-        /// Retrieves the OpenID Configuration data for the Azure Attestation Service
+        /// Retrieves the attestation signing keys in use by the attestation service
         /// </summary>
         /// <remarks>
-        /// Retrieves attestation signing keys in use by the attestation service
+        /// Retrieves metadata signing certificates in use by the attestation service
         /// </remarks>
         /// <param name='tenantBaseUrl'>
         /// The tenant name, for example https://mytenant.attest.azure.net.
diff --git a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SigningCertificatesOperationsExtensions.cs b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SigningCertificatesOperationsExtensions.cs
index ba87c4184fe5..0442406750bd 100644
--- a/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SigningCertificatesOperationsExtensions.cs
+++ b/sdk/attestation/Microsoft.Azure.Attestation/src/Generated/SigningCertificatesOperationsExtensions.cs
@@ -22,10 +22,10 @@ namespace Microsoft.Azure.Attestation
     public static partial class SigningCertificatesOperationsExtensions
     {
             /// <summary>
-            /// Retrieves the OpenID Configuration data for the Azure Attestation Service
+            /// Retrieves the attestation signing keys in use by the attestation service
             /// </summary>
             /// <remarks>
-            /// Retrieves attestation signing keys in use by the attestation service
+            /// Retrieves metadata signing certificates in use by the attestation service
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -39,10 +39,10 @@ public static object Get(this ISigningCertificatesOperations operations, string
             }
 
             /// <summary>
-            /// Retrieves the OpenID Configuration data for the Azure Attestation Service
+            /// Retrieves the attestation signing keys in use by the attestation service
             /// </summary>
             /// <remarks>
-            /// Retrieves attestation signing keys in use by the attestation service
+            /// Retrieves metadata signing certificates in use by the attestation service
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.