diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2f71ae6c3..af7b41c648 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 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))
+
 ### Dependencies
 - Bumps `System.Reflection.Emit` from 4.3.0 to 4.7.0
 - Bumps `Argu` from 5.5.0 to 6.1.1
@@ -53,4 +56,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/Cat/CatAliases/CatAliasesRecord.cs b/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRecord.cs
index 5d84710f55..8f6b77c0a4 100644
--- a/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatAliasesRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRequest.cs b/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRequest.cs
index a3ae784cb6..e48cb27d08 100644
--- a/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.aliases.json")]
 	public partial interface ICatAliasesRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRecord.cs b/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRecord.cs
index ceced2c086..ba6db4ec89 100644
--- a/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRecord.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatAllocationRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRequest.cs b/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRequest.cs
index 2563ac960d..8b1ab1a32b 100644
--- a/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.allocation.json")]
 	public partial interface ICatAllocationRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs
index 3942e0c87f..373cd633a7 100644
--- a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	/// <summary>
 	/// See docs <see href="https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/">here</see>
diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs
index 510590938e..7bae1e54f5 100644
--- a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.cluster_manager.json")]
 	///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="ICatMasterRequest"/></remarks>
diff --git a/src/OpenSearch.Client/Cat/CatCount/CatCountRecord.cs b/src/OpenSearch.Client/Cat/CatCount/CatCountRecord.cs
index 135935e5b5..1e5c788eef 100644
--- a/src/OpenSearch.Client/Cat/CatCount/CatCountRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatCount/CatCountRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatCountRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatCount/CatCountRequest.cs b/src/OpenSearch.Client/Cat/CatCount/CatCountRequest.cs
index b28fd85feb..3ed3a08b4c 100644
--- a/src/OpenSearch.Client/Cat/CatCount/CatCountRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatCount/CatCountRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.count.json")]
 	public partial interface ICatCountRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecord.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecord.cs
