diff --git a/sdk/search/Azure.Search.Documents/src/Properties/AssemblyInfo.cs b/sdk/search/Azure.Search.Documents/src/Properties/AssemblyInfo.cs
index 6a41c6f9f936..e0ec82f8bec2 100644
--- a/sdk/search/Azure.Search.Documents/src/Properties/AssemblyInfo.cs
+++ b/sdk/search/Azure.Search.Documents/src/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
     "3924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7" +
     "d3113e92484cf7045cc7")]
 
-[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "<Pending>", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Analyzer")]
-[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "<Pending>", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Skill")]
-[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "<Pending>", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Skillset")]
+[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "Search service terminology", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Analyzer")]
+[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "Search service terminology", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Skill")]
+[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "Search service terminology", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Skillset")]
 [assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "Search service terminology", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Suggester")]
-[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "<Pending>", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Tokenizer")]
+[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "Search service terminology", Scope = "type", Target = "~T:Azure.Search.Documents.Models.Tokenizer")]
diff --git a/sdk/search/Azure.Search.Documents/src/SearchClient.cs b/sdk/search/Azure.Search.Documents/src/SearchClient.cs
index dab79371b4d0..1e0af01b4282 100644
--- a/sdk/search/Azure.Search.Documents/src/SearchClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/SearchClient.cs
@@ -1763,7 +1763,7 @@ await IndexDocumentsAsync<T>(
                 .ConfigureAwait(false);
 
         /// <summary>
-        /// MergeOrUpload documents to the index as a batch.
+        /// Merge or upload documents to the index as a batch.
         /// </summary>
         /// <typeparam name="T">
         /// The .NET type that maps to the index schema. Instances of this type
@@ -1860,7 +1860,7 @@ await IndexDocumentsAsync<T>(
                 .ConfigureAwait(false);
 
         /// <summary>
-        /// Delete documents to the index as a batch.
+        /// Delete documents from the index as a batch.
         /// </summary>
         /// <typeparam name="T">
         /// The .NET type that maps to the index schema. Instances of this type
@@ -1908,7 +1908,7 @@ public virtual Response<IndexDocumentsResult> DeleteDocuments<T>(
                 cancellationToken);
 
         /// <summary>
-        /// Delete documents to the index as a batch.
+        /// Delete documents from the index as a batch.
         /// </summary>
         /// <typeparam name="T">
         /// The .NET type that maps to the index schema. Instances of this type
@@ -1957,7 +1957,7 @@ await IndexDocumentsAsync<T>(
                 .ConfigureAwait(false);
 
         /// <summary>
-        /// Delete documents to the index as a batch given only their keys.
+        /// Delete documents from the index as a batch given only their keys.
         /// </summary>
         /// <param name="keyName">
         /// The name of the key field that uniquely identifies documents in
@@ -2001,7 +2001,7 @@ public virtual Response<IndexDocumentsResult> DeleteDocuments(
                 cancellationToken);
 
         /// <summary>
-        /// Delete documents to the index as a batch given only their keys.
+        /// Delete documents from the index as a batch given only their keys.
         /// </summary>
         /// <param name="keyName">
         /// The name of the key field that uniquely identifies documents in