diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1dd76bf4e..77ff376f9a 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))
+- 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))
 
 ### Dependencies
 - Bumps `System.Reflection.Emit` from 4.3.0 to 4.7.0
diff --git a/src/OpenSearch.Client/Cluster/ClusterAllocationExplain/ClusterAllocationExplainRequest.cs b/src/OpenSearch.Client/Cluster/ClusterAllocationExplain/ClusterAllocationExplainRequest.cs
index bf270a0b10..984c2b63d8 100644
--- a/src/OpenSearch.Client/Cluster/ClusterAllocationExplain/ClusterAllocationExplainRequest.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterAllocationExplain/ClusterAllocationExplainRequest.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.allocation_explain.json")]
 	[ReadAs(typeof(ClusterAllocationExplainRequest))]
diff --git a/src/OpenSearch.Client/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs b/src/OpenSearch.Client/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs
index ae994420d3..7906bd6f6e 100644
--- a/src/OpenSearch.Client/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterAllocationExplain/ClusterAllocationExplainResponse.cs
@@ -31,7 +31,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterAllocationExplainResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Cluster/ClusterHealth.cs b/src/OpenSearch.Client/Cluster/ClusterHealth.cs
index b85053a061..e5b79b910f 100644
--- a/src/OpenSearch.Client/Cluster/ClusterHealth.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterHealth.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[StringEnum]
 	public enum ClusterStatus
diff --git a/src/OpenSearch.Client/Cluster/ClusterHealth/ClusterHealthRequest.cs b/src/OpenSearch.Client/Cluster/ClusterHealth/ClusterHealthRequest.cs
index a838c0fb6e..84e8e1735c 100644
--- a/src/OpenSearch.Client/Cluster/ClusterHealth/ClusterHealthRequest.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterHealth/ClusterHealthRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.health.json")]
 	public partial interface IClusterHealthRequest { }
diff --git a/src/OpenSearch.Client/Cluster/ClusterHealth/ClusterHealthResponse.cs b/src/OpenSearch.Client/Cluster/ClusterHealth/ClusterHealthResponse.cs
index 7acdfcbdfc..8d09cbfd8f 100644
--- a/src/OpenSearch.Client/Cluster/ClusterHealth/ClusterHealthResponse.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterHealth/ClusterHealthResponse.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterHealthResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Cluster/ClusterHealth/IndexHealthStats.cs b/src/OpenSearch.Client/Cluster/ClusterHealth/IndexHealthStats.cs
index e744c25307..026593ca25 100644
--- a/src/OpenSearch.Client/Cluster/ClusterHealth/IndexHealthStats.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterHealth/IndexHealthStats.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class IndexHealthStats
diff --git a/src/OpenSearch.Client/Cluster/ClusterHealth/ShardHealthStats.cs b/src/OpenSearch.Client/Cluster/ClusterHealth/ShardHealthStats.cs
index ab229f9ab3..f2848202d3 100644
--- a/src/OpenSearch.Client/Cluster/ClusterHealth/ShardHealthStats.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterHealth/ShardHealthStats.cs
@@ -29,7 +29,7 @@
 using OpenSearch.Net;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ShardHealthStats
diff --git a/src/OpenSearch.Client/Cluster/ClusterPendingTasks/ClusterPendingTasksRequest.cs b/src/OpenSearch.Client/Cluster/ClusterPendingTasks/ClusterPendingTasksRequest.cs
index 47d530b3e2..83c02808de 100644
--- a/src/OpenSearch.Client/Cluster/ClusterPendingTasks/ClusterPendingTasksRequest.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterPendingTasks/ClusterPendingTasksRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.pending_tasks.json")]
 	public partial interface IClusterPendingTasksRequest { }