index 712fc7a473..3eec943509 100644
--- a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	[JsonFormatter(typeof(CatFielddataRecordFormatter))]
diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs
index 2a7851f7af..114042b6a7 100644
--- a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs
+++ b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net.Utf8Json.Internal;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	internal class CatFielddataRecordFormatter : IJsonFormatter<CatFielddataRecord>
 	{
diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRequest.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRequest.cs
index eea503cd9d..08ae4bea02 100644
--- a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.fielddata.json")]
 	public partial interface ICatFielddataRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatHealth/CatHealthRecord.cs b/src/OpenSearch.Client/Cat/CatHealth/CatHealthRecord.cs
index 2712ab4eb4..e187b5604e 100644
--- a/src/OpenSearch.Client/Cat/CatHealth/CatHealthRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatHealth/CatHealthRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatHealthRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatHealth/CatHealthRequest.cs b/src/OpenSearch.Client/Cat/CatHealth/CatHealthRequest.cs
index 1dacd4cb50..e875a5c4d2 100644
--- a/src/OpenSearch.Client/Cat/CatHealth/CatHealthRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatHealth/CatHealthRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.health.json")]
 	public partial interface ICatHealthRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatHelp/CatHelpRecord.cs b/src/OpenSearch.Client/Cat/CatHelp/CatHelpRecord.cs
index c7f2bf9513..6211f292d2 100644
--- a/src/OpenSearch.Client/Cat/CatHelp/CatHelpRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatHelp/CatHelpRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatHelpRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatHelp/CatHelpRequest.cs b/src/OpenSearch.Client/Cat/CatHelp/CatHelpRequest.cs
index 2c63f8785b..22bb156120 100644
--- a/src/OpenSearch.Client/Cat/CatHelp/CatHelpRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatHelp/CatHelpRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.help.json")]
 	public partial interface ICatHelpRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs b/src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs
index 13bb022ec3..bd70c86fad 100644
--- a/src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs
+++ b/src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs
@@ -32,7 +32,7 @@
 using System.Threading.Tasks;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	internal class CatHelpResponseBuilder : CustomResponseBuilderBase
 	{
diff --git a/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRecord.cs b/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRecord.cs
index a6e6d85051..a42e50229e 100644
--- a/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatIndicesRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRequest.cs b/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRequest.cs
index 834cb50243..392a104af9 100644
--- a/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.indices.json")]
 	public partial interface ICatIndicesRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs
index 5cdf1b6fc9..b87531601d 100644
--- a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	/// <summary>
 	/// See docs <see href="https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/">here</see>
diff --git a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs
index b03ef547eb..0f80e7ebff 100644
--- a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.master.json")]
 	/// <remarks>Deprecated as of OpenSearch 2.0, use <see cref="ICatClusterManagerRequest"/> instead</remarks>
diff --git a/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs b/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs
index 65af072b7a..30cde26f89 100644
--- a/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatNodeAttributesRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs b/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs
index fabb923d7f..a4993e3eaf 100644
--- a/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs
@@ -28,7 +28,7 @@
 
 #pragma warning disable 612, 618
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.nodeattrs.json")]
 	public partial interface ICatNodeAttributesRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs
index 2eccff51ee..98362cd5e9 100644
--- a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatNodesRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRequest.cs b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRequest.cs
index da23d4a82c..376cd6bb55 100644
--- a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.nodes.json")]
 	public partial interface ICatNodesRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRecord.cs b/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRecord.cs
index fa605dff0d..59cdd8f5a2 100644
--- a/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatPendingTasksRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRequest.cs b/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRequest.cs
index 5dab7eebdc..181e9cf23c 100644
--- a/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.pending_tasks.json")]
 	public partial interface ICatPendingTasksRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRecord.cs b/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRecord.cs
index 6079cb1235..f8fc7b7abe 100644
--- a/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatPluginsRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRequest.cs b/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRequest.cs
index 44ee605c9e..64f4238a37 100644
--- a/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.plugins.json")]
 	public partial interface ICatPluginsRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRecord.cs b/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRecord.cs
index 86bca2f818..8939ec0437 100644
--- a/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatRecoveryRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRequest.cs b/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRequest.cs
index 81a782ba6c..d9dbec2872 100644
--- a/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.recovery.json")]
 	public partial interface ICatRecoveryRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRecord.cs b/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRecord.cs
index 8e5dbf2d96..c5258644a0 100644
--- a/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatRepositoriesRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRequest.cs b/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRequest.cs
index 5fcce5c41e..fabf78489d 100644
--- a/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.repositories.json")]
 	public partial interface ICatRepositoriesRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatResponse.cs b/src/OpenSearch.Client/Cat/CatResponse.cs
index f7efd76d0f..7de2d8c232 100644
--- a/src/OpenSearch.Client/Cat/CatResponse.cs
+++ b/src/OpenSearch.Client/Cat/CatResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatResponse<TCatRecord> : ResponseBase
diff --git a/src/OpenSearch.Client/Cat/CatResponseBuilder.cs b/src/OpenSearch.Client/Cat/CatResponseBuilder.cs
index e545e9e15c..0c994db3d9 100644
--- a/src/OpenSearch.Client/Cat/CatResponseBuilder.cs
+++ b/src/OpenSearch.Client/Cat/CatResponseBuilder.cs
@@ -32,7 +32,7 @@
 using System.Threading.Tasks;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	internal class CatResponseBuilder<TCatRecord> : CustomResponseBuilderBase where TCatRecord : ICatRecord
 	{
diff --git a/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRecord.cs b/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRecord.cs
index 7e1d0d94c7..7394677824 100644
--- a/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatSegmentsRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRequest.cs b/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRequest.cs
index b0f65e90d9..f63a6b7374 100644
--- a/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.segments.json")]
 	public partial interface ICatSegmentsRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatShards/CatShardsRecord.cs b/src/OpenSearch.Client/Cat/CatShards/CatShardsRecord.cs
index 75318a995a..f0fe43cc34 100644
--- a/src/OpenSearch.Client/Cat/CatShards/CatShardsRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatShards/CatShardsRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatShardsRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatShards/CatShardsRequest.cs b/src/OpenSearch.Client/Cat/CatShards/CatShardsRequest.cs
index 31b897c5ca..47625de7dc 100644
--- a/src/OpenSearch.Client/Cat/CatShards/CatShardsRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatShards/CatShardsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.shards.json")]
 	public partial interface ICatShardsRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRecord.cs b/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRecord.cs
index 8592e6429d..410a4e00b2 100644
--- a/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatSnapshotsRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRequest.cs b/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRequest.cs
index 68676f3d95..14093dc42b 100644
--- a/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.snapshots.json")]
 	public partial interface ICatSnapshotsRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatTasks/CatTasksRecord.cs b/src/OpenSearch.Client/Cat/CatTasks/CatTasksRecord.cs
index 7a740c5a76..a3f9aea5d8 100644
--- a/src/OpenSearch.Client/Cat/CatTasks/CatTasksRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatTasks/CatTasksRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	public class CatTasksRecord : ICatRecord
 	{
diff --git a/src/OpenSearch.Client/Cat/CatTasks/CatTasksRequest.cs b/src/OpenSearch.Client/Cat/CatTasks/CatTasksRequest.cs
index 44de70fd83..c87055a183 100644
--- a/src/OpenSearch.Client/Cat/CatTasks/CatTasksRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatTasks/CatTasksRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.tasks.json")]
 	public partial interface ICatTasksRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatTemplates/CatTemplatesRecord.cs b/src/OpenSearch.Client/Cat/CatTemplates/CatTemplatesRecord.cs
index c1b93e31c2..a64ff879d1 100644
--- a/src/OpenSearch.Client/Cat/CatTemplates/CatTemplatesRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatTemplates/CatTemplatesRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatTemplatesRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatTemplates/CatTemplatesRequest.cs b/src/OpenSearch.Client/Cat/CatTemplates/CatTemplatesRequest.cs
index 6f7acdea70..5be89d62c4 100644
--- a/src/OpenSearch.Client/Cat/CatTemplates/CatTemplatesRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatTemplates/CatTemplatesRequest.cs
@@ -28,7 +28,7 @@
 
 #pragma warning disable 612, 618
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.templates.json")]
 	public partial interface ICatTemplatesRequest { }
diff --git a/src/OpenSearch.Client/Cat/CatThreadPool/CatThreadPoolRecord.cs b/src/OpenSearch.Client/Cat/CatThreadPool/CatThreadPoolRecord.cs
index 8a61ba08e2..0df1ca770d 100644
--- a/src/OpenSearch.Client/Cat/CatThreadPool/CatThreadPoolRecord.cs
+++ b/src/OpenSearch.Client/Cat/CatThreadPool/CatThreadPoolRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[DataContract]
 	public class CatThreadPoolRecord : ICatRecord
diff --git a/src/OpenSearch.Client/Cat/CatThreadPool/CatThreadPoolRequest.cs b/src/OpenSearch.Client/Cat/CatThreadPool/CatThreadPoolRequest.cs
index 1bb29bb6ae..6274171a32 100644
--- a/src/OpenSearch.Client/Cat/CatThreadPool/CatThreadPoolRequest.cs
+++ b/src/OpenSearch.Client/Cat/CatThreadPool/CatThreadPoolRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[MapsApi("cat.thread_pool.json")]
 	public partial interface ICatThreadPoolRequest { }
diff --git a/src/OpenSearch.Client/Cat/ICatRecord.cs b/src/OpenSearch.Client/Cat/ICatRecord.cs
index 4344109e1a..b2a3cf6d6c 100644
--- a/src/OpenSearch.Client/Cat/ICatRecord.cs
+++ b/src/OpenSearch.Client/Cat/ICatRecord.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	public interface ICatRecord { }
 }
diff --git a/src/OpenSearch.Client/Descriptors.Cat.cs b/src/OpenSearch.Client/Descriptors.Cat.cs
index 2949066428..ba78505a5a 100644
--- a/src/OpenSearch.Client/Descriptors.Cat.cs
+++ b/src/OpenSearch.Client/Descriptors.Cat.cs
@@ -40,7 +40,7 @@
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	///<summary>Descriptor for Aliases <para>https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-aliases/</para></summary>
 	public partial class CatAliasesDescriptor : RequestDescriptorBase<CatAliasesDescriptor, CatAliasesRequestParameters, ICatAliasesRequest>, ICatAliasesRequest
diff --git a/src/OpenSearch.Client/OpenSearchClient.cs b/src/OpenSearch.Client/OpenSearchClient.cs
index d5a7789aa8..b0ff953790 100644
--- a/src/OpenSearch.Client/OpenSearchClient.cs
+++ b/src/OpenSearch.Client/OpenSearchClient.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using OpenSearch.Client.Specification.CatApi;
 using OpenSearch.Net;
 
 namespace OpenSearch.Client
diff --git a/src/OpenSearch.Client/Requests.Cat.cs b/src/OpenSearch.Client/Requests.Cat.cs
index 9cfa053544..7e27522b07 100644
--- a/src/OpenSearch.Client/Requests.Cat.cs
+++ b/src/OpenSearch.Client/Requests.Cat.cs
@@ -41,7 +41,7 @@
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.CatApi
 {
 	[InterfaceDataContract]
 	public partial interface ICatAliasesRequest : IRequest<CatAliasesRequestParameters>
diff --git a/tests/Tests/Cat/CatAliases/CatAliasesApiTests.cs b/tests/Tests/Cat/CatAliases/CatAliasesApiTests.cs
index 706990de99..ae71431414 100644
--- a/tests/Tests/Cat/CatAliases/CatAliasesApiTests.cs
+++ b/tests/Tests/Cat/CatAliases/CatAliasesApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Core.ManagedOpenSearch.NodeSeeders;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Cat/CatAliases/CatAliasesUrlTests.cs b/tests/Tests/Cat/CatAliases/CatAliasesUrlTests.cs
index 9ded56e5d6..ef00c57de3 100644
--- a/tests/Tests/Cat/CatAliases/CatAliasesUrlTests.cs
+++ b/tests/Tests/Cat/CatAliases/CatAliasesUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatAllocation/CatAllocationApiTests.cs b/tests/Tests/Cat/CatAllocation/CatAllocationApiTests.cs
index b86f414d1e..ba44ca92e7 100644
--- a/tests/Tests/Cat/CatAllocation/CatAllocationApiTests.cs
+++ b/tests/Tests/Cat/CatAllocation/CatAllocationApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatAllocation/CatAllocationUrlTests.cs b/tests/Tests/Cat/CatAllocation/CatAllocationUrlTests.cs
index 1e9224b971..162a2dc8ed 100644
--- a/tests/Tests/Cat/CatAllocation/CatAllocationUrlTests.cs
+++ b/tests/Tests/Cat/CatAllocation/CatAllocationUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatClusterManager/CatClusterManagerApiTests.cs b/tests/Tests/Cat/CatClusterManager/CatClusterManagerApiTests.cs
index 1d0ad42dfb..869c18ec27 100644
--- a/tests/Tests/Cat/CatClusterManager/CatClusterManagerApiTests.cs
+++ b/tests/Tests/Cat/CatClusterManager/CatClusterManagerApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatClusterManager/CatClusterManagerUrlTests.cs b/tests/Tests/Cat/CatClusterManager/CatClusterManagerUrlTests.cs
index 439f039cb4..ab58560384 100644
--- a/tests/Tests/Cat/CatClusterManager/CatClusterManagerUrlTests.cs
+++ b/tests/Tests/Cat/CatClusterManager/CatClusterManagerUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatCount/CatCountApiTests.cs b/tests/Tests/Cat/CatCount/CatCountApiTests.cs
index f7db419676..a18bccf899 100644
--- a/tests/Tests/Cat/CatCount/CatCountApiTests.cs
+++ b/tests/Tests/Cat/CatCount/CatCountApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Cat/CatCount/CatCountUrlTests.cs b/tests/Tests/Cat/CatCount/CatCountUrlTests.cs
index d141242b7e..52de1d51fa 100644
--- a/tests/Tests/Cat/CatCount/CatCountUrlTests.cs
+++ b/tests/Tests/Cat/CatCount/CatCountUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatFielddata/CatFielddataApiTests.cs b/tests/Tests/Cat/CatFielddata/CatFielddataApiTests.cs
index 9478601432..412ddaab97 100644
--- a/tests/Tests/Cat/CatFielddata/CatFielddataApiTests.cs
+++ b/tests/Tests/Cat/CatFielddata/CatFielddataApiTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Core.Xunit;
 using Tests.Domain;
diff --git a/tests/Tests/Cat/CatFielddata/CatFielddataUrlTests.cs b/tests/Tests/Cat/CatFielddata/CatFielddataUrlTests.cs
index 147596e2a5..c78314a8bf 100644
--- a/tests/Tests/Cat/CatFielddata/CatFielddataUrlTests.cs
+++ b/tests/Tests/Cat/CatFielddata/CatFielddataUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Cat/CatHealth/CatHealthApiTests.cs b/tests/Tests/Cat/CatHealth/CatHealthApiTests.cs
index 96f4d6dfba..969332362f 100644
--- a/tests/Tests/Cat/CatHealth/CatHealthApiTests.cs
+++ b/tests/Tests/Cat/CatHealth/CatHealthApiTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.Net;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatHealth/CatHealthUrlTests.cs b/tests/Tests/Cat/CatHealth/CatHealthUrlTests.cs
index 25fd459024..a65f56ac52 100644
--- a/tests/Tests/Cat/CatHealth/CatHealthUrlTests.cs
+++ b/tests/Tests/Cat/CatHealth/CatHealthUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatHelp/CatHelpApiTests.cs b/tests/Tests/Cat/CatHelp/CatHelpApiTests.cs
index 5e7d7ec2e3..2d38dd103e 100644
--- a/tests/Tests/Cat/CatHelp/CatHelpApiTests.cs
+++ b/tests/Tests/Cat/CatHelp/CatHelpApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatHelp/CatHelpUrlTests.cs b/tests/Tests/Cat/CatHelp/CatHelpUrlTests.cs
index 2afa05b721..59e40b2983 100644
--- a/tests/Tests/Cat/CatHelp/CatHelpUrlTests.cs
+++ b/tests/Tests/Cat/CatHelp/CatHelpUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs b/tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs
index 180f3b042f..7703a6df94 100644
--- a/tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs
+++ b/tests/Tests/Cat/CatIndices/CatIndicesApiTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatIndices/CatIndicesUrlTests.cs b/tests/Tests/Cat/CatIndices/CatIndicesUrlTests.cs
index 3cedbff5dd..f85b02470c 100644
--- a/tests/Tests/Cat/CatIndices/CatIndicesUrlTests.cs
+++ b/tests/Tests/Cat/CatIndices/CatIndicesUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Cat/CatMaster/CatMasterApiTests.cs b/tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
index b264b16ae1..ea56ab5a0f 100644
--- a/tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
+++ b/tests/Tests/Cat/CatMaster/CatMasterApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs b/tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
index 932e9b1f47..f57a651cc7 100644
--- a/tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
+++ b/tests/Tests/Cat/CatMaster/CatMasterUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatNodeAttributes/CatAliasesUrlTests.cs b/tests/Tests/Cat/CatNodeAttributes/CatAliasesUrlTests.cs
index 703c9934f4..d7a12ffe49 100644
--- a/tests/Tests/Cat/CatNodeAttributes/CatAliasesUrlTests.cs
+++ b/tests/Tests/Cat/CatNodeAttributes/CatAliasesUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatNodeAttributes/CatNodeAttributesApiTests.cs b/tests/Tests/Cat/CatNodeAttributes/CatNodeAttributesApiTests.cs
index 24cf0a94d0..7f8498419f 100644
--- a/tests/Tests/Cat/CatNodeAttributes/CatNodeAttributesApiTests.cs
+++ b/tests/Tests/Cat/CatNodeAttributes/CatNodeAttributesApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatNodes/CatNodesApiTests.cs b/tests/Tests/Cat/CatNodes/CatNodesApiTests.cs
index 54fd439f4e..472ff38749 100644
--- a/tests/Tests/Cat/CatNodes/CatNodesApiTests.cs
+++ b/tests/Tests/Cat/CatNodes/CatNodesApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatNodes/CatNodesUrlTests.cs b/tests/Tests/Cat/CatNodes/CatNodesUrlTests.cs
index f6e8b30277..a86b51900c 100644
--- a/tests/Tests/Cat/CatNodes/CatNodesUrlTests.cs
+++ b/tests/Tests/Cat/CatNodes/CatNodesUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatPendingTasks/CatPendingTasksApiTests.cs b/tests/Tests/Cat/CatPendingTasks/CatPendingTasksApiTests.cs
index b41a0da0da..98cb616216 100644
--- a/tests/Tests/Cat/CatPendingTasks/CatPendingTasksApiTests.cs
+++ b/tests/Tests/Cat/CatPendingTasks/CatPendingTasksApiTests.cs
@@ -28,6 +28,7 @@
 
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatPendingTasks/CatPendingTasksUrlTests.cs b/tests/Tests/Cat/CatPendingTasks/CatPendingTasksUrlTests.cs
index fff1f9e8dd..12e5eab000 100644
--- a/tests/Tests/Cat/CatPendingTasks/CatPendingTasksUrlTests.cs
+++ b/tests/Tests/Cat/CatPendingTasks/CatPendingTasksUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatPlugins/CatPluginsApiTests.cs b/tests/Tests/Cat/CatPlugins/CatPluginsApiTests.cs
index 1fbd46e234..11ba2c1919 100644
--- a/tests/Tests/Cat/CatPlugins/CatPluginsApiTests.cs
+++ b/tests/Tests/Cat/CatPlugins/CatPluginsApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatPlugins/CatPluginsUrlTests.cs b/tests/Tests/Cat/CatPlugins/CatPluginsUrlTests.cs
index 889b6890bc..215e2fad51 100644
--- a/tests/Tests/Cat/CatPlugins/CatPluginsUrlTests.cs
+++ b/tests/Tests/Cat/CatPlugins/CatPluginsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatRecovery/CatRecoveryApiTests.cs b/tests/Tests/Cat/CatRecovery/CatRecoveryApiTests.cs
index 2669112906..c3615c1cb9 100644
--- a/tests/Tests/Cat/CatRecovery/CatRecoveryApiTests.cs
+++ b/tests/Tests/Cat/CatRecovery/CatRecoveryApiTests.cs
@@ -28,6 +28,7 @@
 
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatRecovery/CatRecoveryUrlTests.cs b/tests/Tests/Cat/CatRecovery/CatRecoveryUrlTests.cs
index da4e4208a8..aaabda5bc1 100644
--- a/tests/Tests/Cat/CatRecovery/CatRecoveryUrlTests.cs
+++ b/tests/Tests/Cat/CatRecovery/CatRecoveryUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs b/tests/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs
index b77b216d11..3586e5ba07 100644
--- a/tests/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs
+++ b/tests/Tests/Cat/CatRepositories/CatRepositoriesApiTests.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.Client;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Cat/CatRepositories/CatRepositoriesUrlTests.cs b/tests/Tests/Cat/CatRepositories/CatRepositoriesUrlTests.cs
index 93c2cec5af..b84291b62e 100644
--- a/tests/Tests/Cat/CatRepositories/CatRepositoriesUrlTests.cs
+++ b/tests/Tests/Cat/CatRepositories/CatRepositoriesUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatSegments/CatSegmentsApiTests.cs b/tests/Tests/Cat/CatSegments/CatSegmentsApiTests.cs
index 30632ea4c4..e017d93eb7 100644
--- a/tests/Tests/Cat/CatSegments/CatSegmentsApiTests.cs
+++ b/tests/Tests/Cat/CatSegments/CatSegmentsApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatSegments/CatSegmentsUrlTests.cs b/tests/Tests/Cat/CatSegments/CatSegmentsUrlTests.cs
index 4366ad1d78..35aa24221b 100644
--- a/tests/Tests/Cat/CatSegments/CatSegmentsUrlTests.cs
+++ b/tests/Tests/Cat/CatSegments/CatSegmentsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Cat/CatShards/CatShardsApiTests.cs b/tests/Tests/Cat/CatShards/CatShardsApiTests.cs
index ebbae80d2b..a141f866c0 100644
--- a/tests/Tests/Cat/CatShards/CatShardsApiTests.cs
+++ b/tests/Tests/Cat/CatShards/CatShardsApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatShards/CatShardsUrlTests.cs b/tests/Tests/Cat/CatShards/CatShardsUrlTests.cs
index cf97841d06..af6000090a 100644
--- a/tests/Tests/Cat/CatShards/CatShardsUrlTests.cs
+++ b/tests/Tests/Cat/CatShards/CatShardsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs b/tests/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs
index 9d0eff441c..4315e4c197 100644
--- a/tests/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs
+++ b/tests/Tests/Cat/CatSnapshots/CatSnapshotsApiTests.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.Client;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Cat/CatSnapshots/CatSnapshotsUrlTests.cs b/tests/Tests/Cat/CatSnapshots/CatSnapshotsUrlTests.cs
index ccf80ffbf7..d9c66a0aef 100644
--- a/tests/Tests/Cat/CatSnapshots/CatSnapshotsUrlTests.cs
+++ b/tests/Tests/Cat/CatSnapshots/CatSnapshotsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatTasks/CatTasksApiTests.cs b/tests/Tests/Cat/CatTasks/CatTasksApiTests.cs
index 821efda8b8..5bc22e167f 100644
--- a/tests/Tests/Cat/CatTasks/CatTasksApiTests.cs
+++ b/tests/Tests/Cat/CatTasks/CatTasksApiTests.cs
@@ -28,6 +28,7 @@
 
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatTasks/CatTasksUrlTests.cs b/tests/Tests/Cat/CatTasks/CatTasksUrlTests.cs
index 5f1ed1f4b2..a37f333eef 100644
--- a/tests/Tests/Cat/CatTasks/CatTasksUrlTests.cs
+++ b/tests/Tests/Cat/CatTasks/CatTasksUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs b/tests/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs
index d5cd3d3b3b..2d782a7c7f 100644
--- a/tests/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs
+++ b/tests/Tests/Cat/CatTemplates/CatTemplatesApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cat/CatTemplates/CatTemplatesUrlTests.cs b/tests/Tests/Cat/CatTemplates/CatTemplatesUrlTests.cs
index 319c1dd2c1..d446db9921 100644
--- a/tests/Tests/Cat/CatTemplates/CatTemplatesUrlTests.cs
+++ b/tests/Tests/Cat/CatTemplates/CatTemplatesUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatThreadPool/CatThreadPoolUrlTests.cs b/tests/Tests/Cat/CatThreadPool/CatThreadPoolUrlTests.cs
index 4b4bf9001a..722fb97788 100644
--- a/tests/Tests/Cat/CatThreadPool/CatThreadPoolUrlTests.cs
+++ b/tests/Tests/Cat/CatThreadPool/CatThreadPoolUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cat/CatThreadPool/CatThreadpoolApiTests.cs b/tests/Tests/Cat/CatThreadPool/CatThreadpoolApiTests.cs
index e4aabb52ee..ad9255d695 100644
--- a/tests/Tests/Cat/CatThreadPool/CatThreadpoolApiTests.cs
+++ b/tests/Tests/Cat/CatThreadPool/CatThreadpoolApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.CatApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;