diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Assets.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Assets.cs
index eac9201e..b59695f3 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Assets.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Assets.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Catalog of Shared API capability references.
     /// </summary>
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Asset capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Balances.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Balances.cs
index 956849c9..402bfb31 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Balances.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Balances.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Balance capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Deposits.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Deposits.cs
index 306f2699..24d0a4c3 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Deposits.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Deposits.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Deposit capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Fees.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Fees.cs
index f637e325..86d3a6f7 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Fees.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Fees.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Fee capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Funding.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Funding.cs
index 562e1f01..e429c62a 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Funding.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Funding.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Funding capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.IndexPrices.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.IndexPrices.cs
index b580621d..92a8d07a 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.IndexPrices.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.IndexPrices.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Index price capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Klines.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Klines.cs
index 2d09e30f..a1b010d7 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Klines.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Klines.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Kline capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Ledger.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Ledger.cs
index 593fa429..63714451 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Ledger.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Ledger.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Ledger capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Leverage.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Leverage.cs
index eb22c096..c0d1e0b4 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Leverage.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Leverage.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Leverage capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.MarkPrices.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.MarkPrices.cs
index 710280a9..9afd554a 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.MarkPrices.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.MarkPrices.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Mark price capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.OpenInterest.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.OpenInterest.cs
index 40a7979d..1f0c0e5a 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.OpenInterest.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.OpenInterest.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Open interest capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.OrderBooks.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.OrderBooks.cs
index 017ebb4c..16c3b5d9 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.OrderBooks.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.OrderBooks.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Order book capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Orders.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Orders.cs
index 1c800867..311196ef 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Orders.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Orders.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Order capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.PositionMode.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.PositionMode.cs
index b2d82700..00c34f9a 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.PositionMode.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.PositionMode.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Position mode capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Positions.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Positions.cs
index d8e270d3..f6b09579 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Positions.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Positions.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Position capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Symbols.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Symbols.cs
index 150a2709..fface02c 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Symbols.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Symbols.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Symbol capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Tickers.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Tickers.cs
index 8901c388..a421d9ed 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Tickers.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Tickers.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Ticker capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.TpSl.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.TpSl.cs
index d5073c4b..60a7542c 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.TpSl.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.TpSl.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Take profit and stop loss capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Trades.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Trades.cs
index e8dfcc8f..378a58e2 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Trades.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Trades.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Public trade capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Transfers.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Transfers.cs
index 6832b576..ac81888b 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Transfers.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Transfers.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Transfer capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.TriggerOrders.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.TriggerOrders.cs
index a131791a..664c5ba0 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.TriggerOrders.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.TriggerOrders.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Trigger order capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.UserTrades.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.UserTrades.cs
index 74b36e2c..0e8db5b2 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.UserTrades.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.UserTrades.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// User trade capabilities.
diff --git a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Withdrawals.cs b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Withdrawals.cs
index bf890322..fbc71882 100644
--- a/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Withdrawals.cs
+++ b/CryptoExchange.Net/SharedApis/CapabilityReferences/SharedCapabilities.Withdrawals.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 namespace CryptoExchange.Net.SharedApis
 {
-    public partial class SharedCapabilities
+    public static partial class SharedCapabilities
     {
         /// <summary>
         /// Withdrawal capabilities.
diff --git a/CryptoExchange.Net/SharedApis/Legacy/Options/ClosePositionOptions.cs b/CryptoExchange.Net/SharedApis/Legacy/Options/ClosePositionOptions.cs
index 15edcf22..92e7d8da 100644
--- a/CryptoExchange.Net/SharedApis/Legacy/Options/ClosePositionOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Legacy/Options/ClosePositionOptions.cs
@@ -24,7 +24,7 @@ namespace CryptoExchange.Net.SharedApis
         public override Type CapabilityType => typeof(IFuturesOrderRestClient);
 
         /// <inheritdoc />
-        public virtual RequestParameterRuleOverride[] ParameterRuleOverwrites
+        public virtual RequestParameterRuleOverride[] ParameterRuleOverrides
         {
             set => SetRequestParameters(value);
         }
diff --git a/CryptoExchange.Net/SharedApis/Models/SharedClientInfo.cs b/CryptoExchange.Net/SharedApis/Models/SharedClientInfo.cs
index 0a5e195e..3c27f6a6 100644
--- a/CryptoExchange.Net/SharedApis/Models/SharedClientInfo.cs
+++ b/CryptoExchange.Net/SharedApis/Models/SharedClientInfo.cs
@@ -37,7 +37,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Use Capabilities instead
         /// </summary>
-        [Obsolete("Use Capabilities instead")]
+#pragma warning disable CS0618 // Type or member is obsolete
         public EndpointOptions[] Features
         {
             get => _capabilities
@@ -46,6 +46,7 @@ namespace CryptoExchange.Net.SharedApis
 
             init => _capabilities = value;
         }
+#pragma warning restore CS0618 // Type or member is obsolete
 
         /// <summary>
         /// Client capabilities
diff --git a/CryptoExchange.Net/SharedApis/Options/CapabilityOptions.cs b/CryptoExchange.Net/SharedApis/Options/CapabilityOptions.cs
index eac9bbd7..014247ec 100644
--- a/CryptoExchange.Net/SharedApis/Options/CapabilityOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Options/CapabilityOptions.cs
@@ -235,7 +235,7 @@ namespace CryptoExchange.Net.SharedApis
         public override Type CapabilityType => typeof(TCapability);
 
         /// <inheritdoc />
-        public virtual RequestParameterRuleOverride[] ParameterRuleOverwrites
+        public virtual RequestParameterRuleOverride[] ParameterRuleOverrides
         {
             set => SetRequestParameters(value);
         }
diff --git a/CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/ISubscribeMarkPriceSocket.cs b/CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/ISubscribeIndexPriceSocket.cs
similarity index 100%
rename from CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/ISubscribeMarkPriceSocket.cs
rename to CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/ISubscribeIndexPriceSocket.cs
diff --git a/CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/SubscribeMarkPriceOptions.cs b/CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/SubscribeIndexPriceOptions.cs
similarity index 100%
rename from CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/SubscribeMarkPriceOptions.cs
rename to CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/SubscribeIndexPriceOptions.cs
diff --git a/CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/SubscribeMarkPriceRequest.cs b/CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/SubscribeIndexPriceRequest.cs
similarity index 100%
rename from CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/SubscribeMarkPriceRequest.cs
rename to CryptoExchange.Net/SharedApis/V2/IndexPrice/SubscribeIndexPrice/SubscribeIndexPriceRequest.cs