diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14c9de0a82..d7442429f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 ### ⚠️ Breaking Changes ⚠️
-- Moved `OpenSearch.Client` request classes into their respective namespaces to match those in `OpenSearch.Net` ([#200](https://github.com/opensearch-project/opensearch-net/pull/200), [#202](https://github.com/opensearch-project/opensearch-net/pull/202), [#203](https://github.com/opensearch-project/opensearch-net/pull/203))
+- Moved `OpenSearch.Client` request classes into their respective namespaces to match those in `OpenSearch.Net` ([#200](https://github.com/opensearch-project/opensearch-net/pull/200), [#202](https://github.com/opensearch-project/opensearch-net/pull/202), [#203](https://github.com/opensearch-project/opensearch-net/pull/203), [#205](https://github.com/opensearch-project/opensearch-net/pull/205))
 
 ### Dependencies
 - Bumps `System.Reflection.Emit` from 4.3.0 to 4.7.0
@@ -57,4 +57,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bumps `Microsoft.NETFramework.ReferenceAssemblies` from 1.0.0-preview.2 to 1.0.3
 
 [Unreleased]: https://github.com/opensearch-project/opensearch-net/compare/1.3.0...HEAD
-[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/1.2.0...1.3.0
\ No newline at end of file
+[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/1.2.0...1.3.0
diff --git a/src/OpenSearch.Client/Descriptors.Indices.cs b/src/OpenSearch.Client/Descriptors.Indices.cs
index 2786ee4f64..6fb023a153 100644
--- a/src/OpenSearch.Client/Descriptors.Indices.cs
+++ b/src/OpenSearch.Client/Descriptors.Indices.cs
@@ -40,7 +40,7 @@
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	///<summary>Descriptor for AddBlock <para></para></summary>
 	public partial class AddIndexBlockDescriptor : RequestDescriptorBase<AddIndexBlockDescriptor, AddIndexBlockRequestParameters, IAddIndexBlockRequest>, IAddIndexBlockRequest
diff --git a/src/OpenSearch.Client/Document/Multiple/Reindex/ReindexObservable.cs b/src/OpenSearch.Client/Document/Multiple/Reindex/ReindexObservable.cs
index 98152b14e7..131aab7317 100644
--- a/src/OpenSearch.Client/Document/Multiple/Reindex/ReindexObservable.cs
+++ b/src/OpenSearch.Client/Document/Multiple/Reindex/ReindexObservable.cs
@@ -30,6 +30,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using OpenSearch.Client.Specification.IndicesApi;
 using OpenSearch.Net;
 using static OpenSearch.Client.Infer;
 
diff --git a/src/OpenSearch.Client/Document/Multiple/Reindex/ReindexRequest.cs b/src/OpenSearch.Client/Document/Multiple/Reindex/ReindexRequest.cs
index 8ce6a01a63..b765d5f205 100644
--- a/src/OpenSearch.Client/Document/Multiple/Reindex/ReindexRequest.cs
+++ b/src/OpenSearch.Client/Document/Multiple/Reindex/ReindexRequest.cs
@@ -28,6 +28,7 @@
 
 using System;
 using System.Collections.Generic;
+using OpenSearch.Client.Specification.IndicesApi;
 using OpenSearch.Net;
 
 namespace OpenSearch.Client
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias.cs
index 69df4b283e..46f0f89d9a 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// An alias to one or more indices
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasAdd.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasAdd.cs
index 1b7890f54d..0fd55e628b 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasAdd.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasAdd.cs
@@ -31,7 +31,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[InterfaceDataContract]
 	public interface IAliasAddAction : IAliasAction
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs
index d0d7713600..7aec3a7a45 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasAddOperation.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class AliasAddOperation
 	{
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemove.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemove.cs
index 1e242cc17b..7cbb6bfa56 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemove.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemove.cs
@@ -31,7 +31,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[InterfaceDataContract]
 	public interface IAliasRemoveAction : IAliasAction
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveIndex.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveIndex.cs
index 929f1adee3..eccee0e2df 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveIndex.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveIndex.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[InterfaceDataContract]
 	public interface IAliasRemoveIndexAction : IAliasAction
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveIndexOperation.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveIndexOperation.cs
index 8f4c7e8558..a3b019ec97 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveIndexOperation.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveIndexOperation.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class AliasRemoveIndexOperation
 	{
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs
index d0d9489821..62e4018edf 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/AliasRemoveOperation.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class AliasRemoveOperation
 	{
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/IAliasAction.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/IAliasAction.cs
index c17df2ed4f..3c2f573861 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/IAliasAction.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/Actions/IAliasAction.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net.Utf8Json.Internal;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Marker interface for alias operation
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/BulkAliasRequest.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/BulkAliasRequest.cs
index 327ca61eb9..108db869ae 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/BulkAliasRequest.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/BulkAliasRequest.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.update_aliases.json")]
 	public partial interface IBulkAliasRequest
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Alias/BulkAliasResponse.cs b/src/OpenSearch.Client/Indices/AliasManagement/Alias/BulkAliasResponse.cs
index 1f5423fb5c..91779714e9 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Alias/BulkAliasResponse.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Alias/BulkAliasResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class BulkAliasResponse : AcknowledgedResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/AliasDefinition.cs b/src/OpenSearch.Client/Indices/AliasManagement/AliasDefinition.cs
index 4f3072ce5e..f8381494f9 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/AliasDefinition.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/AliasDefinition.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class AliasDefinition
 	{
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/AliasExists/AliasExistsRequest.cs b/src/OpenSearch.Client/Indices/AliasManagement/AliasExists/AliasExistsRequest.cs
index 9c8e4ca156..59deeb01aa 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/AliasExists/AliasExistsRequest.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/AliasExists/AliasExistsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.exists_alias.json")]
 	public partial interface IAliasExistsRequest { }
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/Aliases.cs b/src/OpenSearch.Client/Indices/AliasManagement/Aliases.cs
index f1331953f7..3ac56c01f2 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/Aliases.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/Aliases.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(VerbatimDictionaryKeysFormatter<Aliases, IAliases, IndexName, IAlias>))]
 	public interface IAliases : IIsADictionary<IndexName, IAlias> { }
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/DeleteAlias/DeleteAliasRequest.cs b/src/OpenSearch.Client/Indices/AliasManagement/DeleteAlias/DeleteAliasRequest.cs
index 76d8599dfa..5edb14857c 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/DeleteAlias/DeleteAliasRequest.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/DeleteAlias/DeleteAliasRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.delete_alias.json")]
 	public partial interface IDeleteAliasRequest { }
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/DeleteAlias/DeleteAliasResponse.cs b/src/OpenSearch.Client/Indices/AliasManagement/DeleteAlias/DeleteAliasResponse.cs
index 064a285dae..71c445b005 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/DeleteAlias/DeleteAliasResponse.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/DeleteAlias/DeleteAliasResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class DeleteAliasResponse : ResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/GetAliasRequest.cs b/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/GetAliasRequest.cs
index 74c69ec368..7197e63f9f 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/GetAliasRequest.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/GetAliasRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.get_alias.json")]
 	public partial interface IGetAliasRequest { }
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/GetAliasResponse.cs b/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/GetAliasResponse.cs
index 4fe2cddb0e..be36d3ef67 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/GetAliasResponse.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/GetAliasResponse.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(ResolvableDictionaryResponseFormatter<GetAliasResponse, IndexName, IndexAliases>))]
 	public class GetAliasResponse : DictionaryResponseBase<IndexName, IndexAliases>
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/OpenSearchClient-GetAliasesPointingToIndex.cs b/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/OpenSearchClient-GetAliasesPointingToIndex.cs
index 2b062fe455..3464bba32e 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/OpenSearchClient-GetAliasesPointingToIndex.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/OpenSearchClient-GetAliasesPointingToIndex.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Client.Specification.IndicesApi;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public static class AliasPointingToIndexExtensions
 	{
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/OpenSearchClient-GetIndicesPointingToAlias.cs b/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/OpenSearchClient-GetIndicesPointingToAlias.cs
index bf1793c49e..99402da373 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/OpenSearchClient-GetIndicesPointingToAlias.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/GetAlias/OpenSearchClient-GetIndicesPointingToAlias.cs
@@ -31,7 +31,7 @@
 using System.Threading.Tasks;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Implements several handy alias extensions.
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/PutAlias/PutAliasRequest.cs b/src/OpenSearch.Client/Indices/AliasManagement/PutAlias/PutAliasRequest.cs
index 72bd092ad3..84fdc93af6 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/PutAlias/PutAliasRequest.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/PutAlias/PutAliasRequest.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A request to put an alias to one or more indices
diff --git a/src/OpenSearch.Client/Indices/AliasManagement/PutAlias/PutAliasResponse.cs b/src/OpenSearch.Client/Indices/AliasManagement/PutAlias/PutAliasResponse.cs
index bdd7ef869b..8ced58d69b 100644
--- a/src/OpenSearch.Client/Indices/AliasManagement/PutAlias/PutAliasResponse.cs
+++ b/src/OpenSearch.Client/Indices/AliasManagement/PutAlias/PutAliasResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class PutAliasResponse : ResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/Analyze/AnalyzeCharFilters.cs b/src/OpenSearch.Client/Indices/Analyze/AnalyzeCharFilters.cs
index 976edc2573..c2562dc4c3 100644
--- a/src/OpenSearch.Client/Indices/Analyze/AnalyzeCharFilters.cs
+++ b/src/OpenSearch.Client/Indices/Analyze/AnalyzeCharFilters.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(UnionListFormatter<AnalyzeCharFilters, string, ICharFilter>))]
 	public class AnalyzeCharFilters : List<Union<string, ICharFilter>>
diff --git a/src/OpenSearch.Client/Indices/Analyze/AnalyzeRequest.cs b/src/OpenSearch.Client/Indices/Analyze/AnalyzeRequest.cs
index 56f95d4b84..2604fbb558 100644
--- a/src/OpenSearch.Client/Indices/Analyze/AnalyzeRequest.cs
+++ b/src/OpenSearch.Client/Indices/Analyze/AnalyzeRequest.cs
@@ -32,7 +32,7 @@
 using System.Linq.Expressions;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.analyze.json")]
 	[ReadAs(typeof(AnalyzeRequest))]
diff --git a/src/OpenSearch.Client/Indices/Analyze/AnalyzeResponse.cs b/src/OpenSearch.Client/Indices/Analyze/AnalyzeResponse.cs
index fcab19d870..3dfa2edd7f 100644
--- a/src/OpenSearch.Client/Indices/Analyze/AnalyzeResponse.cs
+++ b/src/OpenSearch.Client/Indices/Analyze/AnalyzeResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[DataContract]
 	public class AnalyzeResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Indices/Analyze/AnalyzeToken.cs b/src/OpenSearch.Client/Indices/Analyze/AnalyzeToken.cs
index 62f46c52ba..5e2c78308a 100644
--- a/src/OpenSearch.Client/Indices/Analyze/AnalyzeToken.cs
+++ b/src/OpenSearch.Client/Indices/Analyze/AnalyzeToken.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[DataContract]
 	public class AnalyzeToken
diff --git a/src/OpenSearch.Client/Indices/Analyze/AnalyzeTokenFilters.cs b/src/OpenSearch.Client/Indices/Analyze/AnalyzeTokenFilters.cs
index 1f6b01d51f..6cbc3e737d 100644
--- a/src/OpenSearch.Client/Indices/Analyze/AnalyzeTokenFilters.cs
+++ b/src/OpenSearch.Client/Indices/Analyze/AnalyzeTokenFilters.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A list of string references to stored token filters and/or inline token filter definitions
diff --git a/src/OpenSearch.Client/Indices/Analyze/AnalyzeTokenizersDescriptor.cs b/src/OpenSearch.Client/Indices/Analyze/AnalyzeTokenizersDescriptor.cs
index 553bd7cfd2..f1777ab4c3 100644
--- a/src/OpenSearch.Client/Indices/Analyze/AnalyzeTokenizersDescriptor.cs
+++ b/src/OpenSearch.Client/Indices/Analyze/AnalyzeTokenizersDescriptor.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class AnalyzeTokenizersSelector : SelectorBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/AddIndexBlockRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/AddIndexBlockRequest.cs
index 0ac33f99a0..afbc99759a 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/AddIndexBlockRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/AddIndexBlockRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A request to the indices add block API
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/AddIndexBlockResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/AddIndexBlockResponse.cs
index b8cdd0ed36..a0c6a5a635 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/AddIndexBlockResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/AddIndexBlockResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class AddIndexBlockResponse : AcknowledgedResponseBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/IndexBlock.cs b/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/IndexBlock.cs
index fa6d995ba7..80f4477699 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/IndexBlock.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/AddBlock/IndexBlock.cs
@@ -32,7 +32,7 @@
 
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Block type for an index.
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/CloneIndex/CloneIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/CloneIndex/CloneIndexRequest.cs
index 499d700bc7..7e40832482 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/CloneIndex/CloneIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/CloneIndex/CloneIndexRequest.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A request to the clone index API
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/CloneIndex/CloneIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/CloneIndex/CloneIndexResponse.cs
index d9bb642775..dbd9c4c588 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/CloneIndex/CloneIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/CloneIndex/CloneIndexResponse.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class CloneIndexResponse : AcknowledgedResponseBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/CreateIndex/CreateIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/CreateIndex/CreateIndexRequest.cs
index d31eb7bf8e..4d82b397cd 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/CreateIndex/CreateIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/CreateIndex/CreateIndexRequest.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.create.json")]
 	[ReadAs(typeof(CreateIndexRequest))]
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/CreateIndex/CreateIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/CreateIndex/CreateIndexResponse.cs
index 1e4389b384..031aad815a 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/CreateIndex/CreateIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/CreateIndex/CreateIndexResponse.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class CreateIndexResponse : AcknowledgedResponseBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/DeleteIndex/DeleteIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/DeleteIndex/DeleteIndexRequest.cs
index 655b22028f..0845708335 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/DeleteIndex/DeleteIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/DeleteIndex/DeleteIndexRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.delete.json")]
 	public partial interface IDeleteIndexRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/DeleteIndex/DeleteIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/DeleteIndex/DeleteIndexResponse.cs
index 3e662ec5c1..9932225faf 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/DeleteIndex/DeleteIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/DeleteIndex/DeleteIndexResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class DeleteIndexResponse : IndicesResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/GetIndex/GetIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/GetIndex/GetIndexRequest.cs
index 85e3015f7e..5a0750a6d2 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/GetIndex/GetIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/GetIndex/GetIndexRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.get.json")]
 	public partial interface IGetIndexRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/GetIndex/GetIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/GetIndex/GetIndexResponse.cs
index f500f20640..3ff078b882 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/GetIndex/GetIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/GetIndex/GetIndexResponse.cs
@@ -29,7 +29,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(ResolvableDictionaryResponseFormatter<GetIndexResponse, IndexName, IndexState>))]
 	public class GetIndexResponse : DictionaryResponseBase<IndexName, IndexState>
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/IndicesExists/ExistsResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/IndicesExists/ExistsResponse.cs
index ceb8b37e7f..88bf3fed14 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/IndicesExists/ExistsResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/IndicesExists/ExistsResponse.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[DataContract]
 	public class ExistsResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/IndicesExists/IndexExistsRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/IndicesExists/IndexExistsRequest.cs
index 468f6b3c32..42461d37a6 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/IndicesExists/IndexExistsRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/IndicesExists/IndexExistsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.exists.json")]
 	public partial interface IIndexExistsRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexRequest.cs
index 99eb59a8b7..e158c16345 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.close.json")]
 	public partial interface ICloseIndexRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexResponse.cs
index 05fe2bb479..7cf496f070 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class CloseIndexResponse : AcknowledgedResponseBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexRequest.cs
index 892d83b8a1..ed68988524 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.open.json")]
 	public partial interface IOpenIndexRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexResponse.cs
index d63f1b5391..b53ec727a7 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class OpenIndexResponse : AcknowledgedResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/ResolveIndex/ResolveIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/ResolveIndex/ResolveIndexRequest.cs
index 6c094e3a83..add65b42c8 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/ResolveIndex/ResolveIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/ResolveIndex/ResolveIndexRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A request to the resolve index API
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/ResolveIndex/ResolveIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/ResolveIndex/ResolveIndexResponse.cs
index a5d5d199df..c8169993b5 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/ResolveIndex/ResolveIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/ResolveIndex/ResolveIndexResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class ResolveIndexResponse : ResponseBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverConditions.cs b/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverConditions.cs
index 881683937f..f0b7e5f4bd 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverConditions.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverConditions.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Conditions that must be satisfied for a new index to be created
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverIndexRequest.cs
index eaa9f6327c..6840c4d1b8 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverIndexRequest.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.rollover.json")]
 	[ReadAs(typeof(RolloverIndexRequest))]
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverIndexResponse.cs
index ecf90a430f..11bdb0833f 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/RolloverIndex/RolloverIndexResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class RolloverIndexResponse : AcknowledgedResponseBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/ShrinkIndex/ShrinkIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/ShrinkIndex/ShrinkIndexRequest.cs
index c2abaf1234..79473a47a1 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/ShrinkIndex/ShrinkIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/ShrinkIndex/ShrinkIndexRequest.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.shrink.json")]
 	[ReadAs(typeof(ShrinkIndexRequest))]
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/ShrinkIndex/ShrinkIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/ShrinkIndex/ShrinkIndexResponse.cs
index aede03e606..31e37bbbf1 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/ShrinkIndex/ShrinkIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/ShrinkIndex/ShrinkIndexResponse.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class ShrinkIndexResponse : AcknowledgedResponseBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/SplitIndex/SplitIndexRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/SplitIndex/SplitIndexRequest.cs
index 247f6765bf..e74ff227bd 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/SplitIndex/SplitIndexRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/SplitIndex/SplitIndexRequest.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A request to split an existing index into a new index, where each original primary
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/SplitIndex/SplitIndexResponse.cs b/src/OpenSearch.Client/Indices/IndexManagement/SplitIndex/SplitIndexResponse.cs
index 3e007c4871..3df90483a2 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/SplitIndex/SplitIndexResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/SplitIndex/SplitIndexResponse.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class SplitIndexResponse : AcknowledgedResponseBase
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexManagement/TypesExists/TypeExistsRequest.cs b/src/OpenSearch.Client/Indices/IndexManagement/TypesExists/TypeExistsRequest.cs
index d511637be0..ffa050f5fc 100644
--- a/src/OpenSearch.Client/Indices/IndexManagement/TypesExists/TypeExistsRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexManagement/TypesExists/TypeExistsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	///<remarks>Deprecated as of OpenSearch 2.0</remarks>
 	[MapsApi("indices.exists_type.json")]
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsRequest.cs b/src/OpenSearch.Client/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsRequest.cs
index c621e5a04d..3881560709 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.get_settings.json")]
 	public partial interface IGetIndexSettingsRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsResponse.cs b/src/OpenSearch.Client/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsResponse.cs
index bbaf66fed0..e07f86fc78 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(ResolvableDictionaryResponseFormatter<GetIndexSettingsResponse, IndexName, IndexState>))]
 	public class GetIndexSettingsResponse : DictionaryResponseBase<IndexName, IndexState>
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/IndexState.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexState.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/IndexState.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/IndexState.cs
index f365e2527e..3e46a75339 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/IndexState.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexState.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[ReadAs(typeof(IndexState))]
 	public interface IIndexState
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateRequest.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateRequest.cs
index e4780cfeb0..08f58e581b 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.delete_template.json")]
 	public partial interface IDeleteIndexTemplateRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateResponse.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateResponse.cs
index 39368650bb..d1a3a96e9f 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class DeleteIndexTemplateResponse : AcknowledgedResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateRequest.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateRequest.cs
index 967639e7ea..f8e0d80f7e 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.get_template.json")]
 	public partial interface IGetIndexTemplateRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateResponse.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateResponse.cs
index 0cfd05d882..72cc2dd9bd 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[DataContract]
 	[JsonFormatter(typeof(DictionaryResponseFormatter<GetIndexTemplateResponse, string, TemplateMapping>))]
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs
index 0742a3f1da..3172b491d0 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ITemplateMapping
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsRequest.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsRequest.cs
index 969f3bb757..c5be438ae3 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.exists_template.json")]
 	public partial interface IIndexTemplateExistsRequest { }
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs
index e90449b57a..054d03b0f6 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateRequest.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.put_template.json")]
 	public partial interface IPutIndexTemplateRequest : ITemplateMapping { }
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateResponse.cs b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateResponse.cs
index f4453977f0..b6d1b6e96c 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class PutIndexTemplateResponse : AcknowledgedResponseBase { }
 }
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergePolicySettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Merge/MergePolicySettings.cs
similarity index 99%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergePolicySettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Merge/MergePolicySettings.cs
index b0eb6c722b..39eb479b89 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergePolicySettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Merge/MergePolicySettings.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface IMergePolicySettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergeSchedulerSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Merge/MergeSchedulerSettings.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergeSchedulerSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Merge/MergeSchedulerSettings.cs
index 22a12f1e72..955bbac59b 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergeSchedulerSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Merge/MergeSchedulerSettings.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface IMergeSchedulerSettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergeSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Merge/MergeSettings.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergeSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Merge/MergeSettings.cs
index b85d944af4..18e66a93b6 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Merge/MergeSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Merge/MergeSettings.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface IMergeSettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Queries/IQueriesCacheSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Queries/IQueriesCacheSettings.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Queries/IQueriesCacheSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Queries/IQueriesCacheSettings.cs
index 131af073b6..cbd55b4d7d 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Queries/IQueriesCacheSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Queries/IQueriesCacheSettings.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface IQueriesCacheSettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Queries/IQueriesSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Queries/IQueriesSettings.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Queries/IQueriesSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Queries/IQueriesSettings.cs
index ceaafd80e6..3c82ae7154 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Queries/IQueriesSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Queries/IQueriesSettings.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface IQueriesSettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/AutoExpandReplicas.cs b/src/OpenSearch.Client/Indices/IndexSettings/Settings/AutoExpandReplicas.cs
similarity index 99%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Settings/AutoExpandReplicas.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Settings/AutoExpandReplicas.cs
index e7b3eea884..2fb1b8c6a0 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/AutoExpandReplicas.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Settings/AutoExpandReplicas.cs
@@ -29,7 +29,7 @@
 using System;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(AutoExpandReplicasFormatter))]
 	public class AutoExpandReplicas
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/DynamicIndexSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Settings/DynamicIndexSettings.cs
similarity index 99%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Settings/DynamicIndexSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Settings/DynamicIndexSettings.cs
index 8f5626e760..644f1c2766 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/DynamicIndexSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Settings/DynamicIndexSettings.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Dynamic index settings
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/FixedIndexSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Settings/FixedIndexSettings.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Settings/FixedIndexSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Settings/FixedIndexSettings.cs
index 580232c374..b6bcc1910c 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/FixedIndexSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Settings/FixedIndexSettings.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// const string collection of known OpenSearch index settings that can only be provided at
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/IndexSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Settings/IndexSettings.cs
similarity index 99%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Settings/IndexSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Settings/IndexSettings.cs
index 28005e8bf6..f5e0fe0384 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/IndexSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Settings/IndexSettings.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// The settings for an index
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/IndexSettingsFormatter.cs b/src/OpenSearch.Client/Indices/IndexSettings/Settings/IndexSettingsFormatter.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Settings/IndexSettingsFormatter.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Settings/IndexSettingsFormatter.cs
index 14a370f6c4..ddaca42046 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/IndexSettingsFormatter.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Settings/IndexSettingsFormatter.cs
@@ -32,11 +32,11 @@
 using System.Linq;
 using System.Reflection;
 using OpenSearch.Net.Utf8Json;