diff --git a/src/OpenSearch.Client/Cluster/ClusterPendingTasks/ClusterPendingTasksResponse.cs b/src/OpenSearch.Client/Cluster/ClusterPendingTasks/ClusterPendingTasksResponse.cs
index e4896f0b36..5b882bba04 100644
--- a/src/OpenSearch.Client/Cluster/ClusterPendingTasks/ClusterPendingTasksResponse.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterPendingTasks/ClusterPendingTasksResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterPendingTasksResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteDecision.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteDecision.cs
index c9307bc0ae..dee722a1ad 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteDecision.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteDecision.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterRerouteDecision
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteExplanation.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteExplanation.cs
index 211972be94..0bb03e1975 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteExplanation.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteExplanation.cs
@@ -29,7 +29,7 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterRerouteExplanation
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteParameters.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteParameters.cs
index cabd546be2..46b885bc64 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteParameters.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteParameters.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterRerouteParameters
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteRequest.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteRequest.cs
index 0350be2aee..04bf49ef55 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteRequest.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteRequest.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.reroute.json")]
 	[ReadAs(typeof(ClusterRerouteRequest))]
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteResponse.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteResponse.cs
index 85fec96463..701cfb1c2d 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteResponse.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/ClusterRerouteResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterRerouteResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/AllocateClusterRerouteCommandBase.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/AllocateClusterRerouteCommandBase.cs
index f49c219625..c55a6ec13f 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/AllocateClusterRerouteCommandBase.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/AllocateClusterRerouteCommandBase.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	public interface IAllocateClusterRerouteCommand : IClusterRerouteCommand
 	{
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/CancelClusterRerouteCommand.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/CancelClusterRerouteCommand.cs
index 3dbac454c2..16b716cdaf 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/CancelClusterRerouteCommand.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/CancelClusterRerouteCommand.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	public interface ICancelClusterRerouteCommand : IClusterRerouteCommand
 	{
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/ClusterRerouteCommandFormatter.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/ClusterRerouteCommandFormatter.cs
index 8a0b1577c2..970d3ad934 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/ClusterRerouteCommandFormatter.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/ClusterRerouteCommandFormatter.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net.Utf8Json.Resolvers;
 
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	internal class ClusterRerouteCommandFormatter : IJsonFormatter<IClusterRerouteCommand>
 	{
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/IClusterRerouteCommand.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/IClusterRerouteCommand.cs
index 7e6d85fb16..71e1198bbf 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/IClusterRerouteCommand.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/IClusterRerouteCommand.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[JsonFormatter(typeof(ClusterRerouteCommandFormatter))]
 	public interface IClusterRerouteCommand
diff --git a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/MoveClusterRerouteCommand.cs b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/MoveClusterRerouteCommand.cs
index 96c228c241..2b6015f363 100644
--- a/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/MoveClusterRerouteCommand.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterReroute/Commands/MoveClusterRerouteCommand.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	public interface IMoveClusterRerouteCommand : IClusterRerouteCommand
 	{
diff --git a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsRequest.cs b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsRequest.cs
index d2bc471e36..07127bb9c0 100644
--- a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsRequest.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.get_settings.json")]
 	public partial interface IClusterGetSettingsRequest { }
diff --git a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs
index 30c7a194dd..1b52c70073 100644
--- a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterGetSettingsResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs
index cd574df165..438643c77c 100644
--- a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.put_settings.json")]
 	public partial interface IClusterPutSettingsRequest
diff --git a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs
index 34e7975dcf..b6d70c22e7 100644
--- a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterPutSettingsResponse : ResponseBase
diff --git a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/RemoteClusterConfiguration.cs b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/RemoteClusterConfiguration.cs
index 7cb098d4f7..71967fe744 100644
--- a/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/RemoteClusterConfiguration.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterSettings/ClusterPutSettings/RemoteClusterConfiguration.cs
@@ -30,7 +30,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	/// <summary>
 	/// Simplifies the creation of remote cluster configuration, can be combined with a dictionary using the overloaded + operator
diff --git a/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateRequest.cs b/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateRequest.cs
index 33516421a1..1e39c3fb87 100644
--- a/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateRequest.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.state.json")]
 	public partial interface IClusterStateRequest { }
diff --git a/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateResponse.cs b/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateResponse.cs
index 93bc87a33a..3e6e53a4cf 100644
--- a/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateResponse.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterState/ClusterStateResponse.cs
@@ -30,7 +30,7 @@
 using OpenSearch.Net;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[JsonFormatter(typeof(DynamicResponseFormatter<ClusterStateResponse>))]
 	public class ClusterStateResponse : DynamicResponseBase
diff --git a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterIndicesStats.cs b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterIndicesStats.cs
index 6980995c13..f47819ae45 100644
--- a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterIndicesStats.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterIndicesStats.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterIndicesStats
diff --git a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs
index 84b1b020c6..0290025dbd 100644
--- a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterNodesStats.cs
@@ -29,7 +29,7 @@
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	public class ClusterNodesStats
@@ -200,7 +200,7 @@ public class ClusterOperatingSystemStats
 		public IReadOnlyCollection<ClusterOperatingSystemName> Names { get; internal set; }
 
 		[DataMember(Name = "pretty_names")]
-		public IReadOnlyCollection<ClusterOperatingSystemPrettyNane> PrettyNames { get; internal set; }
+		public IReadOnlyCollection<ClusterOperatingSystemPrettyName> PrettyNames { get; internal set; }
 
 		[DataMember(Name = "architectures")]
 		public IReadOnlyCollection<ArchitectureStats> Architectures { get; internal set; }
@@ -235,6 +235,16 @@ public class ClusterOperatingSystemName
 		public string Name { get; internal set; }
 	}
 
+	[DataContract]
+	public class ClusterOperatingSystemPrettyName
+	{
+		[DataMember(Name = "count")]
+		public int Count { get; internal set; }
+
+		[DataMember(Name = "pretty_name")]
+		public string PrettyName { get; internal set; }
+	}
+
 	[DataContract]
 	public class ClusterNodeCount
 	{
diff --git a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterStatsRequest.cs b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterStatsRequest.cs
index ab8a9b11e5..f3ba864e99 100644
--- a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterStatsRequest.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterStatsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.stats.json")]
 	public partial interface IClusterStatsRequest { }
diff --git a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterStatsResponse.cs b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterStatsResponse.cs
index 5060d7cd1a..a7d2b65d88 100644
--- a/src/OpenSearch.Client/Cluster/ClusterStats/ClusterStatsResponse.cs
+++ b/src/OpenSearch.Client/Cluster/ClusterStats/ClusterStatsResponse.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	public class ClusterStatsResponse : NodesResponseBase
 	{
diff --git a/src/OpenSearch.Client/Cluster/NodesInfo/NodeInfo.cs b/src/OpenSearch.Client/Cluster/NodesInfo/NodeInfo.cs
index 21032d220b..7760bf2d6c 100644
--- a/src/OpenSearch.Client/Cluster/NodesInfo/NodeInfo.cs
+++ b/src/OpenSearch.Client/Cluster/NodesInfo/NodeInfo.cs
@@ -130,16 +130,6 @@ public class NodeOperatingSystemInfo
 		public string Version { get; internal set; }
 	}
 
-	[DataContract]
-	public class ClusterOperatingSystemPrettyNane
-	{
-		[DataMember(Name = "count")]
-		public int Count { get; internal set; }
-
-		[DataMember(Name = "pretty_name")]
-		public string PrettyName { get; internal set; }
-	}
-
 	[DataContract]
 	public class NodeInfoOSCPU
 	{
diff --git a/src/OpenSearch.Client/Cluster/RemoteInfo/RemoteInfoRequest.cs b/src/OpenSearch.Client/Cluster/RemoteInfo/RemoteInfoRequest.cs
index 0d24563259..c00fcbbddc 100644
--- a/src/OpenSearch.Client/Cluster/RemoteInfo/RemoteInfoRequest.cs
+++ b/src/OpenSearch.Client/Cluster/RemoteInfo/RemoteInfoRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.remote_info.json")]
 	public partial interface IRemoteInfoRequest { }
diff --git a/src/OpenSearch.Client/Cluster/RemoteInfo/RemoteInfoResponse.cs b/src/OpenSearch.Client/Cluster/RemoteInfo/RemoteInfoResponse.cs
index db40a158c9..5a8affded6 100644
--- a/src/OpenSearch.Client/Cluster/RemoteInfo/RemoteInfoResponse.cs
+++ b/src/OpenSearch.Client/Cluster/RemoteInfo/RemoteInfoResponse.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[DataContract]
 	[JsonFormatter(typeof(DictionaryResponseFormatter<RemoteInfoResponse, string, RemoteInfo>))]
diff --git a/src/OpenSearch.Client/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsRequest.cs b/src/OpenSearch.Client/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsRequest.cs
index b9f90a854a..5770caada8 100644
--- a/src/OpenSearch.Client/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsRequest.cs
+++ b/src/OpenSearch.Client/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsRequest.cs
@@ -32,7 +32,7 @@
 using OpenSearch.Net;
 using OpenSearch.Net.Specification.ClusterApi;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.delete_voting_config_exclusions")]
 	public partial interface IDeleteVotingConfigExclusionsRequest { }
diff --git a/src/OpenSearch.Client/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsResponse.cs b/src/OpenSearch.Client/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsResponse.cs
index a4fb89a698..5eb8097c38 100644
--- a/src/OpenSearch.Client/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsResponse.cs
+++ b/src/OpenSearch.Client/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	public class DeleteVotingConfigExclusionsResponse : ResponseBase
 	{
diff --git a/src/OpenSearch.Client/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsRequest.cs b/src/OpenSearch.Client/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsRequest.cs
index fee6b41c37..a1fbc55857 100644
--- a/src/OpenSearch.Client/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsRequest.cs
+++ b/src/OpenSearch.Client/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsRequest.cs
@@ -32,7 +32,7 @@
 using OpenSearch.Net;
 using OpenSearch.Net.Specification.ClusterApi;
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[MapsApi("cluster.post_voting_config_exclusions")]
 	public partial interface IPostVotingConfigExclusionsRequest { }
diff --git a/src/OpenSearch.Client/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsResponse.cs b/src/OpenSearch.Client/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsResponse.cs
index 48c31f3506..4c42435af4 100644
--- a/src/OpenSearch.Client/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsResponse.cs
+++ b/src/OpenSearch.Client/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsResponse.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	public class PostVotingConfigExclusionsResponse : ResponseBase
 	{
diff --git a/src/OpenSearch.Client/Descriptors.Cluster.cs b/src/OpenSearch.Client/Descriptors.Cluster.cs
index 4ca366c08b..b374b8fa41 100644
--- a/src/OpenSearch.Client/Descriptors.Cluster.cs
+++ b/src/OpenSearch.Client/Descriptors.Cluster.cs
@@ -40,7 +40,7 @@
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	///<summary>Descriptor for AllocationExplain <para>https://opensearch.org/docs/latest/opensearch/rest-api/cluster-allocation/</para></summary>
 	public partial class ClusterAllocationExplainDescriptor : RequestDescriptorBase<ClusterAllocationExplainDescriptor, ClusterAllocationExplainRequestParameters, IClusterAllocationExplainRequest>, IClusterAllocationExplainRequest
diff --git a/src/OpenSearch.Client/Requests.Cluster.cs b/src/OpenSearch.Client/Requests.Cluster.cs
index 92a9c5c49b..3b9bfb35cd 100644
--- a/src/OpenSearch.Client/Requests.Cluster.cs
+++ b/src/OpenSearch.Client/Requests.Cluster.cs
@@ -41,7 +41,7 @@
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client
+namespace OpenSearch.Client.Specification.ClusterApi
 {
 	[InterfaceDataContract]
 	public partial interface IClusterAllocationExplainRequest : IRequest<ClusterAllocationExplainRequestParameters>
diff --git a/tests/Tests.Core/Extensions/ClientExtensions.cs b/tests/Tests.Core/Extensions/ClientExtensions.cs
index 83b799f015..ecac37f833 100644
--- a/tests/Tests.Core/Extensions/ClientExtensions.cs
+++ b/tests/Tests.Core/Extensions/ClientExtensions.cs
@@ -28,6 +28,7 @@
 
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 
 namespace Tests.Core.Extensions
 {
diff --git a/tests/Tests.Core/ManagedOpenSearch/Clusters/ClientTestClusterBase.cs b/tests/Tests.Core/ManagedOpenSearch/Clusters/ClientTestClusterBase.cs
index 292a5bd360..878f672ad9 100644
--- a/tests/Tests.Core/ManagedOpenSearch/Clusters/ClientTestClusterBase.cs
+++ b/tests/Tests.Core/ManagedOpenSearch/Clusters/ClientTestClusterBase.cs
@@ -33,6 +33,7 @@
 using OpenSearch.Stack.ArtifactsApi.Products;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Configuration;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
diff --git a/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs b/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs
index 99cb3f8879..c3c93e125c 100644
--- a/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs
+++ b/tests/Tests.Core/ManagedOpenSearch/NodeSeeders/DefaultSeeder.cs
@@ -30,6 +30,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Configuration;
 using Tests.Core.Client;
 using Tests.Core.Extensions;
diff --git a/tests/Tests.Reproduce/GithubIssue3210.cs b/tests/Tests.Reproduce/GithubIssue3210.cs
index 0b34aae9ce..8772210116 100644
--- a/tests/Tests.Reproduce/GithubIssue3210.cs
+++ b/tests/Tests.Reproduce/GithubIssue3210.cs
@@ -30,6 +30,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.Client;
 
 namespace Tests.Reproduce
diff --git a/tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs b/tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs
index eda682a377..ca2f3f96c3 100644
--- a/tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs
+++ b/tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainUrlTests.cs b/tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainUrlTests.cs
index 05650a79b9..8bfe994738 100644
--- a/tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainUrlTests.cs
+++ b/tests/Tests/Cluster/ClusterAllocationExplain/ClusterAllocationExplainUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 
diff --git a/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs b/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs
index f75dac8d96..d8df8e5d1b 100644
--- a/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs
+++ b/tests/Tests/Cluster/ClusterHealth/ClusterHealthApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Cluster/ClusterHealth/ClusterHealthUrlTests.cs b/tests/Tests/Cluster/ClusterHealth/ClusterHealthUrlTests.cs
index 09096a118a..9127bd5685 100644
--- a/tests/Tests/Cluster/ClusterHealth/ClusterHealthUrlTests.cs
+++ b/tests/Tests/Cluster/ClusterHealth/ClusterHealthUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Domain;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
diff --git a/tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksApiTests.cs b/tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksApiTests.cs
index 087f3b26a8..57ed52987a 100644
--- a/tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksApiTests.cs
+++ b/tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksUrlTests.cs b/tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksUrlTests.cs
index 60e1c9cad4..9641f626ac 100644
--- a/tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksUrlTests.cs
+++ b/tests/Tests/Cluster/ClusterPendingTasks/ClusterPendingTasksUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs b/tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs
index 82aea6cecd..76974ad75d 100644
--- a/tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs
+++ b/tests/Tests/Cluster/ClusterReroute/ClusterRerouteApiTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Core.ManagedOpenSearch.NodeSeeders;
diff --git a/tests/Tests/Cluster/ClusterReroute/ClusterRerouteUrlTests.cs b/tests/Tests/Cluster/ClusterReroute/ClusterRerouteUrlTests.cs
index 24b1bd2c1d..a5f95b7b4f 100644
--- a/tests/Tests/Cluster/ClusterReroute/ClusterRerouteUrlTests.cs
+++ b/tests/Tests/Cluster/ClusterReroute/ClusterRerouteUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs b/tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs
index 3877744ebe..9784c27590 100644
--- a/tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs
+++ b/tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsApiTests.cs
@@ -28,6 +28,7 @@
 
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsUrlTests.cs b/tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsUrlTests.cs
index 20ab5aab47..ee2084024d 100644
--- a/tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsUrlTests.cs
+++ b/tests/Tests/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsApiTests.cs b/tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsApiTests.cs
index a628c8abc0..55e39b7d24 100644
--- a/tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsApiTests.cs
+++ b/tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsApiTests.cs
@@ -31,6 +31,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
diff --git a/tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutUrlTests.cs b/tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutUrlTests.cs
index 1472ffb63a..df1f84e232 100644
--- a/tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutUrlTests.cs
+++ b/tests/Tests/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cluster/ClusterState/ClusterStateApiTests.cs b/tests/Tests/Cluster/ClusterState/ClusterStateApiTests.cs
index 48c775f993..870e616819 100644
--- a/tests/Tests/Cluster/ClusterState/ClusterStateApiTests.cs
+++ b/tests/Tests/Cluster/ClusterState/ClusterStateApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs b/tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs
index f2d5f2fef2..1e7fcc89fb 100644
--- a/tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs
+++ b/tests/Tests/Cluster/ClusterState/ClusterStateUrlTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Net;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs b/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs
index 289ff0142a..e82a6d2f99 100644
--- a/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs
+++ b/tests/Tests/Cluster/ClusterStats/ClusterStatsApiTests.cs
@@ -30,6 +30,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Framework.EndpointTests;
 using Tests.Framework.EndpointTests.TestState;
diff --git a/tests/Tests/Cluster/ClusterStats/ClusterStatsUrlTests.cs b/tests/Tests/Cluster/ClusterStats/ClusterStatsUrlTests.cs
index 2760f0b0c5..e55f937295 100644
--- a/tests/Tests/Cluster/ClusterStats/ClusterStatsUrlTests.cs
+++ b/tests/Tests/Cluster/ClusterStats/ClusterStatsUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cluster/RemoteInfo/RemoteInfoApiTests.cs b/tests/Tests/Cluster/RemoteInfo/RemoteInfoApiTests.cs
index b1705ce891..ad575f4a0e 100644
--- a/tests/Tests/Cluster/RemoteInfo/RemoteInfoApiTests.cs
+++ b/tests/Tests/Cluster/RemoteInfo/RemoteInfoApiTests.cs
@@ -29,6 +29,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
 using Tests.Domain;
diff --git a/tests/Tests/Cluster/RemoteInfo/RemoteInfoUrlTests.cs b/tests/Tests/Cluster/RemoteInfo/RemoteInfoUrlTests.cs
index 22d9b15641..e958790f20 100644
--- a/tests/Tests/Cluster/RemoteInfo/RemoteInfoUrlTests.cs
+++ b/tests/Tests/Cluster/RemoteInfo/RemoteInfoUrlTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsApiTests.cs b/tests/Tests/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsApiTests.cs
index 68d0b2037b..0259f63abb 100644
--- a/tests/Tests/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsApiTests.cs
+++ b/tests/Tests/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteVotingConfigExclusionsApiTests.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Cluster.TaskManagement.GetTask;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
diff --git a/tests/Tests/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteingVotingConfigExclusionsTests.cs b/tests/Tests/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteingVotingConfigExclusionsTests.cs
index 0ca90e80e7..f217f544b5 100644
--- a/tests/Tests/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteingVotingConfigExclusionsTests.cs
+++ b/tests/Tests/Cluster/VotingConfigExclusions/DeleteVotingConfigExclusions/DeleteingVotingConfigExclusionsTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsApiTests.cs b/tests/Tests/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsApiTests.cs
index ef07886923..30a144cd01 100644
--- a/tests/Tests/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsApiTests.cs
+++ b/tests/Tests/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostVotingConfigExclusionsApiTests.cs
@@ -32,6 +32,7 @@
 using OpenSearch.Net;
 using FluentAssertions;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Cluster.TaskManagement.GetTask;
 using Tests.Core.Extensions;
 using Tests.Core.ManagedOpenSearch.Clusters;
diff --git a/tests/Tests/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostingVotingConfigExclusionsTests.cs b/tests/Tests/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostingVotingConfigExclusionsTests.cs
index aa0fc253ba..5ac8d65503 100644
--- a/tests/Tests/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostingVotingConfigExclusionsTests.cs
+++ b/tests/Tests/Cluster/VotingConfigExclusions/PostVotingConfigExclusions/PostingVotingConfigExclusionsTests.cs
@@ -29,6 +29,7 @@
 using System.Threading.Tasks;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 using OpenSearch.Client;
+using OpenSearch.Client.Specification.ClusterApi;
 using Tests.Framework.EndpointTests;
 using static Tests.Framework.EndpointTests.UrlTester;
 
diff --git a/tests/Tests/CodeStandards/Descriptors.doc.cs b/tests/Tests/CodeStandards/Descriptors.doc.cs
index bd78b645cd..d0e9214cff 100644
--- a/tests/Tests/CodeStandards/Descriptors.doc.cs
+++ b/tests/Tests/CodeStandards/Descriptors.doc.cs
@@ -33,6 +33,7 @@
 using OpenSearch.Client;
 using Tests.Framework;
 using System.Reflection;
+using OpenSearch.Client.Specification.ClusterApi;
 using OpenSearch.OpenSearch.Xunit.XunitPlumbing;
 
 namespace Tests.CodeStandards