diff --git a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp
index 8ad81753f..27be565e6 100644
--- a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp
+++ b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp
@@ -498,7 +498,7 @@ namespace Azure { namespace Security { namespace Attestation { namespace Models
   };
 
   /**
-   * @brief Result of a SetPolicy or ResetPolicy operation.
+   * @brief Result of a SetAttestationPolicy or ResetAttestationPolicy operation.
    */
   struct PolicyResult
   {
diff --git a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp
index 1d149475f..29d15bb15 100644
--- a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp
+++ b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp
@@ -301,7 +301,7 @@ namespace Azure { namespace Security { namespace Attestation {
    */
   struct SetPolicyOptions final
   {
-    /** @brief Optional Signing Key which is used to sign the SetPolicy request.
+    /** @brief Optional Signing Key which is used to sign the SetAttestationPolicy request.
      */
     Azure::Nullable<AttestationSigningKey> SigningKey;
 
diff --git a/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
index 0c8d7559a..60cb7952c 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
@@ -76,8 +76,8 @@ authorizationrules
 
     // To verify that the attestation service received the attestation policy, the service returns
     // the SHA256 hash of the policy token which was sent ot the service. To simplify the customer
-    // experience of interacting with the SetPolicy APIs, CreateAttestationPolicyToken API will
-    // generate the same token that would be send to the service.
+    // experience of interacting with the SetAttestationPolicy APIs, CreateAttestationPolicyToken
+    // API will generate the same token that would be send to the service.
     //
     // To ensure that the token which was sent from the client matches the token which was received
     // by the attestation service, the customer can call CreateAttestationPolicyToken and then
diff --git a/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp
index 9711630a9..ec197663d 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp
@@ -91,8 +91,8 @@ authorizationrules
 
     // To verify that the attestation service received the attestation policy, the service returns
     // the SHA256 hash of the policy token which was sent ot the service. To simplify the customer
-    // experience of interacting with the SetPolicy APIs, CreateAttestationPolicyToken API will
-    // generate the same token that would be send to the service.
+    // experience of interacting with the SetAttestationPolicy APIs, CreateAttestationPolicyToken
+    // API will generate the same token that would be send to the service.
     //
     // To ensure that the token which was sent from the client matches the token which was received
     // by the attestation service, the customer can call CreateAttestationPolicyToken and then
diff --git a/sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp b/sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp
index 2787a3636..e4a4840de 100644
--- a/sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp
@@ -243,7 +243,8 @@ namespace Azure {
   };
 
   /**
-   * @brief Result of a GetPolicy, SetPolicy, or ResetPolicy operation.
+   * @brief Result of a GetAttestationPolicy, SetAttestationPolicy, or ResetAttestationPolicy
+   * operation.
    */
   struct PolicyResult
   {
@@ -278,7 +279,8 @@ namespace Azure {
   };
 
   /**
-   * @brief Result of a GetPolicy, SetPolicy, or ResetPolicy operation.
+   * @brief Result of a GetAttestationPolicy, SetAttestationPolicy, or ResetAttestationPolicy
+   * operation.
    */
   struct GetIsolatedModeCertificatesResult
   {
diff --git a/sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp b/sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp
index d726d5172..26b5bdb0a 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp
@@ -108,13 +108,13 @@ namespace Azure { namespace Security { namespace Attestation { namespace Test {
     {
       EXPECT_EQ(result.RawResponse->GetStatusCode(), Azure::Core::Http::HttpStatusCode::Ok);
 
-      // SetPolicy responses should have updated or reset the policy value.
+      // SetAttestationPolicy responses should have updated or reset the policy value.
       if (policyToValidate)
       {
         EXPECT_EQ(PolicyModification::Updated, result.Value.Body.PolicyResolution);
 
         // The attestation service only returns the PolicySigner and PolicySigningHash on
-        // SetPolicy calls, not ResetPolicy calls.
+        // SetAttestationPolicy calls, not ResetAttestationPolicy calls.
 
         // Now check the policy signer if appropriate.
         if (signingKey)
@@ -363,20 +363,20 @@ namespace Azure { namespace Security { namespace Attestation { namespace Test {
         break;
 
       // Modify attestation policies using an unsecured attestation JWS. This exercises the
-      // SetPolicy and ResetPolicy APIs.
+      // SetAttestationPolicy and ResetAttestationPolicy APIs.
       case TestCaseType::ModifyPolicyUnsecured:
         ModifyPolicyUnsecuredTest();
         break;
 
       // Modify attestation policies using an ephemeral secured attestation JWS. This exercises the
-      // SetPolicy and ResetPolicy APIs.
+      // SetAttestationPolicy and ResetAttestationPolicy APIs.
       case TestCaseType::ModifyPolicySecured:
         ModifyPolicySecuredTest();
         break;
 
       // Modify attestation policies using a predefined signing key and certificate.
       // The key and certificate were created at test resource creation time.
-      // Exercises the SetPolicy and ResetPolicy APIs.
+      // Exercises the SetAttestationPolicy and ResetAttestationPolicy APIs.
       case TestCaseType::ModifyPolicyIsolated:
         ModifyPolicyIsolatedTest(); // LIVE-ONLY test!
         break;