-using static OpenSearch.Client.FixedIndexSettings;
-using static OpenSearch.Client.IndexSortSettings;
-using static OpenSearch.Client.UpdatableIndexSettings;
+using static OpenSearch.Client.Specification.IndicesApi.FixedIndexSettings;
+using static OpenSearch.Client.Specification.IndicesApi.IndexSortSettings;
+using static OpenSearch.Client.Specification.IndicesApi.UpdatableIndexSettings;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	internal class IndexSettingsFormatter : IJsonFormatter<IIndexSettings>
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/RecoveryInitialShards.cs b/src/OpenSearch.Client/Indices/IndexSettings/Settings/RecoveryInitialShards.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Settings/RecoveryInitialShards.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Settings/RecoveryInitialShards.cs
index 4f0d099695..be309033b7 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/RecoveryInitialShards.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Settings/RecoveryInitialShards.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[StringEnum]
 	public enum RecoveryInitialShards
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/UpdatableIndexSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Settings/UpdatableIndexSettings.cs
similarity index 99%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Settings/UpdatableIndexSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Settings/UpdatableIndexSettings.cs
index 935537feb6..15b904c1af 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Settings/UpdatableIndexSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Settings/UpdatableIndexSettings.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Collection of OpenSearch index settings that can be dynamically updated
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLog.cs b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLog.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLog.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLog.cs
index 5a2a6c3fca..6dd7fea92c 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLog.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLog.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ISlowLog
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogIndexing.cs b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogIndexing.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogIndexing.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogIndexing.cs
index ff9b6a5ce8..a38853b501 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogIndexing.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogIndexing.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ISlowLogIndexing
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearch.cs b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearch.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearch.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearch.cs
index 04f2a10655..46af8c153b 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearch.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearch.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ISlowLogSearch
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearchFetch.cs b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearchFetch.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearchFetch.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearchFetch.cs
index 967f5e6ac1..5dc903fb82 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearchFetch.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearchFetch.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ISlowLogSearchFetch
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearchQuery.cs b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearchQuery.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearchQuery.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearchQuery.cs
index 5f9a7169f3..e0bffcd5c1 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/ISlowLogSearchQuery.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/ISlowLogSearchQuery.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ISlowLogSearchQuery
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/LogLevel.cs b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/LogLevel.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/LogLevel.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/SlowLog/LogLevel.cs
index 5dc4646ba3..3f16d44517 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/SlowLog/LogLevel.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/SlowLog/LogLevel.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[StringEnum]
 	public enum LogLevel
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/SoftDeletes/ISoftDeleteRetentionSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/SoftDeletes/ISoftDeleteRetentionSettings.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/SoftDeletes/ISoftDeleteRetentionSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/SoftDeletes/ISoftDeleteRetentionSettings.cs
index a8900de19c..77da8eca7f 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/SoftDeletes/ISoftDeleteRetentionSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/SoftDeletes/ISoftDeleteRetentionSettings.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ISoftDeleteRetentionSettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/SoftDeletes/ISoftDeleteSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/SoftDeletes/ISoftDeleteSettings.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/SoftDeletes/ISoftDeleteSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/SoftDeletes/ISoftDeleteSettings.cs
index a333af071d..ba06a136c5 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/SoftDeletes/ISoftDeleteSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/SoftDeletes/ISoftDeleteSettings.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ISoftDeleteSettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Sorting/ISortingSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Sorting/ISortingSettings.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Sorting/ISortingSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Sorting/ISortingSettings.cs
index f7dbef1d1c..b5c33e4bc1 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Sorting/ISortingSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Sorting/ISortingSettings.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public static class IndexSortSettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Store/FileSystemStorageImplementation.cs b/src/OpenSearch.Client/Indices/IndexSettings/Store/FileSystemStorageImplementation.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Store/FileSystemStorageImplementation.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Store/FileSystemStorageImplementation.cs
index e607bd08b6..7422b884d3 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Store/FileSystemStorageImplementation.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Store/FileSystemStorageImplementation.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// The store module allows you to control how index data is stored and accessed on disk.
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogDurability.cs b/src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogDurability.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogDurability.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogDurability.cs
index 5e0cc330cb..7071259908 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogDurability.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogDurability.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[StringEnum]
 	public enum TranslogDurability
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogFlushSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogFlushSettings.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogFlushSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogFlushSettings.cs
index f1b605e612..1571e8b4cb 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogFlushSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogFlushSettings.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ITranslogFlushSettings
 	{
diff --git a/src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogSettings.cs b/src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogSettings.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogSettings.cs
rename to src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogSettings.cs
index 29001a99e7..28ed7cd7ea 100644
--- a/src/OpenSearch.Client/IndexModules/IndexSettings/Translog/TranslogSettings.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/Translog/TranslogSettings.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public interface ITranslogSettings
 	{
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsRequest.cs b/src/OpenSearch.Client/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsRequest.cs
index 9edf490e8a..fb4bf41f31 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsRequest.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsRequest.cs
@@ -29,7 +29,7 @@
 using System;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.put_settings.json")]
 	[JsonFormatter(typeof(UpdateIndexSettingsRequestFormatter))]
diff --git a/src/OpenSearch.Client/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsResponse.cs b/src/OpenSearch.Client/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsResponse.cs
index 9acf847a96..51e91a3864 100644
--- a/src/OpenSearch.Client/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsResponse.cs
+++ b/src/OpenSearch.Client/Indices/IndexSettings/UpdateIndexSettings/UpdateIndexSettingsResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class UpdateIndexSettingsResponse : AcknowledgedResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/FieldMappingFormatter.cs b/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/FieldMappingFormatter.cs
index b617fb746a..c3fb7efc6d 100644
--- a/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/FieldMappingFormatter.cs
+++ b/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/FieldMappingFormatter.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net.Utf8Json.Internal;
 using OpenSearch.Net.Utf8Json.Resolvers;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	internal class FieldMappingFormatter : IJsonFormatter<IReadOnlyDictionary<Field, IFieldMapping>>
 	{
diff --git a/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs b/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs
index 5e6770be47..ec47bd05cd 100644
--- a/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs
+++ b/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.get_field_mapping.json")]
 	public partial interface IGetFieldMappingRequest { }
diff --git a/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/GetFieldMappingResponse.cs b/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/GetFieldMappingResponse.cs
index d5a96126b3..94e78825ab 100644
--- a/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/GetFieldMappingResponse.cs
+++ b/src/OpenSearch.Client/Indices/MappingManagement/GetFieldMapping/GetFieldMappingResponse.cs
@@ -34,7 +34,7 @@
 using OpenSearch.Net.Utf8Json;
 using static OpenSearch.Client.Infer;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(ResolvableDictionaryResponseFormatter<GetFieldMappingResponse, IndexName, TypeFieldMappings>))]
 	public class GetFieldMappingResponse : DictionaryResponseBase<IndexName, TypeFieldMappings>
diff --git a/src/OpenSearch.Client/Indices/MappingManagement/GetMapping/GetMappingRequest.cs b/src/OpenSearch.Client/Indices/MappingManagement/GetMapping/GetMappingRequest.cs
index f5d9971589..5c0ea7974b 100644
--- a/src/OpenSearch.Client/Indices/MappingManagement/GetMapping/GetMappingRequest.cs
+++ b/src/OpenSearch.Client/Indices/MappingManagement/GetMapping/GetMappingRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.get_mapping.json")]
 	public partial interface IGetMappingRequest { }
diff --git a/src/OpenSearch.Client/Indices/MappingManagement/GetMapping/GetMappingResponse.cs b/src/OpenSearch.Client/Indices/MappingManagement/GetMapping/GetMappingResponse.cs
index 39fa9a0af0..22b39d0f56 100644
--- a/src/OpenSearch.Client/Indices/MappingManagement/GetMapping/GetMappingResponse.cs
+++ b/src/OpenSearch.Client/Indices/MappingManagement/GetMapping/GetMappingResponse.cs
@@ -26,12 +26,11 @@
 *  under the License.
 */
 
-using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(ResolvableDictionaryResponseFormatter<GetMappingResponse, IndexName, IndexMappings>))]
 	public class GetMappingResponse : DictionaryResponseBase<IndexName, IndexMappings>
diff --git a/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/OpenSearchClient-Map.cs b/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/OpenSearchClient-Map.cs
index 93be8d30a5..51aea6923a 100644
--- a/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/OpenSearchClient-Map.cs
+++ b/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/OpenSearchClient-Map.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using OpenSearch.Client.Specification.IndicesApi;
 
 namespace OpenSearch.Client
 {
diff --git a/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/PutMappingRequest.cs b/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
index 48f8fd5d9b..131698685d 100644
--- a/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
+++ b/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
@@ -31,7 +31,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.put_mapping.json")]
 	[ReadAs(typeof(PutMappingRequest))]
diff --git a/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/PutMappingResponse.cs b/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/PutMappingResponse.cs
index bff1d34919..b1f416cbd6 100644
--- a/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/PutMappingResponse.cs
+++ b/src/OpenSearch.Client/Indices/MappingManagement/PutMapping/PutMappingResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class PutMappingResponse : IndicesResponseBase { }
 }
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/BM25Similarity.cs b/src/OpenSearch.Client/Indices/Similarity/BM25Similarity.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/Similarity/BM25Similarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/BM25Similarity.cs
index 5e8127bfbc..8ff36c6d9b 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/BM25Similarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/BM25Similarity.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// BM25 Similarity. Introduced in Stephen E. Robertson, Steve Walker, Susan Jones, Micheline Hancock-Beaulieu,
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/CustomSimilarity.cs b/src/OpenSearch.Client/Indices/Similarity/CustomSimilarity.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/Similarity/CustomSimilarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/CustomSimilarity.cs
index 5ffa91faec..3382213e2e 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/CustomSimilarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/CustomSimilarity.cs
@@ -28,7 +28,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A custom similarity
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/DFI/DFIIndependenceMeasure.cs b/src/OpenSearch.Client/Indices/Similarity/DFI/DFIIndependenceMeasure.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/Similarity/DFI/DFIIndependenceMeasure.cs
rename to src/OpenSearch.Client/Indices/Similarity/DFI/DFIIndependenceMeasure.cs
index 1076415401..a435227dcc 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/DFI/DFIIndependenceMeasure.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/DFI/DFIIndependenceMeasure.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// <see cref="IDFISimilarity" /> independence measure
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/DFI/DFISimilarity.cs b/src/OpenSearch.Client/Indices/Similarity/DFI/DFISimilarity.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/Similarity/DFI/DFISimilarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/DFI/DFISimilarity.cs
index 439fd74848..81727401a8 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/DFI/DFISimilarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/DFI/DFISimilarity.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Similarity that implements the divergence from independence model
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRAfterEffect.cs b/src/OpenSearch.Client/Indices/Similarity/DFR/DFRAfterEffect.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRAfterEffect.cs
rename to src/OpenSearch.Client/Indices/Similarity/DFR/DFRAfterEffect.cs
index 8c0dee7535..101e4b5a09 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRAfterEffect.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/DFR/DFRAfterEffect.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[StringEnum]
 	public enum DFRAfterEffect
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRBasicModel.cs b/src/OpenSearch.Client/Indices/Similarity/DFR/DFRBasicModel.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRBasicModel.cs
rename to src/OpenSearch.Client/Indices/Similarity/DFR/DFRBasicModel.cs
index ce59b83e4b..e755969188 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRBasicModel.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/DFR/DFRBasicModel.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[StringEnum]
 	[SuppressMessage("ReSharper", "InconsistentNaming")]
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRSimilarity.cs b/src/OpenSearch.Client/Indices/Similarity/DFR/DFRSimilarity.cs
similarity index 99%
rename from src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRSimilarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/DFR/DFRSimilarity.cs
index 9ffe488992..d73e71c487 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/DFR/DFRSimilarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/DFR/DFRSimilarity.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Implements the divergence from randomness (DFR) framework introduced in Gianni Amati and Cornelis Joost Van Rijsbergen.
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/IB/IBDistribution.cs b/src/OpenSearch.Client/Indices/Similarity/IB/IBDistribution.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/Similarity/IB/IBDistribution.cs
rename to src/OpenSearch.Client/Indices/Similarity/IB/IBDistribution.cs
index ea741bf3c0..bb1c7d1e02 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/IB/IBDistribution.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/IB/IBDistribution.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[StringEnum]
 	// ReSharper disable once InconsistentNaming
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/IB/IBLambda.cs b/src/OpenSearch.Client/Indices/Similarity/IB/IBLambda.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/Similarity/IB/IBLambda.cs
rename to src/OpenSearch.Client/Indices/Similarity/IB/IBLambda.cs
index 79d60a8a26..d951cd465f 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/IB/IBLambda.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/IB/IBLambda.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[StringEnum]
 	// ReSharper disable once InconsistentNaming
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/IB/IBSimilarity.cs b/src/OpenSearch.Client/Indices/Similarity/IB/IBSimilarity.cs
similarity index 99%
rename from src/OpenSearch.Client/IndexModules/Similarity/IB/IBSimilarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/IB/IBSimilarity.cs
index e06ac47e32..8a5a05276a 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/IB/IBSimilarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/IB/IBSimilarity.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 // ReSharper disable InconsistentNaming
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// Information based model similarity.
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/LMDirichletSimilarity.cs b/src/OpenSearch.Client/Indices/Similarity/LMDirichletSimilarity.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/Similarity/LMDirichletSimilarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/LMDirichletSimilarity.cs
index 0bb6bee7c1..ad22c865bf 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/LMDirichletSimilarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/LMDirichletSimilarity.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net.Utf8Json;
 // ReSharper disable InconsistentNaming
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A similarity with Bayesian smoothing using Dirichlet priors.
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/LMJelinekMercerSimilarity.cs b/src/OpenSearch.Client/Indices/Similarity/LMJelinekMercerSimilarity.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/Similarity/LMJelinekMercerSimilarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/LMJelinekMercerSimilarity.cs
index 000e317315..373551de73 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/LMJelinekMercerSimilarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/LMJelinekMercerSimilarity.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net.Utf8Json;
 // ReSharper disable InconsistentNaming
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A similarity that attempts to capture important patterns in the text,
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/Normalization.cs b/src/OpenSearch.Client/Indices/Similarity/Normalization.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/Similarity/Normalization.cs
rename to src/OpenSearch.Client/Indices/Similarity/Normalization.cs
index 3c920f1ba8..9316dbe7b5 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/Normalization.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/Normalization.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[StringEnum]
 	public enum Normalization
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/ScriptedSimilarity.cs b/src/OpenSearch.Client/Indices/Similarity/ScriptedSimilarity.cs
similarity index 97%
rename from src/OpenSearch.Client/IndexModules/Similarity/ScriptedSimilarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/ScriptedSimilarity.cs
index c16aea3c79..9dd277322b 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/ScriptedSimilarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/ScriptedSimilarity.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A similarity that allows a script to be used in order to specify how scores should be computed.
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/Similarities.cs b/src/OpenSearch.Client/Indices/Similarity/Similarities.cs
similarity index 99%
rename from src/OpenSearch.Client/IndexModules/Similarity/Similarities.cs
rename to src/OpenSearch.Client/Indices/Similarity/Similarities.cs
index a6facb746b..acda8e4571 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/Similarities.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/Similarities.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[JsonFormatter(typeof(VerbatimDictionaryKeysFormatter<Similarities, ISimilarities, string, ISimilarity>))]
 	public interface ISimilarities : IIsADictionary<string, ISimilarity> { }
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/Similarity.cs b/src/OpenSearch.Client/Indices/Similarity/Similarity.cs
similarity index 96%
rename from src/OpenSearch.Client/IndexModules/Similarity/Similarity.cs
rename to src/OpenSearch.Client/Indices/Similarity/Similarity.cs
index d2eba081c1..2a6583e264 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/Similarity.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/Similarity.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	/// <summary>
 	/// A similarity.
diff --git a/src/OpenSearch.Client/IndexModules/Similarity/SimilarityFormatter.cs b/src/OpenSearch.Client/Indices/Similarity/SimilarityFormatter.cs
similarity index 98%
rename from src/OpenSearch.Client/IndexModules/Similarity/SimilarityFormatter.cs
rename to src/OpenSearch.Client/Indices/Similarity/SimilarityFormatter.cs
index 513beaec1c..4eecdd6f60 100644
--- a/src/OpenSearch.Client/IndexModules/Similarity/SimilarityFormatter.cs
+++ b/src/OpenSearch.Client/Indices/Similarity/SimilarityFormatter.cs
@@ -33,7 +33,7 @@
 using OpenSearch.Net.Utf8Json.Internal;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	internal class SimilarityFormatter : IJsonFormatter<ISimilarity>
 	{
diff --git a/src/OpenSearch.Client/Indices/StatusManagement/ClearCache/ClearCacheRequest.cs b/src/OpenSearch.Client/Indices/StatusManagement/ClearCache/ClearCacheRequest.cs
index 086c1f04ba..38a14e11f3 100644
--- a/src/OpenSearch.Client/Indices/StatusManagement/ClearCache/ClearCacheRequest.cs
+++ b/src/OpenSearch.Client/Indices/StatusManagement/ClearCache/ClearCacheRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.clear_cache.json")]
 	public partial interface IClearCacheRequest { }
diff --git a/src/OpenSearch.Client/Indices/StatusManagement/ClearCache/ClearCacheResponse.cs b/src/OpenSearch.Client/Indices/StatusManagement/ClearCache/ClearCacheResponse.cs
index b274e4ae8f..54af26cefe 100644
--- a/src/OpenSearch.Client/Indices/StatusManagement/ClearCache/ClearCacheResponse.cs
+++ b/src/OpenSearch.Client/Indices/StatusManagement/ClearCache/ClearCacheResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class ClearCacheResponse : ShardsOperationResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/StatusManagement/Flush/FlushRequest.cs b/src/OpenSearch.Client/Indices/StatusManagement/Flush/FlushRequest.cs
index 7f02c8d2b2..52c9c6be3e 100644
--- a/src/OpenSearch.Client/Indices/StatusManagement/Flush/FlushRequest.cs
+++ b/src/OpenSearch.Client/Indices/StatusManagement/Flush/FlushRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.flush.json")]
 	public partial interface IFlushRequest { }
diff --git a/src/OpenSearch.Client/Indices/StatusManagement/Flush/FlushResponse.cs b/src/OpenSearch.Client/Indices/StatusManagement/Flush/FlushResponse.cs
index 627bdf1129..07c2426ef5 100644
--- a/src/OpenSearch.Client/Indices/StatusManagement/Flush/FlushResponse.cs
+++ b/src/OpenSearch.Client/Indices/StatusManagement/Flush/FlushResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class FlushResponse : ShardsOperationResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/StatusManagement/ForceMerge/ForceMergeRequest.cs b/src/OpenSearch.Client/Indices/StatusManagement/ForceMerge/ForceMergeRequest.cs
index 1735dd99a0..64a71668ce 100644
--- a/src/OpenSearch.Client/Indices/StatusManagement/ForceMerge/ForceMergeRequest.cs
+++ b/src/OpenSearch.Client/Indices/StatusManagement/ForceMerge/ForceMergeRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.forcemerge.json")]
 	public partial interface IForceMergeRequest { }
diff --git a/src/OpenSearch.Client/Indices/StatusManagement/ForceMerge/ForceMergeResponse.cs b/src/OpenSearch.Client/Indices/StatusManagement/ForceMerge/ForceMergeResponse.cs
index 54158a40a9..8e50af8104 100644
--- a/src/OpenSearch.Client/Indices/StatusManagement/ForceMerge/ForceMergeResponse.cs
+++ b/src/OpenSearch.Client/Indices/StatusManagement/ForceMerge/ForceMergeResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class ForceMergeResponse : ShardsOperationResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Indices/StatusManagement/Refresh/RefreshRequest.cs b/src/OpenSearch.Client/Indices/StatusManagement/Refresh/RefreshRequest.cs
index dd7ee1401b..b68cda65c8 100644
--- a/src/OpenSearch.Client/Indices/StatusManagement/Refresh/RefreshRequest.cs
+++ b/src/OpenSearch.Client/Indices/StatusManagement/Refresh/RefreshRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.refresh.json")]
 	public partial interface IRefreshRequest { }
diff --git a/src/OpenSearch.Client/Indices/StatusManagement/Refresh/RefreshResponse.cs b/src/OpenSearch.Client/Indices/StatusManagement/Refresh/RefreshResponse.cs
index 6c18a2a1f5..5abbbd80ab 100644
--- a/src/OpenSearch.Client/Indices/StatusManagement/Refresh/RefreshResponse.cs
+++ b/src/OpenSearch.Client/Indices/StatusManagement/Refresh/RefreshResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	public class RefreshResponse : ShardsOperationResponseBase { }
 }
diff --git a/src/OpenSearch.Client/Search/Validate/ValidateQueryRequest.cs b/src/OpenSearch.Client/Indices/ValidateQuery/ValidateQueryRequest.cs
similarity index 97%
rename from src/OpenSearch.Client/Search/Validate/ValidateQueryRequest.cs
rename to src/OpenSearch.Client/Indices/ValidateQuery/ValidateQueryRequest.cs
index 1bd62df3a4..67cf58a398 100644
--- a/src/OpenSearch.Client/Search/Validate/ValidateQueryRequest.cs
+++ b/src/OpenSearch.Client/Indices/ValidateQuery/ValidateQueryRequest.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[MapsApi("indices.validate_query.json")]
 	public partial interface IValidateQueryRequest
diff --git a/src/OpenSearch.Client/Search/Validate/ValidateQueryResponse.cs b/src/OpenSearch.Client/Indices/ValidateQuery/ValidateQueryResponse.cs
similarity index 96%
rename from src/OpenSearch.Client/Search/Validate/ValidateQueryResponse.cs
rename to src/OpenSearch.Client/Indices/ValidateQuery/ValidateQueryResponse.cs
index 248a67932a..d08876fa77 100644
--- a/src/OpenSearch.Client/Search/Validate/ValidateQueryResponse.cs
+++ b/src/OpenSearch.Client/Indices/ValidateQuery/ValidateQueryResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[DataContract]
 	public class ValidateQueryResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Search/Validate/ValidationExplanation.cs b/src/OpenSearch.Client/Indices/ValidateQuery/ValidationExplanation.cs
similarity index 96%
rename from src/OpenSearch.Client/Search/Validate/ValidationExplanation.cs
rename to src/OpenSearch.Client/Indices/ValidateQuery/ValidationExplanation.cs
index 9c3f5f5e18..cbb84000d6 100644
--- a/src/OpenSearch.Client/Search/Validate/ValidationExplanation.cs
+++ b/src/OpenSearch.Client/Indices/ValidateQuery/ValidationExplanation.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[DataContract]
 	public class ValidationExplanation
diff --git a/src/OpenSearch.Client/Mapping/Visitor/MappingWalker.cs b/src/OpenSearch.Client/Mapping/Visitor/MappingWalker.cs
index eed64b7b3c..4534e6efc0 100644
--- a/src/OpenSearch.Client/Mapping/Visitor/MappingWalker.cs
+++ b/src/OpenSearch.Client/Mapping/Visitor/MappingWalker.cs
@@ -27,6 +27,7 @@
 */
 
 using System;
+using OpenSearch.Client.Specification.IndicesApi;
 
 namespace OpenSearch.Client
 {
diff --git a/src/OpenSearch.Client/Modules/Cluster/ClusterModuleSettings.cs b/src/OpenSearch.Client/Modules/Cluster/ClusterModuleSettings.cs
index e0b443692c..10c7e7f382 100644
--- a/src/OpenSearch.Client/Modules/Cluster/ClusterModuleSettings.cs
+++ b/src/OpenSearch.Client/Modules/Cluster/ClusterModuleSettings.cs
@@ -28,6 +28,7 @@
 
 using System;
 using System.Collections.Generic;
+using OpenSearch.Client.Specification.IndicesApi;
 
 namespace OpenSearch.Client
 {
diff --git a/src/OpenSearch.Client/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs b/src/OpenSearch.Client/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs
index 3d6b0e872b..0fa0f52f57 100644
--- a/src/OpenSearch.Client/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs
+++ b/src/OpenSearch.Client/Modules/SnapshotAndRestore/Restore/RestoreRequest.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
+using OpenSearch.Client.Specification.IndicesApi;
 
 namespace OpenSearch.Client
 {
diff --git a/src/OpenSearch.Client/Requests.Indices.cs b/src/OpenSearch.Client/Requests.Indices.cs
index 02f5b75f4e..397bbcb30c 100644
--- a/src/OpenSearch.Client/Requests.Indices.cs
+++ b/src/OpenSearch.Client/Requests.Indices.cs
@@ -41,7 +41,7 @@
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.IndicesApi
 {
 	[InterfaceDataContract]
 	public partial interface IAddIndexBlockRequest : IRequest<AddIndexBlockRequestParameters>
diff --git a/tests/Tests.Core/ManagedOpenSearch/Clusters/UnbalancedCluster.cs b/tests/Tests.Core/ManagedOpenSearch/Clusters/UnbalancedCluster.cs
index 9c9d50b650..6f2eabd181 100644
--- a/tests/Tests.Core/ManagedOpenSearch/Clusters/UnbalancedCluster.cs
+++ b/tests/Tests.Core/ManagedOpenSearch/Clusters/UnbalancedCluster.cs
@@ -27,6 +27,7 @@
 */
 
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.NodeSeeders;
 
 namespace Tests.Core.ManagedOpenSearch.Clusters
diff --git a/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs b/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs
index c3c93e125c..4f0e6db6ab 100644
--- a/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs
+++ b/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs
@@ -31,6 +31,7 @@
 using System.Threading.Tasks;
 using OpenSearch.Client;
 using OpenSearch.Client.Specification.ClusterApi;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Configuration;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
diff --git a/tests/Tests.Reproduce/GithubIssue3262.cs b/tests/Tests.Reproduce/GithubIssue3262.cs
index 4e7f81a930..555db94fbb 100644
--- a/tests/Tests.Reproduce/GithubIssue3262.cs
+++ b/tests/Tests.Reproduce/GithubIssue3262.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 
 namespace Tests.Reproduce
 {
diff --git a/tests/Tests/Analysis/AnalysisComponentTestBase.cs b/tests/Tests/Analysis/AnalysisComponentTestBase.cs
index 6f1489b7d5..90ed3c3743 100644
--- a/tests/Tests/Analysis/AnalysisComponentTestBase.cs
+++ b/tests/Tests/Analysis/AnalysisComponentTestBase.cs
@@ -32,6 +32,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Client;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Core.Serialization;
diff --git a/tests/Tests/Analysis/AnalysisCrudTests.cs b/tests/Tests/Analysis/AnalysisCrudTests.cs
index fe200c2eb6..3e2d013ffe 100644
--- a/tests/Tests/Analysis/AnalysisCrudTests.cs
+++ b/tests/Tests/Analysis/AnalysisCrudTests.cs
@@ -29,6 +29,7 @@
 using System.Linq;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Analysis/AnalysisUsageTests.cs b/tests/Tests/Analysis/AnalysisUsageTests.cs
index 24ee28afad..ecfb3b9b3d 100644
--- a/tests/Tests/Analysis/AnalysisUsageTests.cs
+++ b/tests/Tests/Analysis/AnalysisUsageTests.cs
@@ -33,6 +33,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Analysis.Analyzers;
 using Tests.Analysis.CharFilters;
 using Tests.Analysis.Normalizers;
diff --git a/tests/Tests/Analysis/AnalysisWithNormalizerCrudTests.cs b/tests/Tests/Analysis/AnalysisWithNormalizerCrudTests.cs
index 2922fe2762..4c704d1187 100644
--- a/tests/Tests/Analysis/AnalysisWithNormalizerCrudTests.cs
+++ b/tests/Tests/Analysis/AnalysisWithNormalizerCrudTests.cs
@@ -27,6 +27,7 @@
 */
 
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests.TestState;
 using static Tests.Framework.Extensions.Promisify;
diff --git a/tests/Tests/Analysis/CharFilters/CharFilterTests.cs b/tests/Tests/Analysis/CharFilters/CharFilterTests.cs
index 0db7d19469..c85dd9ee8f 100644
--- a/tests/Tests/Analysis/CharFilters/CharFilterTests.cs
+++ b/tests/Tests/Analysis/CharFilters/CharFilterTests.cs
@@ -30,6 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Serialization;
 
 namespace Tests.Analysis.CharFilters
diff --git a/tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs b/tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
index aee4d0db76..166f7e212a 100644
--- a/tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
+++ b/tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
@@ -30,6 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Serialization;
 
 namespace Tests.Analysis.TokenFilters
diff --git a/tests/Tests/Analysis/TokenFilters/TokenFilterUsageTests.cs b/tests/Tests/Analysis/TokenFilters/TokenFilterUsageTests.cs
index d90453b91f..f5ca1ea70f 100644
--- a/tests/Tests/Analysis/TokenFilters/TokenFilterUsageTests.cs
+++ b/tests/Tests/Analysis/TokenFilters/TokenFilterUsageTests.cs
@@ -28,6 +28,7 @@
 
 using System;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.IndexModules;
 
 namespace Tests.Analysis.TokenFilters
diff --git a/tests/Tests/ClientConcepts/HighLevel/Analysis/TestingAnalyzers.doc.cs b/tests/Tests/ClientConcepts/HighLevel/Analysis/TestingAnalyzers.doc.cs
index ff0c5faba6..b89c2ddea6 100644
--- a/tests/Tests/ClientConcepts/HighLevel/Analysis/TestingAnalyzers.doc.cs
+++ b/tests/Tests/ClientConcepts/HighLevel/Analysis/TestingAnalyzers.doc.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.DocumentationTests;
diff --git a/tests/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs b/tests/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs
index 0e018753f9..22a3142a0d 100644
--- a/tests/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs
+++ b/tests/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs
@@ -32,6 +32,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Client;
 using Tests.Framework;
 using static Tests.Core.Serialization.SerializationTestHelper;
diff --git a/tests/Tests/CodeStandards/Analysis.cs b/tests/Tests/CodeStandards/Analysis.cs
index 8cb31ca1a9..55c30d52ee 100644
--- a/tests/Tests/CodeStandards/Analysis.cs
+++ b/tests/Tests/CodeStandards/Analysis.cs
@@ -34,6 +34,7 @@
 using FluentAssertions;
 using OpenSearch.Client;
 using System.Runtime.Serialization;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Xunit;
 
 namespace Tests.CodeStandards
diff --git a/tests/Tests/CodeStandards/Descriptors.doc.cs b/tests/Tests/CodeStandards/Descriptors.doc.cs
index d0e9214cff..6bbb448a88 100644
--- a/tests/Tests/CodeStandards/Descriptors.doc.cs
+++ b/tests/Tests/CodeStandards/Descriptors.doc.cs
@@ -34,6 +34,7 @@
 using Tests.Framework;
 using System.Reflection;
 using OpenSearch.Client.Specification.ClusterApi;
+using OpenSearch.Client.Specification.IndicesApi;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 
 namespace Tests.CodeStandards
diff --git a/tests/Tests/CodeStandards/NamingConventions.doc.cs b/tests/Tests/CodeStandards/NamingConventions.doc.cs
index 0bde174e53..cd1cac5e79 100644
--- a/tests/Tests/CodeStandards/NamingConventions.doc.cs
+++ b/tests/Tests/CodeStandards/NamingConventions.doc.cs
@@ -35,6 +35,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework;
 
 namespace Tests.CodeStandards
diff --git a/tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs b/tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs
index b2830fcfe1..7e2ea2acea 100644
--- a/tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs
+++ b/tests/Tests/CommonOptions/AutoExpandReplicas/AutoExpandReplicasTests.cs
@@ -33,13 +33,15 @@
 
 namespace Tests.CommonOptions.AutoExpandReplicas
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class AutoExpandReplicasTests
 	{
 		[U]
 		public void ImplicitConversionFromNullString()
 		{
 			string nullString = null;
-			OpenSearch.Client.AutoExpandReplicas autoExpandReplicas = nullString;
+			AutoExpandReplicas autoExpandReplicas = nullString;
 			autoExpandReplicas.Should().BeNull();
 		}
 
@@ -47,7 +49,7 @@ public void ImplicitConversionFromNullString()
 		public void ImplicitConversionFromMinAndMaxString()
 		{
 			var minAndMax = "0-5";
-			OpenSearch.Client.AutoExpandReplicas autoExpandReplicas = minAndMax;
+			AutoExpandReplicas autoExpandReplicas = minAndMax;
 			autoExpandReplicas.Should().NotBeNull();
 			autoExpandReplicas.Enabled.Should().BeTrue();
 			autoExpandReplicas.MinReplicas.Should().Be(0);
@@ -62,7 +64,7 @@ public void ImplicitConversionFromMinAndMaxString()
 		public void ImplicitConversionFromMinAndAllString()
 		{
 			var minAndMax = "0-all";
-			OpenSearch.Client.AutoExpandReplicas autoExpandReplicas = minAndMax;
+			AutoExpandReplicas autoExpandReplicas = minAndMax;
 			autoExpandReplicas.Should().NotBeNull();
 			autoExpandReplicas.Enabled.Should().BeTrue();
 			autoExpandReplicas.MinReplicas.Should().Be(0);
@@ -76,7 +78,7 @@ public void ImplicitConversionFromMinAndAllString()
 		[U]
 		public void CreateWithMinAndMax()
 		{
-			var autoExpandReplicas = OpenSearch.Client.AutoExpandReplicas.Create(2, 3);
+			var autoExpandReplicas = AutoExpandReplicas.Create(2, 3);
 			autoExpandReplicas.Should().NotBeNull();
 			autoExpandReplicas.Enabled.Should().BeTrue();
 			autoExpandReplicas.MinReplicas.Should().Be(2);
@@ -90,7 +92,7 @@ public void CreateWithMinAndMax()
 		[U]
 		public void CreateWithMinAndAll()
 		{
-			var autoExpandReplicas = OpenSearch.Client.AutoExpandReplicas.Create(0);
+			var autoExpandReplicas = AutoExpandReplicas.Create(0);
 			autoExpandReplicas.Should().NotBeNull();
 			autoExpandReplicas.Enabled.Should().BeTrue();
 			autoExpandReplicas.MinReplicas.Should().Be(0);
@@ -104,7 +106,7 @@ public void CreateWithMinAndAll()
 		[U]
 		public void CreateWithFalse()
 		{
-			var autoExpandReplicas = OpenSearch.Client.AutoExpandReplicas.Create("false");
+			var autoExpandReplicas = AutoExpandReplicas.Create("false");
 			autoExpandReplicas.Should().NotBeNull();
 			autoExpandReplicas.Enabled.Should().BeFalse();
 			autoExpandReplicas.MinReplicas.Should().BeNull();
@@ -115,7 +117,7 @@ public void CreateWithFalse()
 		[U]
 		public void Disabled()
 		{
-			var autoExpandReplicas = OpenSearch.Client.AutoExpandReplicas.Disabled;
+			var autoExpandReplicas = AutoExpandReplicas.Disabled;
 			autoExpandReplicas.Should().NotBeNull();
 			autoExpandReplicas.Enabled.Should().BeFalse();
 			autoExpandReplicas.MinReplicas.Should().NotHaveValue();
@@ -126,18 +128,18 @@ public void Disabled()
 
 		[U]
 		public void MinMustBeEqualOrLessThanMax() =>
-			Assert.Throws<ArgumentException>(() => OpenSearch.Client.AutoExpandReplicas.Create(2, 1));
+			Assert.Throws<ArgumentException>(() => AutoExpandReplicas.Create(2, 1));
 
 		[U]
 		public void MinMustBeGreaterThanOrEqualToZero() =>
-			Assert.Throws<ArgumentException>(() => OpenSearch.Client.AutoExpandReplicas.Create(-1));
+			Assert.Throws<ArgumentException>(() => AutoExpandReplicas.Create(-1));
 
 		[U]
 		public void MinMustBeAnInteger() =>
-			Assert.Throws<FormatException>(() => OpenSearch.Client.AutoExpandReplicas.Create("all-all"));
+			Assert.Throws<FormatException>(() => AutoExpandReplicas.Create("all-all"));
 
 		[U]
 		public void MaxMustBeAllOrAnInteger() =>
-			Assert.Throws<FormatException>(() => OpenSearch.Client.AutoExpandReplicas.Create("2-boo"));
+			Assert.Throws<FormatException>(() => AutoExpandReplicas.Create("2-boo"));
 	}
 }
diff --git a/tests/Tests/Document/Single/DocumentCrudTests.cs b/tests/Tests/Document/Single/DocumentCrudTests.cs
index 4ed3908c75..97b65b9532 100644
--- a/tests/Tests/Document/Single/DocumentCrudTests.cs
+++ b/tests/Tests/Document/Single/DocumentCrudTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Document/Single/Exists/DocumentExistsApiTests.cs b/tests/Tests/Document/Single/Exists/DocumentExistsApiTests.cs
index 996a615a55..620c742c3c 100644
--- a/tests/Tests/Document/Single/Exists/DocumentExistsApiTests.cs
+++ b/tests/Tests/Document/Single/Exists/DocumentExistsApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Document/Single/Exists/DocumentExistsNotFoundApiTests.cs b/tests/Tests/Document/Single/Exists/DocumentExistsNotFoundApiTests.cs
index b29592a95f..aea33b7904 100644
--- a/tests/Tests/Document/Single/Exists/DocumentExistsNotFoundApiTests.cs
+++ b/tests/Tests/Document/Single/Exists/DocumentExistsNotFoundApiTests.cs
@@ -28,6 +28,7 @@
 
 using System.Globalization;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests.TestState;
 
diff --git a/tests/Tests/Document/Single/SourceExists/SourceExistsApiTests.cs b/tests/Tests/Document/Single/SourceExists/SourceExistsApiTests.cs
index 0802f3afda..2f4ace8a91 100644
--- a/tests/Tests/Document/Single/SourceExists/SourceExistsApiTests.cs
+++ b/tests/Tests/Document/Single/SourceExists/SourceExistsApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs b/tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs
index 906112b6ed..c3c8c47aa1 100644
--- a/tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs
+++ b/tests/Tests/Framework/EndpointTests/ApiIntegrationAgainstNewIndexTestBase.cs
@@ -32,6 +32,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Framework/EndpointTests/CrudTestBase.cs b/tests/Tests/Framework/EndpointTests/CrudTestBase.cs
index 6515b06b39..19e248c4b1 100644
--- a/tests/Tests/Framework/EndpointTests/CrudTestBase.cs
+++ b/tests/Tests/Framework/EndpointTests/CrudTestBase.cs
@@ -34,6 +34,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
diff --git a/tests/Tests/IndexModules/IndexSettings/Merge/MergeSettings.cs b/tests/Tests/IndexModules/IndexSettings/Merge/MergeSettings.cs
index 752f3e32ea..3609376794 100644
--- a/tests/Tests/IndexModules/IndexSettings/Merge/MergeSettings.cs
+++ b/tests/Tests/IndexModules/IndexSettings/Merge/MergeSettings.cs
@@ -32,12 +32,14 @@
 
 namespace Tests.IndexModules.IndexSettings.Merge
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class IndexMergeSettings
 	{
 		/**
 		 */
 
-		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, OpenSearch.Client.IndexSettings>
+		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, IndexSettings>
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
@@ -53,7 +55,7 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 			};
 
 			/**
-			 * 
+			 *
 			 */
 			protected override Func<IndexSettingsDescriptor, IPromise<IIndexSettings>> Fluent => s => s
 				.Merge(merge => merge
@@ -74,8 +76,8 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 
 			/**
 			 */
-			protected override OpenSearch.Client.IndexSettings Initializer =>
-				new OpenSearch.Client.IndexSettings
+			protected override IndexSettings Initializer =>
+				new()
 				{
 					Merge = new MergeSettings
 					{
diff --git a/tests/Tests/IndexModules/IndexSettings/Settings/RoutingPartitionSizeIndexSettings.cs b/tests/Tests/IndexModules/IndexSettings/Settings/RoutingPartitionSizeIndexSettings.cs
index eff7f67762..00d66c5fc1 100644
--- a/tests/Tests/IndexModules/IndexSettings/Settings/RoutingPartitionSizeIndexSettings.cs
+++ b/tests/Tests/IndexModules/IndexSettings/Settings/RoutingPartitionSizeIndexSettings.cs
@@ -33,7 +33,9 @@
 
 namespace Tests.IndexModules.IndexSettings.Settings
 {
-	public class RoutingPartitionSizeIndexSettingsUsage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, OpenSearch.Client.IndexSettings>
+	using OpenSearch.Client.Specification.IndicesApi;
+
+	public class RoutingPartitionSizeIndexSettingsUsage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, IndexSettings>
 	{
 		protected override object ExpectJson => new Dictionary<string, object>
 		{
@@ -48,8 +50,8 @@ public class RoutingPartitionSizeIndexSettingsUsage : PromiseUsageTestBase<IInde
 
 		/**
 		 */
-		protected override OpenSearch.Client.IndexSettings Initializer =>
-			new OpenSearch.Client.IndexSettings
+		protected override IndexSettings Initializer =>
+			new()
 			{
 				RoutingPartitionSize = 6,
 			};
diff --git a/tests/Tests/IndexModules/IndexSettings/Settings/TypedIndexSettings.cs b/tests/Tests/IndexModules/IndexSettings/Settings/TypedIndexSettings.cs
index 6b30a2221b..42e8680647 100644
--- a/tests/Tests/IndexModules/IndexSettings/Settings/TypedIndexSettings.cs
+++ b/tests/Tests/IndexModules/IndexSettings/Settings/TypedIndexSettings.cs
@@ -32,12 +32,14 @@
 
 namespace Tests.IndexModules.IndexSettings.Settings
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class TypedIndexSettings
 	{
 		/**
 		 */
 
-		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, OpenSearch.Client.IndexSettings>
+		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, IndexSettings>
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
@@ -94,8 +96,8 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 
 			/**
 			 */
-			protected override OpenSearch.Client.IndexSettings Initializer =>
-				new OpenSearch.Client.IndexSettings(new Dictionary<string, object>
+			protected override IndexSettings Initializer =>
+				new(new Dictionary<string, object>
 				{
 					{ "any.setting", "can be set" },
 					{ "doubles", 1.1 },
diff --git a/tests/Tests/IndexModules/IndexSettings/SlowLog/SlowLogSettings.cs b/tests/Tests/IndexModules/IndexSettings/SlowLog/SlowLogSettings.cs
index e34532e567..07a2bc24d0 100644
--- a/tests/Tests/IndexModules/IndexSettings/SlowLog/SlowLogSettings.cs
+++ b/tests/Tests/IndexModules/IndexSettings/SlowLog/SlowLogSettings.cs
@@ -32,12 +32,14 @@
 
 namespace Tests.IndexModules.IndexSettings.SlowLog
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class SlowLogSettings
 	{
 		/**
 		 */
 
-		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, OpenSearch.Client.IndexSettings>
+		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, IndexSettings>
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
@@ -90,10 +92,10 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 
 			/**
 			 */
-			protected override OpenSearch.Client.IndexSettings Initializer =>
-				new OpenSearch.Client.IndexSettings
+			protected override IndexSettings Initializer =>
+				new()
 				{
-					SlowLog = new OpenSearch.Client.SlowLog
+					SlowLog = new SlowLog
 					{
 						Indexing = new SlowLogIndexing
 						{
diff --git a/tests/Tests/IndexModules/IndexSettings/Sorting/SortingSettingsSingleItem.cs b/tests/Tests/IndexModules/IndexSettings/Sorting/SortingSettingsSingleItem.cs
index ad4c76a9df..a2a0bb99d3 100644
--- a/tests/Tests/IndexModules/IndexSettings/Sorting/SortingSettingsSingleItem.cs
+++ b/tests/Tests/IndexModules/IndexSettings/Sorting/SortingSettingsSingleItem.cs
@@ -32,6 +32,8 @@
 
 namespace Tests.IndexModules.IndexSettings.Sorting
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class SortingSettingsSingleItem
 	{
 		private class TestClass
@@ -41,7 +43,7 @@ private class TestClass
 			public string field1 { get; set; }
 		}
 
-		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, OpenSearch.Client.IndexSettings>
+		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, IndexSettings>
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
@@ -59,8 +61,8 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 					.Missing(IndexSortMissing.First)
 				);
 
-			protected override OpenSearch.Client.IndexSettings Initializer =>
-				new OpenSearch.Client.IndexSettings
+			protected override IndexSettings Initializer =>
+				new IndexSettings
 				{
 					Sorting = new SortingSettings
 					{
@@ -85,7 +87,7 @@ private class TestClass
 			public string field2 { get; set; }
 		}
 
-		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, OpenSearch.Client.IndexSettings>
+		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, IndexSettings>
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
@@ -103,8 +105,8 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 					.Missing(IndexSortMissing.First, IndexSortMissing.Last)
 				);
 
-			protected override OpenSearch.Client.IndexSettings Initializer =>
-				new OpenSearch.Client.IndexSettings
+			protected override IndexSettings Initializer =>
+				new()
 				{
 					Sorting = new SortingSettings
 					{
diff --git a/tests/Tests/IndexModules/IndexSettings/Translog/TranslogSettings.cs b/tests/Tests/IndexModules/IndexSettings/Translog/TranslogSettings.cs
index 9f56a07d7a..8f750cae3a 100644
--- a/tests/Tests/IndexModules/IndexSettings/Translog/TranslogSettings.cs
+++ b/tests/Tests/IndexModules/IndexSettings/Translog/TranslogSettings.cs
@@ -32,12 +32,14 @@
 
 namespace Tests.IndexModules.IndexSettings.Translog
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class TranlogSettings
 	{
 		/**
 		 */
 
-		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, OpenSearch.Client.IndexSettings>
+		public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescriptor, IndexSettings>
 		{
 			protected override object ExpectJson => new Dictionary<string, object>
 			{
@@ -63,8 +65,8 @@ public class Usage : PromiseUsageTestBase<IIndexSettings, IndexSettingsDescripto
 
 			/**
 			 */
-			protected override OpenSearch.Client.IndexSettings Initializer =>
-				new OpenSearch.Client.IndexSettings
+			protected override IndexSettings Initializer =>
+				new()
 				{
 					Translog = new TranslogSettings
 					{
diff --git a/tests/Tests/IndexModules/Similarity/SimilaritySettings.cs b/tests/Tests/IndexModules/Similarity/SimilaritySettings.cs
index c3dcef52de..497c13e721 100644
--- a/tests/Tests/IndexModules/Similarity/SimilaritySettings.cs
+++ b/tests/Tests/IndexModules/Similarity/SimilaritySettings.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Collections.Generic;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 
 namespace Tests.IndexModules.Similarity
 {
diff --git a/tests/Tests/Indices/AliasManagement/Alias/AliasApiRemoveIndexTests.cs b/tests/Tests/Indices/AliasManagement/Alias/AliasApiRemoveIndexTests.cs
index bb7285b5fe..ca090c0190 100644
--- a/tests/Tests/Indices/AliasManagement/Alias/AliasApiRemoveIndexTests.cs
+++ b/tests/Tests/Indices/AliasManagement/Alias/AliasApiRemoveIndexTests.cs
@@ -30,6 +30,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs b/tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs
index 22e878f07f..7a4e2644a0 100644
--- a/tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs
+++ b/tests/Tests/Indices/AliasManagement/Alias/AliasApiTests.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Indices/AliasManagement/Alias/AliasUrlTests.cs b/tests/Tests/Indices/AliasManagement/Alias/AliasUrlTests.cs
index ca2050dd0a..aeccde678a 100644
--- a/tests/Tests/Indices/AliasManagement/Alias/AliasUrlTests.cs
+++ b/tests/Tests/Indices/AliasManagement/Alias/AliasUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsApiTests.cs b/tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsApiTests.cs
index aabb6b6630..89f50dc77f 100644
--- a/tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsApiTests.cs
+++ b/tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsUrlTests.cs b/tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsUrlTests.cs
index 91f24c7f4f..f5a5e677d0 100644
--- a/tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsUrlTests.cs
+++ b/tests/Tests/Indices/AliasManagement/AliasExists/AliasExistsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/AliasManagement/DeleteAlias/AliasDeleteApiTests.cs b/tests/Tests/Indices/AliasManagement/DeleteAlias/AliasDeleteApiTests.cs
index 7fcf98d2a1..c1ec6aec87 100644
--- a/tests/Tests/Indices/AliasManagement/DeleteAlias/AliasDeleteApiTests.cs
+++ b/tests/Tests/Indices/AliasManagement/DeleteAlias/AliasDeleteApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/AliasManagement/DeleteAlias/DeleteAliasUrlTests.cs b/tests/Tests/Indices/AliasManagement/DeleteAlias/DeleteAliasUrlTests.cs
index 3c9d3a942c..c96e6bf826 100644
--- a/tests/Tests/Indices/AliasManagement/DeleteAlias/DeleteAliasUrlTests.cs
+++ b/tests/Tests/Indices/AliasManagement/DeleteAlias/DeleteAliasUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs b/tests/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs
index 5749b40818..f305da38a1 100644
--- a/tests/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs
+++ b/tests/Tests/Indices/AliasManagement/GetAlias/GetAliasApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Configuration;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
diff --git a/tests/Tests/Indices/AliasManagement/GetAlias/GetAliasUrlTests.cs b/tests/Tests/Indices/AliasManagement/GetAlias/GetAliasUrlTests.cs
index 69a1e983e5..27fe63add4 100644
--- a/tests/Tests/Indices/AliasManagement/GetAlias/GetAliasUrlTests.cs
+++ b/tests/Tests/Indices/AliasManagement/GetAlias/GetAliasUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static OpenSearch.Client.Infer;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Indices/AliasManagement/GetAliasesPointingToIndex/GetAliasesPointingToIndexTests.cs b/tests/Tests/Indices/AliasManagement/GetAliasesPointingToIndex/GetAliasesPointingToIndexTests.cs
index 5eb72daeab..3d0de5bab3 100644
--- a/tests/Tests/Indices/AliasManagement/GetAliasesPointingToIndex/GetAliasesPointingToIndexTests.cs
+++ b/tests/Tests/Indices/AliasManagement/GetAliasesPointingToIndex/GetAliasesPointingToIndexTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.DocumentationTests;
diff --git a/tests/Tests/Indices/AliasManagement/GetIndicesPointingToAlias/GetIndicesPointingToAliasTests.cs b/tests/Tests/Indices/AliasManagement/GetIndicesPointingToAlias/GetIndicesPointingToAliasTests.cs
index f06de35f8f..03f3c43ddb 100644
--- a/tests/Tests/Indices/AliasManagement/GetIndicesPointingToAlias/GetIndicesPointingToAliasTests.cs
+++ b/tests/Tests/Indices/AliasManagement/GetIndicesPointingToAlias/GetIndicesPointingToAliasTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.DocumentationTests;
diff --git a/tests/Tests/Indices/AliasManagement/PutAlias/PutAliasApiTests.cs b/tests/Tests/Indices/AliasManagement/PutAlias/PutAliasApiTests.cs
index dada3cabc5..6de2c5d992 100644
--- a/tests/Tests/Indices/AliasManagement/PutAlias/PutAliasApiTests.cs
+++ b/tests/Tests/Indices/AliasManagement/PutAlias/PutAliasApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/AliasManagement/PutAlias/PutAliasUrlTests.cs b/tests/Tests/Indices/AliasManagement/PutAlias/PutAliasUrlTests.cs
index 644fe2464a..2bd8d5c931 100644
--- a/tests/Tests/Indices/AliasManagement/PutAlias/PutAliasUrlTests.cs
+++ b/tests/Tests/Indices/AliasManagement/PutAlias/PutAliasUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/Analyze/AnalyzeApiTests.cs b/tests/Tests/Indices/Analyze/AnalyzeApiTests.cs
index b8246380f8..0ca9823066 100644
--- a/tests/Tests/Indices/Analyze/AnalyzeApiTests.cs
+++ b/tests/Tests/Indices/Analyze/AnalyzeApiTests.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/Analyze/AnalyzeUrlTests.cs b/tests/Tests/Indices/Analyze/AnalyzeUrlTests.cs
index f1f3f16350..99fa1cf2c4 100644
--- a/tests/Tests/Indices/Analyze/AnalyzeUrlTests.cs
+++ b/tests/Tests/Indices/Analyze/AnalyzeUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexManagement/AddBlock/AddIndexBlockApiTests.cs b/tests/Tests/Indices/IndexManagement/AddBlock/AddIndexBlockApiTests.cs
index c0826a80ad..6f44313724 100644
--- a/tests/Tests/Indices/IndexManagement/AddBlock/AddIndexBlockApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/AddBlock/AddIndexBlockApiTests.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Indices/IndexManagement/AddBlock/AddIndexBlockUrlTests.cs b/tests/Tests/Indices/IndexManagement/AddBlock/AddIndexBlockUrlTests.cs
index 338ade847a..5bf341fabe 100644
--- a/tests/Tests/Indices/IndexManagement/AddBlock/AddIndexBlockUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/AddBlock/AddIndexBlockUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexManagement/CloneIndex/CloneIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/CloneIndex/CloneIndexApiTests.cs
index eceb4add3d..9579c87b6d 100644
--- a/tests/Tests/Indices/IndexManagement/CloneIndex/CloneIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/CloneIndex/CloneIndexApiTests.cs
@@ -39,6 +39,8 @@
 
 namespace Tests.Indices.IndexManagement.CloneIndex
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class CloneIndexApiTests
 		: ApiIntegrationTestBase<WritableCluster, CloneIndexResponse, ICloneIndexRequest, CloneIndexDescriptor, CloneIndexRequest>
 	{
@@ -107,9 +109,9 @@ protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueVal
 
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
-		protected override CloneIndexRequest Initializer => new CloneIndexRequest(CallIsolatedValue, CallIsolatedValue + CloneSuffix)
+		protected override CloneIndexRequest Initializer => new(CallIsolatedValue, CallIsolatedValue + CloneSuffix)
 		{
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfReplicas = 0,
 				NumberOfShards = 1,
@@ -136,7 +138,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			(client, r) => client.Indices.CloneAsync(r)
 		);
 
-		protected override CloneIndexDescriptor NewDescriptor() => new CloneIndexDescriptor(CallIsolatedValue, CallIsolatedValue + CloneSuffix);
+		protected override CloneIndexDescriptor NewDescriptor() => new(CallIsolatedValue, CallIsolatedValue + CloneSuffix);
 
 		protected override void ExpectResponse(CloneIndexResponse response)
 		{
diff --git a/tests/Tests/Indices/IndexManagement/CloneIndex/CloneIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/CloneIndex/CloneIndexUrlTests.cs
index a4f35ba40f..24d67e6bb7 100644
--- a/tests/Tests/Indices/IndexManagement/CloneIndex/CloneIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/CloneIndex/CloneIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexApiTests.cs
index 97f242549f..c33b2902da 100644
--- a/tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexApiTests.cs
@@ -39,6 +39,8 @@
 
 namespace Tests.Indices.IndexManagement.CreateIndex
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class CreateIndexApiTests
 		: ApiIntegrationTestBase<WritableCluster, CreateIndexResponse, ICreateIndexRequest, CreateIndexDescriptor, CreateIndexRequest>
 	{
@@ -155,9 +157,9 @@ public CreateIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(
 
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
-		protected override CreateIndexRequest Initializer => new CreateIndexRequest(CallIsolatedValue)
+		protected override CreateIndexRequest Initializer => new(CallIsolatedValue)
 		{
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfReplicas = 1,
 				NumberOfShards = 1,
@@ -234,7 +236,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			(client, r) => client.Indices.CreateAsync(r)
 		);
 
-		protected override CreateIndexDescriptor NewDescriptor() => new CreateIndexDescriptor(CallIsolatedValue);
+		protected override CreateIndexDescriptor NewDescriptor() => new(CallIsolatedValue);
 
 		protected override void ExpectResponse(CreateIndexResponse response)
 		{
@@ -306,9 +308,9 @@ public CreateIndexWithAliasApiTests(WritableCluster cluster, EndpointUsage usage
 
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
-		protected override CreateIndexRequest Initializer => new CreateIndexRequest(CallIsolatedValue)
+		protected override CreateIndexRequest Initializer => new(CallIsolatedValue)
 		{
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfReplicas = 0,
 				NumberOfShards = 1,
@@ -328,7 +330,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			(client, r) => client.Indices.CreateAsync(r)
 		);
 
-		protected override CreateIndexDescriptor NewDescriptor() => new CreateIndexDescriptor(CallIsolatedValue);
+		protected override CreateIndexDescriptor NewDescriptor() => new(CallIsolatedValue);
 
 		protected override void ExpectResponse(CreateIndexResponse response)
 		{
@@ -386,9 +388,9 @@ public CreateHiddenIndexApiTests(WritableCluster cluster, EndpointUsage usage) :
 
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
-		protected override CreateIndexRequest Initializer => new CreateIndexRequest(CallIsolatedValue)
+		protected override CreateIndexRequest Initializer => new(CallIsolatedValue)
 		{
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfReplicas = 0,
 				NumberOfShards = 1,
@@ -409,7 +411,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			(client, r) => client.Indices.CreateAsync(r)
 		);
 
-		protected override CreateIndexDescriptor NewDescriptor() => new CreateIndexDescriptor(CallIsolatedValue);
+		protected override CreateIndexDescriptor NewDescriptor() => new(CallIsolatedValue);
 
 		protected override void ExpectResponse(CreateIndexResponse response)
 		{
diff --git a/tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexUrlTests.cs
index 11aad935ba..d3cc23a8f1 100644
--- a/tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/CreateIndex/CreateIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexApiTests.cs
index 982b948452..11d05cf589 100644
--- a/tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexUrlTests.cs
index 73232c377d..1d457bb89e 100644
--- a/tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/DeleteIndex/DeleteIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static OpenSearch.Client.Indices;
diff --git a/tests/Tests/Indices/IndexManagement/GetIndex/GetIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/GetIndex/GetIndexApiTests.cs
index 3fa756a690..bf30ccc912 100644
--- a/tests/Tests/Indices/IndexManagement/GetIndex/GetIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/GetIndex/GetIndexApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Indices/IndexManagement/GetIndex/GetIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/GetIndex/GetIndexUrlTests.cs
index df9b6a333b..693758b1c2 100644
--- a/tests/Tests/Indices/IndexManagement/GetIndex/GetIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/GetIndex/GetIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsApiTests.cs b/tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsApiTests.cs
index 122b2b1f74..5e57876648 100644
--- a/tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsUrlTests.cs b/tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsUrlTests.cs
index 5cb85f6d7f..9330c1d01d 100644
--- a/tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/IndicesExists/IndexExistsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 
diff --git a/tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexApiTests.cs
index e327fe0599..7935e6ffdb 100644
--- a/tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexUrlTests.cs
index 2a0ddb6500..ff1110fc11 100644
--- a/tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/OpenCloseIndex/CloseIndex/CloseIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static OpenSearch.Client.Indices;
diff --git a/tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexApiTests.cs
index 7584dca455..24e0920880 100644
--- a/tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexApiTests.cs
@@ -29,6 +29,7 @@
 using System;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexUrlTests.cs
index 4f6d160329..79aaf8a64d 100644
--- a/tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/OpenCloseIndex/OpenIndex/OpenIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 
diff --git a/tests/Tests/Indices/IndexManagement/ResolveIndex/ResolveIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/ResolveIndex/ResolveIndexApiTests.cs
index b6a4fb187f..441272d3c9 100644
--- a/tests/Tests/Indices/IndexManagement/ResolveIndex/ResolveIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/ResolveIndex/ResolveIndexApiTests.cs
@@ -33,6 +33,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Indices/IndexManagement/ResolveIndex/ResolveIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/ResolveIndex/ResolveIndexUrlTests.cs
index d884b5f426..df5e2e20a1 100644
--- a/tests/Tests/Indices/IndexManagement/ResolveIndex/ResolveIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/ResolveIndex/ResolveIndexUrlTests.cs
@@ -29,7 +29,8 @@
  using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
-using Tests.Framework.EndpointTests;
+ using OpenSearch.Client.Specification.IndicesApi;
+ using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
 namespace Tests.Indices.IndexManagement.ResolveIndex
diff --git a/tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexApiTests.cs
index d97d5ae3ea..f2ce20c83b 100644
--- a/tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexApiTests.cs
@@ -40,6 +40,8 @@
 
 namespace Tests.Indices.IndexManagement.RolloverIndex
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class RolloverIndexApiTests
 		: ApiIntegrationTestBase<WritableCluster, RolloverIndexResponse, IRolloverIndexRequest, RolloverIndexDescriptor, RolloverIndexRequest>
 	{
@@ -115,14 +117,14 @@ public RolloverIndexApiTests(WritableCluster cluster, EndpointUsage usage)
 				.Alias(CallIsolatedValue + "-new_projects")
 			);
 
-		protected override RolloverIndexRequest Initializer => new RolloverIndexRequest(CallIsolatedValue + "-alias", CallIsolatedValue + "-new")
+		protected override RolloverIndexRequest Initializer => new(CallIsolatedValue + "-alias", CallIsolatedValue + "-new")
 		{
 			Conditions = new RolloverConditions
 			{
 				MaxAge = "7d",
 				MaxDocs = 1000
 			},
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfShards = 1,
 				NumberOfReplicas = 1
@@ -177,7 +179,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			(client, r) => client.Indices.RolloverAsync(r)
 		);
 
-		protected override RolloverIndexDescriptor NewDescriptor() => new RolloverIndexDescriptor(CallIsolatedValue + "-alias");
+		protected override RolloverIndexDescriptor NewDescriptor() => new(CallIsolatedValue + "-alias");
 
 		protected override void ExpectResponse(RolloverIndexResponse response)
 		{
diff --git a/tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexUrlTests.cs
index 2b0a429c28..47abad29b7 100644
--- a/tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/RolloverIndex/RolloverIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexApiTests.cs
index 67b3c0f38a..7250fd0f7b 100644
--- a/tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexApiTests.cs
@@ -38,6 +38,8 @@
 
 namespace Tests.Indices.IndexManagement.ShrinkIndex
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class ShrinkIndexApiTests
 		: ApiIntegrationTestBase<WritableCluster, ShrinkIndexResponse, IShrinkIndexRequest, ShrinkIndexDescriptor, ShrinkIndexRequest>
 	{
@@ -62,9 +64,9 @@ public ShrinkIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(
 
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
-		protected override ShrinkIndexRequest Initializer => new ShrinkIndexRequest(CallIsolatedValue, CallIsolatedValue + "-target")
+		protected override ShrinkIndexRequest Initializer => new(CallIsolatedValue, CallIsolatedValue + "-target")
 		{
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfShards = 4
 			}
@@ -96,7 +98,7 @@ protected override void OnBeforeCall(IOpenSearchClient client)
 			update.ShouldBeValid();
 		}
 
-		protected override ShrinkIndexDescriptor NewDescriptor() => new ShrinkIndexDescriptor(CallIsolatedValue, CallIsolatedValue + "-target");
+		protected override ShrinkIndexDescriptor NewDescriptor() => new(CallIsolatedValue, CallIsolatedValue + "-target");
 
 		protected override void ExpectResponse(ShrinkIndexResponse response)
 		{
diff --git a/tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexUrlTests.cs
index 5b9244653d..9b1cd7591c 100644
--- a/tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/ShrinkIndex/ShrinkIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexApiTests.cs b/tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexApiTests.cs
index ba02928ae4..996175af28 100644
--- a/tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexApiTests.cs
@@ -38,6 +38,8 @@
 
 namespace Tests.Indices.IndexManagement.SplitIndex
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class SplitIndexApiTests
 		: ApiIntegrationTestBase<WritableCluster, SplitIndexResponse, ISplitIndexRequest, SplitIndexDescriptor, SplitIndexRequest>
 	{
@@ -62,9 +64,9 @@ public SplitIndexApiTests(WritableCluster cluster, EndpointUsage usage) : base(c
 
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
-		protected override SplitIndexRequest Initializer => new SplitIndexRequest(CallIsolatedValue, CallIsolatedValue + "-target")
+		protected override SplitIndexRequest Initializer => new(CallIsolatedValue, CallIsolatedValue + "-target")
 		{
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfShards = 8
 			}
@@ -97,7 +99,7 @@ protected override void OnBeforeCall(IOpenSearchClient client)
 			update.ShouldBeValid();
 		}
 
-		protected override SplitIndexDescriptor NewDescriptor() => new SplitIndexDescriptor(CallIsolatedValue, CallIsolatedValue + "-target");
+		protected override SplitIndexDescriptor NewDescriptor() => new(CallIsolatedValue, CallIsolatedValue + "-target");
 
 		protected override void ExpectResponse(SplitIndexResponse response)
 		{
diff --git a/tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexUrlTests.cs b/tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexUrlTests.cs
index d26334b8e6..7502a12063 100644
--- a/tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/SplitIndex/SplitIndexUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsApiTests.cs b/tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsApiTests.cs
index 3f347b7ed3..961d91dcdf 100644
--- a/tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsApiTests.cs
+++ b/tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsApiTests.cs
@@ -29,6 +29,7 @@
 using System;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsUrlTests.cs b/tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsUrlTests.cs
index 543462f794..c29f386329 100644
--- a/tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsUrlTests.cs
+++ b/tests/Tests/Indices/IndexManagement/TypesExists/TypeExistsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 
diff --git a/tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs b/tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs
index 8ce0fc3450..57c9b8e9c4 100644
--- a/tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs
+++ b/tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsUrlTests.cs b/tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsUrlTests.cs
index 9e913b6ca2..c06f459945 100644
--- a/tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsUrlTests.cs
+++ b/tests/Tests/Indices/IndexSettings/GetIndexSettings/GetIndexSettingsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static OpenSearch.Client.Indices;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateApiTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateApiTests.cs
index 443dabfb59..bdcefc2d0d 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateApiTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateApiTests.cs
@@ -28,6 +28,7 @@
 
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateUrlTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateUrlTests.cs
index 96ff3ce766..8bb0a752e9 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateUrlTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/DeleteIndexTemplate/DeleteIndexTemplateUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateApiTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateApiTests.cs
index 28bc6a3f95..ee8644611c 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateApiTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateApiTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateUrlTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateUrlTests.cs
index 70f12adea6..0377218cf3 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateUrlTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/GetIndexTemplateUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateCrudTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateCrudTests.cs
index d3aeb208d3..afebc15be7 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateCrudTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateCrudTests.cs
@@ -37,6 +37,8 @@
 
 namespace Tests.Indices.IndexSettings.IndexTemplates
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class IndexTemplateCrudTests
 		: CrudTestBase<WritableCluster, PutIndexTemplateResponse, GetIndexTemplateResponse, PutIndexTemplateResponse, DeleteIndexTemplateResponse,
 			ExistsResponse>
@@ -63,10 +65,10 @@ protected override LazyResponses Create() =>
 				(s, c, r) => c.Indices.PutTemplateAsync(r)
 			);
 
-		private PutIndexTemplateRequest CreateInitializer(string name) => new PutIndexTemplateRequest(name)
+		private PutIndexTemplateRequest CreateInitializer(string name) => new(name)
 		{
 			IndexPatterns = new[] { "startingwiththis-*" },
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfShards = 2
 			}
@@ -107,10 +109,10 @@ protected override LazyResponses Update() =>
 				(s, c, r) => c.Indices.PutTemplateAsync(r)
 			);
 
-		private PutIndexTemplateRequest PutInitializer(string name) => new PutIndexTemplateRequest(name)
+		private PutIndexTemplateRequest PutInitializer(string name) => new(name)
 		{
 			IndexPatterns = new[] { "startingwiththis-*" },
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfShards = 1
 			}
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsApiTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsApiTests.cs
index fd81f8fa19..d09a6c7d94 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsApiTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsApiTests.cs
@@ -29,6 +29,7 @@
 using System;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsUrlTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsUrlTests.cs
index e40f215d90..942231d398 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsUrlTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/IndexTemplateExists/IndexTemplateExistsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateApiTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateApiTests.cs
index 145bdfb363..c6d22b6546 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateApiTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateApiTests.cs
@@ -38,6 +38,8 @@
 
 namespace Tests.Indices.IndexSettings.IndexTemplates.PutIndexTemplate
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class PutIndexTemplateApiTests
 		: ApiIntegrationTestBase<WritableCluster, PutIndexTemplateResponse, IPutIndexTemplateRequest, PutIndexTemplateDescriptor,
 			PutIndexTemplateRequest>
@@ -97,13 +99,13 @@ public PutIndexTemplateApiTests(WritableCluster cluster, EndpointUsage usage) :
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
 
-		protected override PutIndexTemplateRequest Initializer => new PutIndexTemplateRequest(CallIsolatedValue)
+		protected override PutIndexTemplateRequest Initializer => new(CallIsolatedValue)
 		{
 			Order = 1,
 			Version = 2,
 			IndexPatterns = new[] { "oscx-*" },
 			Create = false,
-			Settings = new OpenSearch.Client.IndexSettings
+			Settings = new IndexSettings
 			{
 				NumberOfShards = 1
 			},
@@ -131,7 +133,7 @@ protected override LazyResponses ClientUsage() => Calls(
 			(client, r) => client.Indices.PutTemplateAsync(r)
 		);
 
-		protected override PutIndexTemplateDescriptor NewDescriptor() => new PutIndexTemplateDescriptor(CallIsolatedValue);
+		protected override PutIndexTemplateDescriptor NewDescriptor() => new(CallIsolatedValue);
 
 		protected override void ExpectResponse(PutIndexTemplateResponse response)
 		{
diff --git a/tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateUrlTests.cs b/tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateUrlTests.cs
index 07805cd4d5..aa01228ed8 100644
--- a/tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateUrlTests.cs
+++ b/tests/Tests/Indices/IndexSettings/IndexTemplates/PutIndexTemplate/PutIndexTemplateUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsApiTests.cs b/tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsApiTests.cs
index 90e50d7716..98afdd6cb7 100644
--- a/tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsApiTests.cs
+++ b/tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsApiTests.cs
@@ -36,6 +36,8 @@
 
 namespace Tests.Indices.IndexSettings.UpdateIndicesSettings
 {
+	using OpenSearch.Client.Specification.IndicesApi;
+
 	public class UpdateIndexSettingsApiTests
 		: ApiIntegrationTestBase<WritableCluster, UpdateIndexSettingsResponse, IUpdateIndexSettingsRequest, UpdateIndexSettingsDescriptor,
 			UpdateIndexSettingsRequest>
@@ -63,9 +65,9 @@ public UpdateIndexSettingsApiTests(WritableCluster cluster, EndpointUsage usage)
 
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
-		protected override UpdateIndexSettingsRequest Initializer => new UpdateIndexSettingsRequest(CallIsolatedValue)
+		protected override UpdateIndexSettingsRequest Initializer => new(CallIsolatedValue)
 		{
-			IndexSettings = new OpenSearch.Client.IndexSettings(new Dictionary<string, object>
+			IndexSettings = new IndexSettings(new Dictionary<string, object>
 			{
 				{ "index.number_of_replicas", 3 },
 				{ "index.priority", 2 }
@@ -121,9 +123,9 @@ public UpdateIndexSettingsRefreshIntervalNullApiTests(WritableCluster cluster, E
 
 		protected override HttpMethod HttpMethod => HttpMethod.PUT;
 
-		protected override UpdateIndexSettingsRequest Initializer => new UpdateIndexSettingsRequest(CallIsolatedValue)
+		protected override UpdateIndexSettingsRequest Initializer => new(CallIsolatedValue)
 		{
-			IndexSettings = new OpenSearch.Client.IndexSettings
+			IndexSettings = new IndexSettings
 			{
 				RefreshInterval = null
 			}
diff --git a/tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs b/tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs
index 79277b406f..f09cd5d545 100644
--- a/tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs
+++ b/tests/Tests/Indices/IndexSettings/UpdateIndicesSettings/UpdateIndexSettingsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static OpenSearch.Client.Indices;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingApiTests.cs b/tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingApiTests.cs
index 96b1b11113..403d408b77 100644
--- a/tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingApiTests.cs
+++ b/tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingUrlTests.cs b/tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingUrlTests.cs
index f28482d647..e8220644c0 100644
--- a/tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingUrlTests.cs
+++ b/tests/Tests/Indices/MappingManagement/GetFieldMapping/GetFieldMappingUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static OpenSearch.Client.Infer;
diff --git a/tests/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs b/tests/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
index d9961e8f96..0ae8c9f37a 100644
--- a/tests/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
+++ b/tests/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
@@ -33,6 +33,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Configuration;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
diff --git a/tests/Tests/Indices/MappingManagement/GetMapping/GetMappingUrlTests.cs b/tests/Tests/Indices/MappingManagement/GetMapping/GetMappingUrlTests.cs
index 79a8b10ee7..f3cf743d71 100644
--- a/tests/Tests/Indices/MappingManagement/GetMapping/GetMappingUrlTests.cs
+++ b/tests/Tests/Indices/MappingManagement/GetMapping/GetMappingUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs b/tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs
index c7f3fcffd9..3360785ff3 100644
--- a/tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs
+++ b/tests/Tests/Indices/MappingManagement/PutMapping/PutMappingApiTest.cs
@@ -30,6 +30,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Indices/MappingManagement/PutMapping/PutMappingUrlTests.cs b/tests/Tests/Indices/MappingManagement/PutMapping/PutMappingUrlTests.cs
index eca44f64c0..bedd80d554 100644
--- a/tests/Tests/Indices/MappingManagement/PutMapping/PutMappingUrlTests.cs
+++ b/tests/Tests/Indices/MappingManagement/PutMapping/PutMappingUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs b/tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs
index 420ac429cd..5bd5faa094 100644
--- a/tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs
+++ b/tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheApiTests.cs
@@ -29,6 +29,7 @@
 using System;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs b/tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs
index 4801f44b6e..c0c99eaaa8 100644
--- a/tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs
+++ b/tests/Tests/Indices/StatusManagement/ClearCache/ClearCacheUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 using static OpenSearch.Client.Indices;
diff --git a/tests/Tests/Indices/StatusManagement/Flush/FlushApiTests.cs b/tests/Tests/Indices/StatusManagement/Flush/FlushApiTests.cs
index b1107969cd..9e6464a058 100644
--- a/tests/Tests/Indices/StatusManagement/Flush/FlushApiTests.cs
+++ b/tests/Tests/Indices/StatusManagement/Flush/FlushApiTests.cs
@@ -29,6 +29,7 @@
 using System;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs b/tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs
index 91d0ef39fb..92864f8278 100644
--- a/tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs
+++ b/tests/Tests/Indices/StatusManagement/Flush/FlushUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 using static OpenSearch.Client.Indices;
diff --git a/tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeApiTests.cs b/tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeApiTests.cs
index b6efd1d360..38d36cff20 100644
--- a/tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeApiTests.cs
+++ b/tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeApiTests.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs b/tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs
index c332302f02..3b11ec310b 100644
--- a/tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs
+++ b/tests/Tests/Indices/StatusManagement/ForceMerge/ForceMergeUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 using static OpenSearch.Client.Indices;
diff --git a/tests/Tests/Indices/StatusManagement/Refresh/RefreshApiTests.cs b/tests/Tests/Indices/StatusManagement/Refresh/RefreshApiTests.cs
index 0246ab9eb3..6290926eed 100644
--- a/tests/Tests/Indices/StatusManagement/Refresh/RefreshApiTests.cs
+++ b/tests/Tests/Indices/StatusManagement/Refresh/RefreshApiTests.cs
@@ -29,6 +29,7 @@
 using System;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs b/tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs
index 494e512d2d..769dc0c5f0 100644
--- a/tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs
+++ b/tests/Tests/Indices/StatusManagement/Refresh/RefreshUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 using static OpenSearch.Client.Indices;
diff --git a/tests/Tests/Mapping/Meta/MetaMappingApiTests.cs b/tests/Tests/Mapping/Meta/MetaMappingApiTests.cs
index 7be659f404..839bbb1f43 100644
--- a/tests/Tests/Mapping/Meta/MetaMappingApiTests.cs
+++ b/tests/Tests/Mapping/Meta/MetaMappingApiTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Mapping/Types/AttributeTestsBase.cs b/tests/Tests/Mapping/Types/AttributeTestsBase.cs
index 9cbfe6c26f..039c5234fe 100644
--- a/tests/Tests/Mapping/Types/AttributeTestsBase.cs
+++ b/tests/Tests/Mapping/Types/AttributeTestsBase.cs
@@ -28,6 +28,7 @@
 
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using static Tests.Core.Serialization.SerializationTestHelper;
 
 namespace Tests.Mapping.Types
diff --git a/tests/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs b/tests/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs
index e7f36beef6..d635b38bf4 100644
--- a/tests/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs
+++ b/tests/Tests/Mapping/Types/Core/Keyword/KeywordPropertyTests.cs
@@ -29,6 +29,7 @@
 using System;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Analysis;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeClusterMetadataApiTests.cs b/tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeClusterMetadataApiTests.cs
index 56b40760c2..be806350fc 100644
--- a/tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeClusterMetadataApiTests.cs
+++ b/tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeClusterMetadataApiTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Mapping/Types/PropertyTestsBase.cs b/tests/Tests/Mapping/Types/PropertyTestsBase.cs
index 1402981571..825faf4815 100644
--- a/tests/Tests/Mapping/Types/PropertyTestsBase.cs
+++ b/tests/Tests/Mapping/Types/PropertyTestsBase.cs
@@ -31,6 +31,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Mapping/Types/SingleMappingPropertyTestsBase.cs b/tests/Tests/Mapping/Types/SingleMappingPropertyTestsBase.cs
index bd342a15aa..1615bb5a88 100644
--- a/tests/Tests/Mapping/Types/SingleMappingPropertyTestsBase.cs
+++ b/tests/Tests/Mapping/Types/SingleMappingPropertyTestsBase.cs
@@ -30,6 +30,7 @@
 using System.Collections.Generic;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Mapping/Types/Specialized/FieldAlias/FieldAliasPropertyTests.cs b/tests/Tests/Mapping/Types/Specialized/FieldAlias/FieldAliasPropertyTests.cs
index 0bbb86b21a..6689380a7b 100644
--- a/tests/Tests/Mapping/Types/Specialized/FieldAlias/FieldAliasPropertyTests.cs
+++ b/tests/Tests/Mapping/Types/Specialized/FieldAlias/FieldAliasPropertyTests.cs
@@ -29,6 +29,7 @@
 using System;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Search/Request/InnerHitsUsageTests.cs b/tests/Tests/Search/Request/InnerHitsUsageTests.cs
index 825cf998a7..05b99b5c59 100644
--- a/tests/Tests/Search/Request/InnerHitsUsageTests.cs
+++ b/tests/Tests/Search/Request/InnerHitsUsageTests.cs
@@ -33,6 +33,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
diff --git a/tests/Tests/Search/Validate/ValidateQueryApiTests.cs b/tests/Tests/Search/Validate/ValidateQueryApiTests.cs
index f262f0923d..385215c87a 100644
--- a/tests/Tests/Search/Validate/ValidateQueryApiTests.cs
+++ b/tests/Tests/Search/Validate/ValidateQueryApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Search/Validate/ValidateQueryUrlTests.cs b/tests/Tests/Search/Validate/ValidateQueryUrlTests.cs
index 78189dce62..be7821d460 100644
--- a/tests/Tests/Search/Validate/ValidateQueryUrlTests.cs
+++ b/tests/Tests/Search/Validate/ValidateQueryUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.IndicesApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;