From d0f5a8d6cc881da7cccda406bdf95a26bc01eef3 Mon Sep 17 00:00:00 2001
From: Jkorf <jankorf91@gmail.com>
Date: Tue, 1 Sep 2026 15:57:19 +0200
Subject: [PATCH] wip

---
 CryptoExchange.Net/CryptoExchange.Net.csproj  |  3 +++
 CryptoExchange.Net/ExtensionMethods.cs        | 12 +++++-----
 .../SharedApis/Enums/SharedTransport.cs       | 12 ++++++++++
 .../SharedApis/Interfaces/V2/ISharedApi.cs    |  5 +++++
 .../Assets/IGetAllAssetsRest.cs}              |  2 +-
 .../Assets/IGetAssetRest.cs}                  |  2 +-
 .../Balances/IGetBalancesRest.cs}             |  2 +-
 .../Deposits/IGetDepositAddressesRest.cs}     |  2 +-
 .../Deposits/IGetDepositHistoryRest.cs}       |  2 +-
 .../Fees/IGetFeesRest.cs}                     |  2 +-
 .../Funding/IGetFundingRateHistoryRest.cs}    |  2 +-
 .../IndexPrices/IGetIndexPriceKlinesRest.cs}  |  2 +-
 .../Futures/Leverage/IGetLeverageRest.cs}     |  2 +-
 .../Futures/Leverage/ISetLeverageRest.cs}     |  2 +-
 .../MarkPrices/IGetMarkPriceKlinesRest.cs}    |  2 +-
 .../OpenInterest/IGetOpenInterestRest.cs}     |  2 +-
 ...ICancelFuturesOrderByClientOrderIdRest.cs} |  2 +-
 .../Management/ICancelFuturesOrderRest.cs}    |  2 +-
 .../Management/IPlaceFuturesOrderRest.cs}     |  2 +-
 .../Retrieval/IGetClosedFuturesOrdersRest.cs} |  2 +-
 .../IGetFuturesOrderByClientOrderIdRest.cs}   |  2 +-
 .../Orders/Retrieval/IGetFuturesOrderRest.cs} |  2 +-
 .../Retrieval/IGetOpenFuturesOrdersRest.cs}   |  2 +-
 .../PositionMode/IGetPositionModeRest.cs}     |  2 +-
 .../PositionMode/ISetPositionModeRest.cs}     |  2 +-
 .../Futures/Positions/IClosePositionRest.cs}  |  2 +-
 .../Positions/IGetPositionHistoryRest.cs}     |  2 +-
 .../Futures/Positions/IGetPositionsRest.cs}   |  2 +-
 .../Symbols/IGetFuturesSymbolsRest.cs}        |  2 +-
 .../Tickers/IGetAllFuturesTickersRest.cs}     |  2 +-
 .../Futures/Tickers/IGetFuturesTickerRest.cs} |  2 +-
 .../Futures/TpSl/ICancelFuturesTpSlRest.cs}   |  2 +-
 .../Futures/TpSl/ISetFuturesTpSlRest.cs}      |  2 +-
 .../ICancelFuturesTriggerOrderRest.cs}        |  2 +-
 .../IGetFuturesTriggerOrderRest.cs}           |  2 +-
 .../IPlaceFuturesTriggerOrderRest.cs}         |  2 +-
 .../UserTrades/IGetFuturesOrderTradesRest.cs} |  2 +-
 .../IGetFuturesUserTradeHistoryRest.cs}       |  2 +-
 .../ISharedRest.cs}                           |  2 +-
 .../Klines/IGetKlinesRest.cs}                 |  2 +-
 .../OrderBooks/IGetBookTickerRest.cs}         |  2 +-
 .../OrderBooks/IGetOrderBookRest.cs}          |  2 +-
 .../ICancelSpotOrderByClientOrderIdRest.cs}   |  2 +-
 .../Management/ICancelSpotOrderRest.cs}       |  2 +-
 .../Orders/Management/IPlaceSpotOrderRest.cs} |  2 +-
 .../Retrieval/IGetClosedSpotOrdersRest.cs}    |  2 +-
 .../Retrieval/IGetOpenSpotOrdersRest.cs}      |  2 +-
 .../IGetSpotOrderByClientOrderIdRest.cs}      |  2 +-
 .../Orders/Retrieval/IGetSpotOrderRest.cs}    |  2 +-
 .../Spot/Symbols/IGetSpotSymbolsRest.cs}      |  2 +-
 .../Spot/Tickers/IGetAllSpotTickersRest.cs}   |  2 +-
 .../Spot/Tickers/IGetSpotTickerRest.cs}       |  2 +-
 .../ICancelSpotTriggerOrderRest.cs}           |  2 +-
 .../IGetSpotTriggerOrderRest.cs}              |  2 +-
 .../IPlaceSpotTriggerOrderRest.cs}            |  2 +-
 .../UserTrades/IGetSpotOrderTradesRest.cs}    |  2 +-
 .../IGetSpotUserTradeHistoryRest.cs}          |  2 +-
 .../Trades/IGetRecentTradesRest.cs}           |  2 +-
 .../Trades/IGetTradeHistoryRest.cs}           |  2 +-
 .../Transfers/ITransferRest.cs}               |  2 +-
 .../Withdrawals/IGetWithdrawalHistoryRest.cs} |  2 +-
 .../Withdrawals/IWithdrawRest.cs}             |  2 +-
 .../Futures/ICancelFuturesOrderSocket.cs}     |  2 +-
 .../Futures/IPlaceFuturesOrderSocket.cs}      |  2 +-
 .../Futures/ISubscribeFuturesOrdersSocket.cs} |  2 +-
 .../Futures/ISubscribePositionsSocket.cs}     |  2 +-
 .../ISharedSocket.cs}                         |  2 +-
 .../ISharedSubscription.cs                    |  2 +-
 .../ISubscribeAllTickersSocket.cs}            |  2 +-
 .../ISubscribeBalancesSocket.cs}              |  2 +-
 .../ISubscribeBookTickerSocket.cs}            |  2 +-
 .../ISubscribeIncrementalOrderBookSocket.cs}  |  2 +-
 .../ISubscribeKlinesSocket.cs}                |  2 +-
 .../ISubscribeOrderBookSocket.cs}             |  2 +-
 .../ISubscribeTickerSocket.cs}                |  2 +-
 .../ISubscribeTradesSocket.cs}                |  2 +-
 .../ISubscribeUserTradesSocket.cs}            |  2 +-
 .../Spot/ICancelSpotOrderSocket.cs}           |  2 +-
 .../Spot/IPlaceSpotOrderSocket.cs}            |  2 +-
 .../Spot/ISubscribeSpotOrdersSocket.cs}       |  2 +-
 ...ancelFuturesOrderByClientOrderIdOptions.cs |  4 ++--
 .../Endpoints/CancelFuturesOrderOptions.cs    |  4 ++--
 .../Endpoints/CancelFuturesTpSlOptions.cs     |  4 ++--
 .../CancelFuturesTriggerOrderOptions.cs       |  4 ++--
 .../CancelSpotOrderByClientOrderIdOptions.cs  |  6 ++---
 .../Endpoints/CancelSpotOrderOptions.cs       |  6 ++---
 .../CancelSpotTriggerOrderOptions.cs          |  6 ++---
 .../Options/Endpoints/ClosePositionOptions.cs |  4 ++--
 .../Options/Endpoints/GetAllAssetsOptions.cs  |  4 ++--
 .../Endpoints/GetAllFuturesTickersOptions.cs  |  4 ++--
 .../Endpoints/GetAllSpotTickersOptions.cs     |  4 ++--
 .../Options/Endpoints/GetAssetOptions.cs      |  4 ++--
 .../Options/Endpoints/GetBalancesOptions.cs   |  6 ++---
 .../Options/Endpoints/GetBookTickerOptions.cs |  4 ++--
 .../Endpoints/GetDepositAddressesOptions.cs   |  4 ++--
 .../Endpoints/GetDepositHistoryOptions.cs     |  6 ++---
 .../Models/Options/Endpoints/GetFeeOptions.cs |  4 ++--
 .../Endpoints/GetFundingRateHistoryOptions.cs |  6 ++---
 .../GetFuturesClosedOrdersOptions.cs          |  6 ++---
 .../GetFuturesOrderByClientOrderIdOptions.cs  |  4 ++--
 .../Endpoints/GetFuturesOrderOptions.cs       |  4 ++--
 .../Endpoints/GetFuturesOrderTradesOptions.cs |  4 ++--
 .../Endpoints/GetFuturesSymbolsOptions.cs     |  6 ++---
 .../Endpoints/GetFuturesTickerOptions.cs      |  4 ++--
 .../GetFuturesTriggerOrderOptions.cs          |  4 ++--
 .../GetFuturesUserTradeHistoryOptions.cs      |  6 ++---
 .../Endpoints/GetIndexPriceKlinesOptions.cs   |  6 ++---
 .../Options/Endpoints/GetKlinesOptions.cs     |  8 +++----
 .../Options/Endpoints/GetLeverageOptions.cs   |  4 ++--
 .../Endpoints/GetMarkPriceKlinesOptions.cs    |  8 +++----
 .../Endpoints/GetOpenFuturesOrdersOptions.cs  |  4 ++--
 .../Endpoints/GetOpenInterestOptions.cs       |  4 ++--
 .../Endpoints/GetOpenSpotOrdersOptions.cs     |  4 ++--
 .../Options/Endpoints/GetOrderBookOptions.cs  |  8 +++----
 .../Endpoints/GetPositionHistoryOptions.cs    |  6 ++---
 .../Endpoints/GetPositionModeOptions.cs       |  4 ++--
 .../Options/Endpoints/GetPositionsOptions.cs  |  4 ++--
 .../Endpoints/GetRecentTradesOptions.cs       |  6 ++---
 .../Endpoints/GetSpotClosedOrdersOptions.cs   |  6 ++---
 .../GetSpotOrderByClientOrderIdOptions.cs     |  6 ++---
 .../Options/Endpoints/GetSpotOrderOptions.cs  |  6 ++---
 .../Endpoints/GetSpotOrderTradesOptions.cs    |  6 ++---
 .../Endpoints/GetSpotSymbolsOptions.cs        |  6 ++---
 .../Options/Endpoints/GetSpotTickerOptions.cs |  4 ++--
 .../Endpoints/GetSpotTriggerOrderOptions.cs   |  6 ++---
 .../GetSpotUserTradeHistoryOptions.cs         |  6 ++---
 .../Endpoints/GetTradeHistoryOptions.cs       |  6 ++---
 .../Endpoints/GetWithdrawalHistoryOptions.cs  |  6 ++---
 .../Endpoints/PlaceFuturesOrderOptions.cs     |  6 ++---
 .../PlaceFuturesTriggerOrderOptions.cs        |  4 ++--
 .../Endpoints/PlaceSpotOrderOptions.cs        |  6 ++---
 .../Endpoints/PlaceSpotTriggerOrderOptions.cs |  6 ++---
 .../Endpoints/SetFuturesTpSlOptions.cs        |  4 ++--
 .../Options/Endpoints/SetLeverageOptions.cs   |  4 ++--
 .../Endpoints/SetPositionModeOptions.cs       |  4 ++--
 .../Options/Endpoints/TransferOptions.cs      |  6 ++---
 .../Options/Endpoints/WithdrawOptions.cs      |  4 ++--
 .../CancelFuturesOrderSocketOptions.cs        |  4 ++--
 .../CancelSpotOrderSocketOptions.cs           |  6 ++---
 .../PlaceFuturesOrderSocketOptions.cs         |  6 ++---
 .../Operations/PlaceSpotOrderSocketOptions.cs |  6 ++---
 .../Operations/SubscribeBalanceOptions.cs     |  4 ++--
 .../Operations/SubscribeBookTickerOptions.cs  |  4 ++--
 .../SubscribeFuturesOrderOptions.cs           |  4 ++--
 .../SubscribeIncrementalOrderBookOptions.cs   |  6 ++---
 .../Operations/SubscribeKlineOptions.cs       |  8 +++----
 .../Operations/SubscribeOrderBookOptions.cs   |  6 ++---
 .../Operations/SubscribePositionOptions.cs    |  4 ++--
 .../Operations/SubscribeSpotOrderOptions.cs   |  4 ++--
 .../Operations/SubscribeTickerOptions.cs      |  4 ++--
 .../Operations/SubscribeTickersOptions.cs     |  4 ++--
 .../Operations/SubscribeTradeOptions.cs       |  4 ++--
 .../Operations/SubscribeUserTradeOptions.cs   |  4 ++--
 .../SharedApis/SharedApiBase.cs               |  5 +++++
 CryptoExchange.Net/Testing/TestHelpers.cs     |  4 ++--
 .../UserData/ItemTrackers/BalanceTracker.cs   |  8 +++----
 .../ItemTrackers/FuturesOrderTracker.cs       | 12 +++++-----
 .../ItemTrackers/FuturesUserTradeTracker.cs   |  8 +++----
 .../UserData/ItemTrackers/PositionTracker.cs  |  8 +++----
 .../UserData/ItemTrackers/SpotOrderTracker.cs | 12 +++++-----
 .../ItemTrackers/SpotUserTradeTracker.cs      |  8 +++----
 .../UserData/UserFuturesDataTracker.cs        | 22 +++++++++----------
 .../Trackers/UserData/UserSpotDataTracker.cs  | 18 +++++++--------
 163 files changed, 341 insertions(+), 316 deletions(-)
 create mode 100644 CryptoExchange.Net/SharedApis/Enums/SharedTransport.cs
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Assets/IGetAllAssetsEndpoint.cs => Rest/Assets/IGetAllAssetsRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Assets/IGetAssetEndpoint.cs => Rest/Assets/IGetAssetRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Balances/IGetBalancesEndpoint.cs => Rest/Balances/IGetBalancesRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Deposits/IGetDepositAddressesEndpoint.cs => Rest/Deposits/IGetDepositAddressesRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Deposits/IGetDepositHistoryEndpoint.cs => Rest/Deposits/IGetDepositHistoryRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Fees/IGetFeesEndpoint.cs => Rest/Fees/IGetFeesRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Funding/IGetFundingRateHistoryEndpoint.cs => Rest/Futures/Funding/IGetFundingRateHistoryRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/IndexPrices/IGetIndexPriceKlinesEndpoint.cs => Rest/Futures/IndexPrices/IGetIndexPriceKlinesRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Leverage/IGetLeverageEndpoint.cs => Rest/Futures/Leverage/IGetLeverageRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Leverage/ISetLeverageEndpoint.cs => Rest/Futures/Leverage/ISetLeverageRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/MarkPrices/IGetMarkPriceKlinesEndpoint.cs => Rest/Futures/MarkPrices/IGetMarkPriceKlinesRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/OpenInterest/IGetOpenInterestEndpoint.cs => Rest/Futures/OpenInterest/IGetOpenInterestRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Orders/Management/ICancelFuturesOrderByClientOrderIdEndpoint.cs => Rest/Futures/Orders/Management/ICancelFuturesOrderByClientOrderIdRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Orders/Management/ICancelFuturesOrderEndpoint.cs => Rest/Futures/Orders/Management/ICancelFuturesOrderRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Orders/Management/IPlaceFuturesOrderEndpoint.cs => Rest/Futures/Orders/Management/IPlaceFuturesOrderRest.cs} (97%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Orders/Retrieval/IGetClosedFuturesOrdersEndpoint.cs => Rest/Futures/Orders/Retrieval/IGetClosedFuturesOrdersRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Orders/Retrieval/IGetFuturesOrderByClientOrderIdEndpoint.cs => Rest/Futures/Orders/Retrieval/IGetFuturesOrderByClientOrderIdRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Orders/Retrieval/IGetFuturesOrderEndpoint.cs => Rest/Futures/Orders/Retrieval/IGetFuturesOrderRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Orders/Retrieval/IGetOpenFuturesOrdersEndpoint.cs => Rest/Futures/Orders/Retrieval/IGetOpenFuturesOrdersRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/PositionMode/IGetPositionModeEndpoint.cs => Rest/Futures/PositionMode/IGetPositionModeRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/PositionMode/ISetPositionModeEndpoint.cs => Rest/Futures/PositionMode/ISetPositionModeRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Positions/IClosePositionEndpoint.cs => Rest/Futures/Positions/IClosePositionRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Positions/IGetPositionHistoryEndpoint.cs => Rest/Futures/Positions/IGetPositionHistoryRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Positions/IGetPositionsEndpoint.cs => Rest/Futures/Positions/IGetPositionsRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Symbols/IGetFuturesSymbolsEndpoint.cs => Rest/Futures/Symbols/IGetFuturesSymbolsRest.cs} (97%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Tickers/IGetAllFuturesTickersEndpoint.cs => Rest/Futures/Tickers/IGetAllFuturesTickersRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/Tickers/IGetFuturesTickerEndpoint.cs => Rest/Futures/Tickers/IGetFuturesTickerRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/TpSl/ICancelFuturesTpSlEndpoint.cs => Rest/Futures/TpSl/ICancelFuturesTpSlRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/TpSl/ISetFuturesTpSlEndpoint.cs => Rest/Futures/TpSl/ISetFuturesTpSlRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/TriggerOrders/ICancelFuturesTriggerOrderEndpoint.cs => Rest/Futures/TriggerOrders/ICancelFuturesTriggerOrderRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/TriggerOrders/IGetFuturesTriggerOrderEndpoint.cs => Rest/Futures/TriggerOrders/IGetFuturesTriggerOrderRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/TriggerOrders/IPlaceFuturesTriggerOrderEndpoint.cs => Rest/Futures/TriggerOrders/IPlaceFuturesTriggerOrderRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/UserTrades/IGetFuturesOrderTradesEndpoint.cs => Rest/Futures/UserTrades/IGetFuturesOrderTradesRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Futures/UserTrades/IGetFuturesUserTradeHistoryEndpoint.cs => Rest/Futures/UserTrades/IGetFuturesUserTradeHistoryRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/ISharedApiEndpoint.cs => Rest/ISharedRest.cs} (76%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Klines/IGetKlinesEndpoint.cs => Rest/Klines/IGetKlinesRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/OrderBooks/IGetBookTickerEndpoint.cs => Rest/OrderBooks/IGetBookTickerRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/OrderBooks/IGetOrderBookEndpoint.cs => Rest/OrderBooks/IGetOrderBookRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Orders/Management/ICancelSpotOrderByClientOrderIdEndpoint.cs => Rest/Spot/Orders/Management/ICancelSpotOrderByClientOrderIdRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Orders/Management/ICancelSpotOrderEndpoint.cs => Rest/Spot/Orders/Management/ICancelSpotOrderRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Orders/Management/IPlaceSpotOrderEndpoint.cs => Rest/Spot/Orders/Management/IPlaceSpotOrderRest.cs} (97%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Orders/Retrieval/IGetClosedSpotOrdersEndpoint.cs => Rest/Spot/Orders/Retrieval/IGetClosedSpotOrdersRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Orders/Retrieval/IGetOpenSpotOrdersEndpoint.cs => Rest/Spot/Orders/Retrieval/IGetOpenSpotOrdersRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Orders/Retrieval/IGetSpotOrderByClientOrderIdEndpoint.cs => Rest/Spot/Orders/Retrieval/IGetSpotOrderByClientOrderIdRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Orders/Retrieval/IGetSpotOrderEndpoint.cs => Rest/Spot/Orders/Retrieval/IGetSpotOrderRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Symbols/IGetSpotSymbolsEndpoint.cs => Rest/Spot/Symbols/IGetSpotSymbolsRest.cs} (97%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Tickers/IGetAllSpotTickersEndpoint.cs => Rest/Spot/Tickers/IGetAllSpotTickersRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/Tickers/IGetSpotTickerEndpoint.cs => Rest/Spot/Tickers/IGetSpotTickerRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/TriggerOrders/ICancelSpotTriggerOrderEndpoint.cs => Rest/Spot/TriggerOrders/ICancelSpotTriggerOrderRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/TriggerOrders/IGetSpotTriggerOrderEndpoint.cs => Rest/Spot/TriggerOrders/IGetSpotTriggerOrderRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/TriggerOrders/IPlaceSpotTriggerOrderEndpoint.cs => Rest/Spot/TriggerOrders/IPlaceSpotTriggerOrderRest.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/UserTrades/IGetSpotOrderTradesEndpoint.cs => Rest/Spot/UserTrades/IGetSpotOrderTradesRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Spot/UserTrades/IGetSpotUserTradeHistoryEndpoint.cs => Rest/Spot/UserTrades/IGetSpotUserTradeHistoryRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Trades/IGetRecentTradesEndpoint.cs => Rest/Trades/IGetRecentTradesRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Trades/IGetTradeHistoryEndpoint.cs => Rest/Trades/IGetTradeHistoryRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Transfers/ITransferEndpoint.cs => Rest/Transfers/ITransferRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Withdrawals/IGetWithdrawalHistoryEndpoint.cs => Rest/Withdrawals/IGetWithdrawalHistoryRest.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Endpoints/Withdrawals/IWithdrawEndpoint.cs => Rest/Withdrawals/IWithdrawRest.cs} (95%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/Futures/ICancelFuturesOrderOperation.cs => Socket/Futures/ICancelFuturesOrderSocket.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/Futures/IPlaceFuturesOrderOperation.cs => Socket/Futures/IPlaceFuturesOrderSocket.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/Futures/ISubscribeFuturesOrdersOperation.cs => Socket/Futures/ISubscribeFuturesOrdersSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/Futures/ISubscribePositionsOperation.cs => Socket/Futures/ISubscribePositionsSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISharedSocketOperation.cs => Socket/ISharedSocket.cs} (75%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations => Socket}/ISharedSubscription.cs (78%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeAllTickersOperation.cs => Socket/ISubscribeAllTickersSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeBalancesOperation.cs => Socket/ISubscribeBalancesSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeBookTickerOperation.cs => Socket/ISubscribeBookTickerSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeIncrementalOrderBookOperation.cs => Socket/ISubscribeIncrementalOrderBookSocket.cs} (92%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeKlinesOperation.cs => Socket/ISubscribeKlinesSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeOrderBookOperation.cs => Socket/ISubscribeOrderBookSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeTickerOperation.cs => Socket/ISubscribeTickerSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeTradesOperation.cs => Socket/ISubscribeTradesSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/ISubscribeUserTradesOperation.cs => Socket/ISubscribeUserTradesSocket.cs} (93%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/Spot/ICancelSpotOrderOperation.cs => Socket/Spot/ICancelSpotOrderSocket.cs} (94%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/Spot/IPlaceSpotOrderOperation.cs => Socket/Spot/IPlaceSpotOrderSocket.cs} (96%)
 rename CryptoExchange.Net/SharedApis/Interfaces/V2/{Operations/Spot/ISubscribeSpotOrdersOperation.cs => Socket/Spot/ISubscribeSpotOrdersSocket.cs} (93%)

diff --git a/CryptoExchange.Net/CryptoExchange.Net.csproj b/CryptoExchange.Net/CryptoExchange.Net.csproj
index 4f985559..eb70645b 100644
--- a/CryptoExchange.Net/CryptoExchange.Net.csproj
+++ b/CryptoExchange.Net/CryptoExchange.Net.csproj
@@ -60,4 +60,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
     <PackageReference Include="System.Threading.Channels" Version="10.0.1" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="SharedApis\Interfaces\V2\Spot\Orders\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/CryptoExchange.Net/ExtensionMethods.cs b/CryptoExchange.Net/ExtensionMethods.cs
index 3587d69f..cd2b30a7 100644
--- a/CryptoExchange.Net/ExtensionMethods.cs
+++ b/CryptoExchange.Net/ExtensionMethods.cs
@@ -388,14 +388,14 @@ namespace CryptoExchange.Net
                 services.AddTransient(x => (ITradeHistoryRestClient)client(x)!);
             if (typeof(IWithdrawalRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (IWithdrawalRestClient)client(x)!);
-            if (typeof(IWithdrawEndpoint).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (IWithdrawEndpoint)client(x)!);
+            if (typeof(IWithdrawRest).IsAssignableFrom(typeof(T)))
+                services.AddTransient(x => (IWithdrawRest)client(x)!);
             if (typeof(IFeeRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (IFeeRestClient)client(x)!);
             if (typeof(IBookTickerRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (IBookTickerRestClient)client(x)!);
-            if (typeof(ITransferEndpoint).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (ITransferEndpoint)client(x)!);
+            if (typeof(ITransferRest).IsAssignableFrom(typeof(T)))
+                services.AddTransient(x => (ITransferRest)client(x)!);
 
             if (typeof(ISpotOrderRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (ISpotOrderRestClient)client(x)!);
@@ -492,8 +492,8 @@ namespace CryptoExchange.Net
             var markerInterfaces = new[]
             {
                 typeof(ISharedApiCapability),
-                typeof(ISharedApiEndpoint),
-                typeof(ISharedSocketOperation),
+                typeof(ISharedRest),
+                typeof(ISharedSocket),
                 typeof(ISharedSubscription)
             };
 
diff --git a/CryptoExchange.Net/SharedApis/Enums/SharedTransport.cs b/CryptoExchange.Net/SharedApis/Enums/SharedTransport.cs
new file mode 100644
index 00000000..669346f1
--- /dev/null
+++ b/CryptoExchange.Net/SharedApis/Enums/SharedTransport.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CryptoExchange.Net.SharedApis
+{
+    public record SharedTransport(string Name)
+    {
+        public static SharedTransport Rest { get; } = new("REST");
+        public static SharedTransport Socket { get; } = new("WebSocket");
+    }
+}
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/ISharedApi.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/ISharedApi.cs
index 43811481..ced0a8c0 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/ISharedApi.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/ISharedApi.cs
@@ -23,6 +23,11 @@ namespace CryptoExchange.Net.SharedApis
         /// </summary>
         bool Authenticated { get; }
 
+        /// <summary>
+        /// The underlying transport type used by this client
+        /// </summary>
+        SharedTransport Transport { get; }
+
         /// <summary>
         /// Capabilities and operations exposed by this API
         /// </summary>
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Assets/IGetAllAssetsEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Assets/IGetAllAssetsRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Assets/IGetAllAssetsEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Assets/IGetAllAssetsRest.cs
index 38341809..38ccda21 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Assets/IGetAllAssetsEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Assets/IGetAllAssetsRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving all assets supported on an exchange.
     /// </summary>
-    public interface IGetAllAssetsEndpoint : ISharedApiEndpoint
+    public interface IGetAllAssetsRest : ISharedRest
     {
         /// <summary>
         /// Assets request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Assets/IGetAssetEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Assets/IGetAssetRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Assets/IGetAssetEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Assets/IGetAssetRest.cs
index 33641e2c..c1940e93 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Assets/IGetAssetEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Assets/IGetAssetRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving an asset on an exchange.
     /// </summary>
-    public interface IGetAssetEndpoint : ISharedApiEndpoint
+    public interface IGetAssetRest : ISharedRest
     {
         /// <summary>
         /// Asset request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Balances/IGetBalancesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Balances/IGetBalancesRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Balances/IGetBalancesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Balances/IGetBalancesRest.cs
index 50c1f727..78bc0ef9 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Balances/IGetBalancesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Balances/IGetBalancesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving user asset balances on an exchange.
     /// </summary>
-    public interface IGetBalancesEndpoint : ISharedApiEndpoint
+    public interface IGetBalancesRest : ISharedRest
     {
         /// <summary>
         /// Balances request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Deposits/IGetDepositAddressesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Deposits/IGetDepositAddressesRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Deposits/IGetDepositAddressesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Deposits/IGetDepositAddressesRest.cs
index 20e5b5a0..24d134d6 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Deposits/IGetDepositAddressesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Deposits/IGetDepositAddressesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving user deposit addresses on an exchange.
     /// </summary>
-    public interface IGetDepositAddressesEndpoint : ISharedApiEndpoint
+    public interface IGetDepositAddressesRest : ISharedRest
     {
         /// <summary>
         /// Deposit addresses request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Deposits/IGetDepositHistoryEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Deposits/IGetDepositHistoryRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Deposits/IGetDepositHistoryEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Deposits/IGetDepositHistoryRest.cs
index 3fa67518..8681dfc0 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Deposits/IGetDepositHistoryEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Deposits/IGetDepositHistoryRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving user deposit history on an exchange.
     /// </summary>
-    public interface IGetDepositHistoryEndpoint : ISharedApiEndpoint
+    public interface IGetDepositHistoryRest : ISharedRest
     {
         /// <summary>
         /// Deposits request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Fees/IGetFeesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Fees/IGetFeesRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Fees/IGetFeesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Fees/IGetFeesRest.cs
index 59473590..04e608d8 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Fees/IGetFeesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Fees/IGetFeesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving user trading fees on an exchange.
     /// </summary>
-    public interface IGetFeesEndpoint : ISharedApiEndpoint
+    public interface IGetFeesRest : ISharedRest
     {
         /// <summary>
         /// Fee request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Funding/IGetFundingRateHistoryEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Funding/IGetFundingRateHistoryRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Funding/IGetFundingRateHistoryEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Funding/IGetFundingRateHistoryRest.cs
index b12449c7..5c008b19 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Funding/IGetFundingRateHistoryEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Funding/IGetFundingRateHistoryRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving funding rate history for a symbol on an exchange.
     /// </summary>
-    public interface IGetFundingRateHistoryEndpoint : ISharedApiEndpoint
+    public interface IGetFundingRateHistoryRest : ISharedRest
     {
         /// <summary>
         /// Funding rate request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/IndexPrices/IGetIndexPriceKlinesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/IndexPrices/IGetIndexPriceKlinesRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/IndexPrices/IGetIndexPriceKlinesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/IndexPrices/IGetIndexPriceKlinesRest.cs
index 5b0bc517..c26959bd 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/IndexPrices/IGetIndexPriceKlinesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/IndexPrices/IGetIndexPriceKlinesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving index price kline/candlestick data from an exchange
     /// </summary>
-    public interface IGetIndexPriceKlinesEndpoint : ISharedApiEndpoint
+    public interface IGetIndexPriceKlinesRest : ISharedRest
     {
         /// <summary>
         /// Index price klines request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Leverage/IGetLeverageEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Leverage/IGetLeverageRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Leverage/IGetLeverageEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Leverage/IGetLeverageRest.cs
index 9584be7e..2b2750d9 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Leverage/IGetLeverageEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Leverage/IGetLeverageRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving leverage information for a symbol on an exchange.
     /// </summary>
-    public interface IGetLeverageEndpoint : ISharedApiEndpoint
+    public interface IGetLeverageRest : ISharedRest
     {
         /// <summary>
         /// Leverage request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Leverage/ISetLeverageEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Leverage/ISetLeverageRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Leverage/ISetLeverageEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Leverage/ISetLeverageRest.cs
index c12fe3e0..b2444da2 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Leverage/ISetLeverageEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Leverage/ISetLeverageRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for setting leverage on an exchange.
     /// </summary>
-    public interface ISetLeverageEndpoint : ISharedApiEndpoint
+    public interface ISetLeverageRest : ISharedRest
     {
         /// <summary>
         /// How the leverage setting is configured on the exchange
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/MarkPrices/IGetMarkPriceKlinesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/MarkPrices/IGetMarkPriceKlinesRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/MarkPrices/IGetMarkPriceKlinesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/MarkPrices/IGetMarkPriceKlinesRest.cs
index b1b775b2..709b8dc2 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/MarkPrices/IGetMarkPriceKlinesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/MarkPrices/IGetMarkPriceKlinesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving mark price kline/candlestick data from an exchange.
     /// </summary>
-    public interface IGetMarkPriceKlinesEndpoint : ISharedApiEndpoint
+    public interface IGetMarkPriceKlinesRest : ISharedRest
     {
         /// <summary>
         /// Mark price klines request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/OpenInterest/IGetOpenInterestEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/OpenInterest/IGetOpenInterestRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/OpenInterest/IGetOpenInterestEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/OpenInterest/IGetOpenInterestRest.cs
index bfdb4c8e..f2ef4d0e 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/OpenInterest/IGetOpenInterestEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/OpenInterest/IGetOpenInterestRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving open interest data from an exchange
     /// </summary>
-    public interface IGetOpenInterestEndpoint : ISharedApiEndpoint
+    public interface IGetOpenInterestRest : ISharedRest
     {
         /// <summary>
         /// Open interest request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/ICancelFuturesOrderByClientOrderIdEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/ICancelFuturesOrderByClientOrderIdRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/ICancelFuturesOrderByClientOrderIdEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/ICancelFuturesOrderByClientOrderIdRest.cs
index 0a919478..b1c256b8 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/ICancelFuturesOrderByClientOrderIdEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/ICancelFuturesOrderByClientOrderIdRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for canceling a futures order by client order id on an exchange.
     /// </summary>
-    public interface ICancelFuturesOrderByClientOrderIdEndpoint : ISharedApiEndpoint
+    public interface ICancelFuturesOrderByClientOrderIdRest : ISharedRest
     {
         /// <summary>
         /// Futures cancel order by client order id request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/ICancelFuturesOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/ICancelFuturesOrderRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/ICancelFuturesOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/ICancelFuturesOrderRest.cs
index b483c46f..58356160 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/ICancelFuturesOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/ICancelFuturesOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for canceling a futures order on an exchange.
     /// </summary>
-    public interface ICancelFuturesOrderEndpoint : ISharedApiEndpoint
+    public interface ICancelFuturesOrderRest : ISharedRest
     {
         /// <summary>
         /// Futures cancel order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/IPlaceFuturesOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/IPlaceFuturesOrderRest.cs
similarity index 97%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/IPlaceFuturesOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/IPlaceFuturesOrderRest.cs
index fcf61deb..b5ff39d7 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Management/IPlaceFuturesOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Management/IPlaceFuturesOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for placing a futures order on an exchange.
     /// </summary>
-    public interface IPlaceFuturesOrderEndpoint : ISharedApiEndpoint
+    public interface IPlaceFuturesOrderRest : ISharedRest
     {
         /// <summary>
         /// How the trading fee is deducted
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetClosedFuturesOrdersEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetClosedFuturesOrdersRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetClosedFuturesOrdersEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetClosedFuturesOrdersRest.cs
index 43845264..e8a03dbf 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetClosedFuturesOrdersEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetClosedFuturesOrdersRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving closed futures orders on an exchange.
     /// </summary>
-    public interface IGetClosedFuturesOrdersEndpoint : ISharedApiEndpoint
+    public interface IGetClosedFuturesOrdersRest : ISharedRest
     {
         /// <summary>
         /// Spot get closed orders request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetFuturesOrderByClientOrderIdEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetFuturesOrderByClientOrderIdRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetFuturesOrderByClientOrderIdEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetFuturesOrderByClientOrderIdRest.cs
index da8d6074..e4f4085c 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetFuturesOrderByClientOrderIdEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetFuturesOrderByClientOrderIdRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving a futures order by client order id on an exchange.
     /// </summary>
-    public interface IGetFuturesOrderByClientOrderIdEndpoint : ISharedApiEndpoint
+    public interface IGetFuturesOrderByClientOrderIdRest : ISharedRest
     {
         /// <summary>
         /// Futures get order by client order id request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetFuturesOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetFuturesOrderRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetFuturesOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetFuturesOrderRest.cs
index 776a6d5b..cf82b695 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetFuturesOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetFuturesOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving a futures order on an exchange.
     /// </summary>
-    public interface IGetFuturesOrderEndpoint : ISharedApiEndpoint
+    public interface IGetFuturesOrderRest : ISharedRest
     {
         /// <summary>
         /// Futures get order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetOpenFuturesOrdersEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetOpenFuturesOrdersRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetOpenFuturesOrdersEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetOpenFuturesOrdersRest.cs
index aab04ec4..f6de4ebd 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Orders/Retrieval/IGetOpenFuturesOrdersEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Orders/Retrieval/IGetOpenFuturesOrdersRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for retrieving open futures orders on an exchange.
     /// </summary>
-    public interface IGetOpenFuturesOrdersEndpoint : ISharedApiEndpoint
+    public interface IGetOpenFuturesOrdersRest : ISharedRest
     {
         /// <summary>
         /// Futures get open orders request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/PositionMode/IGetPositionModeEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/PositionMode/IGetPositionModeRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/PositionMode/IGetPositionModeEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/PositionMode/IGetPositionModeRest.cs
index c6d7e175..341222db 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/PositionMode/IGetPositionModeEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/PositionMode/IGetPositionModeRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request defintion for getting the current user position mode setting on an exchange.
     /// </summary>
-    public interface IGetPositionModeEndpoint : ISharedApiEndpoint
+    public interface IGetPositionModeRest : ISharedRest
     {
         /// <summary>
         /// Position mode request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/PositionMode/ISetPositionModeEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/PositionMode/ISetPositionModeRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/PositionMode/ISetPositionModeEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/PositionMode/ISetPositionModeRest.cs
index cf75623f..3cf536c3 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/PositionMode/ISetPositionModeEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/PositionMode/ISetPositionModeRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Endpoint definition for setting the user position mode on an exchange.
     /// </summary>
-    public interface ISetPositionModeEndpoint : ISharedApiEndpoint
+    public interface ISetPositionModeRest : ISharedRest
     {
         /// <summary>
         /// How the exchange handles setting the position mode
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IClosePositionEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IClosePositionRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IClosePositionEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IClosePositionRest.cs
index 2e2098a1..7c1194bc 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IClosePositionEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IClosePositionRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for closing a position on an exchange.
     /// </summary>
-    public interface IClosePositionEndpoint : ISharedApiEndpoint
+    public interface IClosePositionRest : ISharedRest
     {
         /// <summary>
         /// Close position order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IGetPositionHistoryEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IGetPositionHistoryRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IGetPositionHistoryEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IGetPositionHistoryRest.cs
index ee285ddb..b57fd356 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IGetPositionHistoryEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IGetPositionHistoryRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving position history from an exchange.
     /// </summary>
-    public interface IGetPositionHistoryEndpoint : ISharedApiEndpoint
+    public interface IGetPositionHistoryRest : ISharedRest
     {
         /// <summary>
         /// Position history request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IGetPositionsEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IGetPositionsRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IGetPositionsEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IGetPositionsRest.cs
index 601786e1..fdebf9ae 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Positions/IGetPositionsEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Positions/IGetPositionsRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving open positions from an exchange.
     /// </summary>
-    public interface IGetPositionsEndpoint : ISharedApiEndpoint
+    public interface IGetPositionsRest : ISharedRest
     {
         /// <summary>
         /// Positions request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Symbols/IGetFuturesSymbolsEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Symbols/IGetFuturesSymbolsRest.cs
similarity index 97%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Symbols/IGetFuturesSymbolsEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Symbols/IGetFuturesSymbolsRest.cs
index dc04c379..c199a566 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Symbols/IGetFuturesSymbolsEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Symbols/IGetFuturesSymbolsRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for getting futures symbols from an exchange
     /// </summary>
-    public interface IGetFuturesSymbolsEndpoint : ISharedApiEndpoint
+    public interface IGetFuturesSymbolsRest : ISharedRest
     {
         /// <summary>
         /// Get the futures symbol catalog. Only available if <see cref="GetFuturesSymbolsAsync(GetSymbolsRequest, CancellationToken)"/> has been called previously.
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Tickers/IGetAllFuturesTickersEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Tickers/IGetAllFuturesTickersRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Tickers/IGetAllFuturesTickersEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Tickers/IGetAllFuturesTickersRest.cs
index 2d0282b1..de446892 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Tickers/IGetAllFuturesTickersEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Tickers/IGetAllFuturesTickersRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving all futures tickers from an exchange.
     /// </summary>
-    public interface IGetAllFuturesTickersEndpoint : ISharedApiEndpoint
+    public interface IGetAllFuturesTickersRest : ISharedRest
     {
         /// <summary>
         /// Futures get tickers request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Tickers/IGetFuturesTickerEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Tickers/IGetFuturesTickerRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Tickers/IGetFuturesTickerEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Tickers/IGetFuturesTickerRest.cs
index 84afde77..c4a6f218 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/Tickers/IGetFuturesTickerEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/Tickers/IGetFuturesTickerRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving a futures ticker from an exchange.
     /// </summary>
-    public interface IGetFuturesTickerEndpoint : ISharedApiEndpoint
+    public interface IGetFuturesTickerRest : ISharedRest
     {
         /// <summary>
         /// Futures get ticker request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TpSl/ICancelFuturesTpSlEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TpSl/ICancelFuturesTpSlRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TpSl/ICancelFuturesTpSlEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TpSl/ICancelFuturesTpSlRest.cs
index 5ca67a35..a8ed6da8 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TpSl/ICancelFuturesTpSlEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TpSl/ICancelFuturesTpSlRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for canceling a take profit and/or stop loss for an open position on an exchange.
     /// </summary>
-    public interface ICancelFuturesTpSlEndpoint : ISharedApiEndpoint
+    public interface ICancelFuturesTpSlRest : ISharedRest
     {
         /// <summary>
         /// Cancel a take profit and/or stop loss options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TpSl/ISetFuturesTpSlEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TpSl/ISetFuturesTpSlRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TpSl/ISetFuturesTpSlEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TpSl/ISetFuturesTpSlRest.cs
index 105c35ab..76d758fe 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TpSl/ISetFuturesTpSlEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TpSl/ISetFuturesTpSlRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for setting take profit and/or stop loss for an open position on an exchange.
     /// </summary>
-    public interface ISetFuturesTpSlEndpoint : ISharedApiEndpoint
+    public interface ISetFuturesTpSlRest : ISharedRest
     {
         /// <summary>
         /// Set take profit and/or stop loss options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/ICancelFuturesTriggerOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/ICancelFuturesTriggerOrderRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/ICancelFuturesTriggerOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/ICancelFuturesTriggerOrderRest.cs
index a7da12e1..a7c5b70e 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/ICancelFuturesTriggerOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/ICancelFuturesTriggerOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for canceling a futures trigger order on an exchange.
     /// </summary>
-    public interface ICancelFuturesTriggerOrderEndpoint : ISharedApiEndpoint
+    public interface ICancelFuturesTriggerOrderRest : ISharedRest
     {
         /// <summary>
         /// Cancel trigger order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/IGetFuturesTriggerOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/IGetFuturesTriggerOrderRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/IGetFuturesTriggerOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/IGetFuturesTriggerOrderRest.cs
index 8999e12c..24f2dd93 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/IGetFuturesTriggerOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/IGetFuturesTriggerOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for getting a specific futures trigger order from the exchange.
     /// </summary>
-    public interface IGetFuturesTriggerOrderEndpoint : ISharedApiEndpoint
+    public interface IGetFuturesTriggerOrderRest : ISharedRest
     {
         /// <summary>
         /// Get trigger order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/IPlaceFuturesTriggerOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/IPlaceFuturesTriggerOrderRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/IPlaceFuturesTriggerOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/IPlaceFuturesTriggerOrderRest.cs
index e7452f8f..740436f5 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/TriggerOrders/IPlaceFuturesTriggerOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/TriggerOrders/IPlaceFuturesTriggerOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for placing a futures trigger order on an exchange.
     /// </summary>
-    public interface IPlaceFuturesTriggerOrderEndpoint : ISharedApiEndpoint
+    public interface IPlaceFuturesTriggerOrderRest : ISharedRest
     {
         /// <summary>
         /// Place futures trigger order options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/UserTrades/IGetFuturesOrderTradesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/UserTrades/IGetFuturesOrderTradesRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/UserTrades/IGetFuturesOrderTradesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/UserTrades/IGetFuturesOrderTradesRest.cs
index 063e3435..ae0952e4 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/UserTrades/IGetFuturesOrderTradesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/UserTrades/IGetFuturesOrderTradesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for getting trades for a specific futures order on an exchange.
     /// </summary>
-    public interface IGetFuturesOrderTradesEndpoint : ISharedApiEndpoint
+    public interface IGetFuturesOrderTradesRest : ISharedRest
     {
         /// <summary>
         /// Futures get order trades request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/UserTrades/IGetFuturesUserTradeHistoryEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/UserTrades/IGetFuturesUserTradeHistoryRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/UserTrades/IGetFuturesUserTradeHistoryEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/UserTrades/IGetFuturesUserTradeHistoryRest.cs
index 6e37fdec..0c2ad0d8 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Futures/UserTrades/IGetFuturesUserTradeHistoryEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Futures/UserTrades/IGetFuturesUserTradeHistoryRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving futures user trade history from an exchange. 
     /// </summary>
-    public interface IGetFuturesUserTradeHistoryEndpoint : ISharedApiEndpoint
+    public interface IGetFuturesUserTradeHistoryRest : ISharedRest
     {
         /// <summary>
         /// Futures user trades request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/ISharedApiEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/ISharedRest.cs
similarity index 76%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/ISharedApiEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/ISharedRest.cs
index 11be61e8..11fae998 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/ISharedApiEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/ISharedRest.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Interface for a shared API endpoint
     /// </summary>
-    public interface ISharedApiEndpoint : ISharedApiCapability
+    public interface ISharedRest : ISharedApiCapability
     {
     }
 }
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Klines/IGetKlinesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Klines/IGetKlinesRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Klines/IGetKlinesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Klines/IGetKlinesRest.cs
index 3a755161..06b91fa9 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Klines/IGetKlinesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Klines/IGetKlinesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for getting kline/candlestick data from an exchange.
     /// </summary>
-    public interface IGetKlinesEndpoint : ISharedApiEndpoint
+    public interface IGetKlinesRest : ISharedRest
     {
         /// <summary>
         /// Kline request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/OrderBooks/IGetBookTickerEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/OrderBooks/IGetBookTickerRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/OrderBooks/IGetBookTickerEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/OrderBooks/IGetBookTickerRest.cs
index 8e0282c2..364eb655 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/OrderBooks/IGetBookTickerEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/OrderBooks/IGetBookTickerRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving the best bid/ask prices for a symbol on an exchange.
     /// </summary>
-    public interface IGetBookTickerEndpoint : ISharedApiEndpoint
+    public interface IGetBookTickerRest : ISharedRest
     {
         /// <summary>
         /// Book ticker request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/OrderBooks/IGetOrderBookEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/OrderBooks/IGetOrderBookRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/OrderBooks/IGetOrderBookEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/OrderBooks/IGetOrderBookRest.cs
index aad4bc22..639ef14b 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/OrderBooks/IGetOrderBookEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/OrderBooks/IGetOrderBookRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving an order book snapshot for a symbol on an exchange.
     /// </summary>
-    public interface IGetOrderBookEndpoint : ISharedApiEndpoint
+    public interface IGetOrderBookRest : ISharedRest
     {
         /// <summary>
         /// Order book request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/ICancelSpotOrderByClientOrderIdEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/ICancelSpotOrderByClientOrderIdRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/ICancelSpotOrderByClientOrderIdEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/ICancelSpotOrderByClientOrderIdRest.cs
index 3fb81f8e..35c3889d 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/ICancelSpotOrderByClientOrderIdEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/ICancelSpotOrderByClientOrderIdRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for canceling a spot order by client order id on an exchange.
     /// </summary>
-    public interface ICancelSpotOrderByClientOrderIdEndpoint : ISharedApiEndpoint
+    public interface ICancelSpotOrderByClientOrderIdRest : ISharedRest
     {
         /// <summary>
         /// Spot cancel order by client order id request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/ICancelSpotOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/ICancelSpotOrderRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/ICancelSpotOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/ICancelSpotOrderRest.cs
index 0e8edba2..b7b93bbd 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/ICancelSpotOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/ICancelSpotOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for canceling a spot order on an exchange.
     /// </summary>
-    public interface ICancelSpotOrderEndpoint : ISharedApiEndpoint
+    public interface ICancelSpotOrderRest : ISharedRest
     {
         /// <summary>
         /// Spot cancel order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/IPlaceSpotOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/IPlaceSpotOrderRest.cs
similarity index 97%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/IPlaceSpotOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/IPlaceSpotOrderRest.cs
index 93df5cc9..21efdbd1 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Management/IPlaceSpotOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Management/IPlaceSpotOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for placing a spot order on an exchange.
     /// </summary>
-    public interface IPlaceSpotOrderEndpoint : ISharedApiEndpoint
+    public interface IPlaceSpotOrderRest : ISharedRest
     {
         /// <summary>
         /// How the trading fee is deducted
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetClosedSpotOrdersEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetClosedSpotOrdersRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetClosedSpotOrdersEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetClosedSpotOrdersRest.cs
index c297f373..f78de9df 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetClosedSpotOrdersEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetClosedSpotOrdersRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving closed spot orders from an exchange.
     /// </summary>
-    public interface IGetClosedSpotOrdersEndpoint : ISharedApiEndpoint
+    public interface IGetClosedSpotOrdersRest : ISharedRest
     {
         /// <summary>
         /// Spot get closed orders request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetOpenSpotOrdersEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetOpenSpotOrdersRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetOpenSpotOrdersEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetOpenSpotOrdersRest.cs
index fe24c472..d8d35d32 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetOpenSpotOrdersEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetOpenSpotOrdersRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving open spot order from an exchange.
     /// </summary>
-    public interface IGetOpenSpotOrdersEndpoint : ISharedApiEndpoint
+    public interface IGetOpenSpotOrdersRest : ISharedRest
     {
         /// <summary>
         /// Spot get open orders request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetSpotOrderByClientOrderIdEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetSpotOrderByClientOrderIdRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetSpotOrderByClientOrderIdEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetSpotOrderByClientOrderIdRest.cs
index 7b1ae68e..e53cf0bd 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetSpotOrderByClientOrderIdEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetSpotOrderByClientOrderIdRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving a spot order by client order id from an exchange.
     /// </summary>
-    public interface IGetSpotOrderByClientOrderIdEndpoint : ISharedApiEndpoint
+    public interface IGetSpotOrderByClientOrderIdRest : ISharedRest
     {
         /// <summary>
         /// Spot get order by client order id request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetSpotOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetSpotOrderRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetSpotOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetSpotOrderRest.cs
index 3ccd6d68..774e9891 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Orders/Retrieval/IGetSpotOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Orders/Retrieval/IGetSpotOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving a spot order from an exchange.
     /// </summary>
-    public interface IGetSpotOrderEndpoint : ISharedApiEndpoint
+    public interface IGetSpotOrderRest : ISharedRest
     {
         /// <summary>
         /// Spot get order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Symbols/IGetSpotSymbolsEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Symbols/IGetSpotSymbolsRest.cs
similarity index 97%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Symbols/IGetSpotSymbolsEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Symbols/IGetSpotSymbolsRest.cs
index 9da37071..0697c17a 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Symbols/IGetSpotSymbolsEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Symbols/IGetSpotSymbolsRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving spot symbols from an exchange.
     /// </summary>
-    public interface IGetSpotSymbolsEndpoint : ISharedApiEndpoint
+    public interface IGetSpotSymbolsRest : ISharedRest
     {
         /// <summary>
         /// Get the spot symbol catalog. Only available if <see cref="GetSpotSymbolsAsync(GetSymbolsRequest, CancellationToken)"/> has been called previously.
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Tickers/IGetAllSpotTickersEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Tickers/IGetAllSpotTickersRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Tickers/IGetAllSpotTickersEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Tickers/IGetAllSpotTickersRest.cs
index 0b184d19..403310e6 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Tickers/IGetAllSpotTickersEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Tickers/IGetAllSpotTickersRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving all spot tickers from an exchange.
     /// </summary>
-    public interface IGetAllSpotTickersEndpoint : ISharedApiEndpoint
+    public interface IGetAllSpotTickersRest : ISharedRest
     {
         /// <summary>
         /// Spot tickers request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Tickers/IGetSpotTickerEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Tickers/IGetSpotTickerRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Tickers/IGetSpotTickerEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Tickers/IGetSpotTickerRest.cs
index 0387dbe1..bdc04c71 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/Tickers/IGetSpotTickerEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/Tickers/IGetSpotTickerRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for getting spot ticker info from an exchange.
     /// </summary>
-    public interface IGetSpotTickerEndpoint : ISharedApiEndpoint
+    public interface IGetSpotTickerRest : ISharedRest
     {
         /// <summary>
         /// Spot ticker request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/ICancelSpotTriggerOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/ICancelSpotTriggerOrderRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/ICancelSpotTriggerOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/ICancelSpotTriggerOrderRest.cs
index 37e49d98..6aa4ec06 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/ICancelSpotTriggerOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/ICancelSpotTriggerOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for canceling a spot trigger order on an exchange
     /// </summary>
-    public interface ICancelSpotTriggerOrderEndpoint : ISharedApiEndpoint
+    public interface ICancelSpotTriggerOrderRest : ISharedRest
     {
         /// <summary>
         /// Cancel trigger order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/IGetSpotTriggerOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/IGetSpotTriggerOrderRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/IGetSpotTriggerOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/IGetSpotTriggerOrderRest.cs
index a5cd9a24..6aef48c0 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/IGetSpotTriggerOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/IGetSpotTriggerOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for getting a specific spot trigger order on an exchange
     /// </summary>
-    public interface IGetSpotTriggerOrderEndpoint : ISharedApiEndpoint
+    public interface IGetSpotTriggerOrderRest : ISharedRest
     {
         /// <summary>
         /// Get trigger order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/IPlaceSpotTriggerOrderEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/IPlaceSpotTriggerOrderRest.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/IPlaceSpotTriggerOrderEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/IPlaceSpotTriggerOrderRest.cs
index bb394765..1b0e16c5 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/TriggerOrders/IPlaceSpotTriggerOrderEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/TriggerOrders/IPlaceSpotTriggerOrderRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for placing a spot trigger order on an exchange.
     /// </summary>
-    public interface IPlaceSpotTriggerOrderEndpoint : ISharedApiEndpoint
+    public interface IPlaceSpotTriggerOrderRest : ISharedRest
     {
         /// <summary>
         /// Place spot trigger order options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/UserTrades/IGetSpotOrderTradesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/UserTrades/IGetSpotOrderTradesRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/UserTrades/IGetSpotOrderTradesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/UserTrades/IGetSpotOrderTradesRest.cs
index 4dc7a990..653c5efb 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/UserTrades/IGetSpotOrderTradesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/UserTrades/IGetSpotOrderTradesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for getting trades for a specific spot order on an exchange.
     /// </summary>
-    public interface IGetSpotOrderTradesEndpoint : ISharedApiEndpoint
+    public interface IGetSpotOrderTradesRest : ISharedRest
     {
         /// <summary>
         /// Spot get order trades request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/UserTrades/IGetSpotUserTradeHistoryEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/UserTrades/IGetSpotUserTradeHistoryRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/UserTrades/IGetSpotUserTradeHistoryEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/UserTrades/IGetSpotUserTradeHistoryRest.cs
index 844c491b..5e21f6a4 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Spot/UserTrades/IGetSpotUserTradeHistoryEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Spot/UserTrades/IGetSpotUserTradeHistoryRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for getting spot user trade history from an exchange
     /// </summary>
-    public interface IGetSpotUserTradeHistoryEndpoint : ISharedApiEndpoint
+    public interface IGetSpotUserTradeHistoryRest : ISharedRest
     {
         /// <summary>
         /// Spot user trades request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Trades/IGetRecentTradesEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Trades/IGetRecentTradesRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Trades/IGetRecentTradesEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Trades/IGetRecentTradesRest.cs
index 8cf08de0..19c9b6ec 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Trades/IGetRecentTradesEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Trades/IGetRecentTradesRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving recent trades for a symbol on an exchange.
     /// </summary>
-    public interface IGetRecentTradesEndpoint : ISharedApiEndpoint
+    public interface IGetRecentTradesRest : ISharedRest
     {
         /// <summary>
         /// Recent trades request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Trades/IGetTradeHistoryEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Trades/IGetTradeHistoryRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Trades/IGetTradeHistoryEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Trades/IGetTradeHistoryRest.cs
index b338e981..19ba18a5 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Trades/IGetTradeHistoryEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Trades/IGetTradeHistoryRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving trade history from an exchange.
     /// </summary>
-    public interface IGetTradeHistoryEndpoint : ISharedApiEndpoint
+    public interface IGetTradeHistoryRest : ISharedRest
     {
         /// <summary>
         /// Trade history request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Transfers/ITransferEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Transfers/ITransferRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Transfers/ITransferEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Transfers/ITransferRest.cs
index ffddb682..fa0e62a2 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Transfers/ITransferEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Transfers/ITransferRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for transferring funds between account types on an exchange.
     /// </summary>
-    public interface ITransferEndpoint : ISharedApiEndpoint
+    public interface ITransferRest : ISharedRest
     {
         /// <summary>
         /// Transfer request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Withdrawals/IGetWithdrawalHistoryEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Withdrawals/IGetWithdrawalHistoryRest.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Withdrawals/IGetWithdrawalHistoryEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Withdrawals/IGetWithdrawalHistoryRest.cs
index 427b700a..a59edaf8 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Withdrawals/IGetWithdrawalHistoryEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Withdrawals/IGetWithdrawalHistoryRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for retrieving withdrawal history from an exchange
     /// </summary>
-    public interface IGetWithdrawalHistoryEndpoint : ISharedApiEndpoint
+    public interface IGetWithdrawalHistoryRest : ISharedRest
     {
         /// <summary>
         /// Withdrawal records request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Withdrawals/IWithdrawEndpoint.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Withdrawals/IWithdrawRest.cs
similarity index 95%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Withdrawals/IWithdrawEndpoint.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Withdrawals/IWithdrawRest.cs
index 249a4cd1..dd5acc83 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Endpoints/Withdrawals/IWithdrawEndpoint.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Rest/Withdrawals/IWithdrawRest.cs
@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Request definition for withdrawing a specific asset from an exchange.
     /// </summary>
-    public interface IWithdrawEndpoint : ISharedApiEndpoint
+    public interface IWithdrawRest : ISharedRest
     {
         /// <summary>
         /// Withdraw request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ICancelFuturesOrderOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ICancelFuturesOrderSocket.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ICancelFuturesOrderOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ICancelFuturesOrderSocket.cs
index ba352a9e..c56ae168 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ICancelFuturesOrderOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ICancelFuturesOrderSocket.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for placing and managing futures orders
     /// </summary>
-    public interface ICancelFuturesOrderOperation : ISharedSocketOperation
+    public interface ICancelFuturesOrderSocket : ISharedSocket
     {
         /// <summary>
         /// Futures cancel order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/IPlaceFuturesOrderOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/IPlaceFuturesOrderSocket.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/IPlaceFuturesOrderOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/IPlaceFuturesOrderSocket.cs
index a627bb49..4848791f 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/IPlaceFuturesOrderOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/IPlaceFuturesOrderSocket.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for placing and managing futures orders
     /// </summary>
-    public interface IPlaceFuturesOrderOperation : ISharedSocketOperation
+    public interface IPlaceFuturesOrderSocket : ISharedSocket
     {
         /// <summary>
         /// How the trading fee is deducted
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ISubscribeFuturesOrdersOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ISubscribeFuturesOrdersSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ISubscribeFuturesOrdersOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ISubscribeFuturesOrdersSocket.cs
index d3eaec25..8a1eeb2a 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ISubscribeFuturesOrdersOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ISubscribeFuturesOrdersSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to user futures order updates
     /// </summary>
-    public interface ISubscribeFuturesOrdersOperation : ISharedSubscription
+    public interface ISubscribeFuturesOrdersSocket : ISharedSubscription
     {
         /// <summary>
         /// Futures orders subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ISubscribePositionsOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ISubscribePositionsSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ISubscribePositionsOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ISubscribePositionsSocket.cs
index e19c21cf..676a88de 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Futures/ISubscribePositionsOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Futures/ISubscribePositionsSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to position updates
     /// </summary>
-    public interface ISubscribePositionsOperation : ISharedSubscription
+    public interface ISubscribePositionsSocket : ISharedSubscription
     {
         /// <summary>
         /// Position subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISharedSocketOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISharedSocket.cs
similarity index 75%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISharedSocketOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISharedSocket.cs
index 147118b8..700bfa76 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISharedSocketOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISharedSocket.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Interface for a shared socket operation
     /// </summary>
-    public interface ISharedSocketOperation : ISharedApiCapability
+    public interface ISharedSocket : ISharedApiCapability
     {
     }
 }
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISharedSubscription.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISharedSubscription.cs
similarity index 78%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISharedSubscription.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISharedSubscription.cs
index 7529d2a7..88ae4b42 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISharedSubscription.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISharedSubscription.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Identifies a fine-grained Shared API subscription capability.
     /// </summary>
-    public interface ISharedSubscription : ISharedSocketOperation
+    public interface ISharedSubscription : ISharedSocket
     {
     }
 }
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeAllTickersOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeAllTickersSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeAllTickersOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeAllTickersSocket.cs
index 60d9653b..6a48d3cb 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeAllTickersOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeAllTickersSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to ticker updates for all symbols
     /// </summary>
-    public interface ISubscribeAllTickersOperation : ISharedSubscription
+    public interface ISubscribeAllTickersSocket : ISharedSubscription
     {
         /// <summary>
         /// Tickers subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeBalancesOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeBalancesSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeBalancesOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeBalancesSocket.cs
index a7af11ef..d6810195 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeBalancesOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeBalancesSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to user balance updates
     /// </summary>
-    public interface ISubscribeBalancesOperation : ISharedSubscription
+    public interface ISubscribeBalancesSocket : ISharedSubscription
     {
         /// <summary>
         /// Balance subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeBookTickerOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeBookTickerSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeBookTickerOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeBookTickerSocket.cs
index 7c149033..507dedfd 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeBookTickerOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeBookTickerSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to book ticker updates for a symbol
     /// </summary>
-    public interface ISubscribeBookTickerOperation : ISharedSubscription
+    public interface ISubscribeBookTickerSocket : ISharedSubscription
     {
         /// <summary>
         /// Book ticker subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeIncrementalOrderBookOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeIncrementalOrderBookSocket.cs
similarity index 92%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeIncrementalOrderBookOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeIncrementalOrderBookSocket.cs
index 13803377..660b91a3 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeIncrementalOrderBookOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeIncrementalOrderBookSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to incremental order book updates for a symbol
     /// </summary>
-    public interface ISubscribeIncrementalOrderBookOperation : ISharedSubscription
+    public interface ISubscribeIncrementalOrderBookSocket : ISharedSubscription
     {
         /// <summary>
         /// Order book subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeKlinesOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeKlinesSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeKlinesOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeKlinesSocket.cs
index e7cb32a1..4f7448b5 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeKlinesOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeKlinesSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to kline/candlestick updates for a symbol
     /// </summary>
-    public interface ISubscribeKlinesOperation : ISharedSubscription
+    public interface ISubscribeKlinesSocket : ISharedSubscription
     {
         /// <summary>
         /// Kline subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeOrderBookOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeOrderBookSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeOrderBookOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeOrderBookSocket.cs
index ae405e75..d0649561 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeOrderBookOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeOrderBookSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to order book snapshot updates for a symbol
     /// </summary>
-    public interface ISubscribeOrderBookOperation : ISharedSubscription
+    public interface ISubscribeOrderBookSocket : ISharedSubscription
     {
         /// <summary>
         /// Order book subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeTickerOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeTickerSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeTickerOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeTickerSocket.cs
index f4dec8d8..8ec05d4c 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeTickerOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeTickerSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to ticker updates for a symbol
     /// </summary>
-    public interface ISubscribeTickerOperation : ISharedSubscription
+    public interface ISubscribeTickerSocket : ISharedSubscription
     {
         /// <summary>
         /// Ticker subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeTradesOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeTradesSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeTradesOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeTradesSocket.cs
index e9928986..bc19911d 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeTradesOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeTradesSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to public trade updates for a symbol
     /// </summary>
-    public interface ISubscribeTradesOperation : ISharedSubscription
+    public interface ISubscribeTradesSocket : ISharedSubscription
     {
         /// <summary>
         /// Trade subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeUserTradesOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeUserTradesSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeUserTradesOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeUserTradesSocket.cs
index 76b909c7..263f5f72 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/ISubscribeUserTradesOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/ISubscribeUserTradesSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to user trade updates
     /// </summary>
-    public interface ISubscribeUserTradesOperation : ISharedSubscription
+    public interface ISubscribeUserTradesSocket : ISharedSubscription
     {
         /// <summary>
         /// User trade subscription options
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/ICancelSpotOrderOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/ICancelSpotOrderSocket.cs
similarity index 94%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/ICancelSpotOrderOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/ICancelSpotOrderSocket.cs
index 116e4264..1887f65f 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/ICancelSpotOrderOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/ICancelSpotOrderSocket.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for placing and managing spot orders
     /// </summary>
-    public interface ICancelSpotOrderOperation : ISharedSocketOperation
+    public interface ICancelSpotOrderSocket : ISharedSocket
     {
         /// <summary>
         /// Spot cancel order request options.<br />
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/IPlaceSpotOrderOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/IPlaceSpotOrderSocket.cs
similarity index 96%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/IPlaceSpotOrderOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/IPlaceSpotOrderSocket.cs
index 7868707f..e99c0923 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/IPlaceSpotOrderOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/IPlaceSpotOrderSocket.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for placing and managing spot orders
     /// </summary>
-    public interface IPlaceSpotOrderOperation : ISharedSocketOperation
+    public interface IPlaceSpotOrderSocket : ISharedSocket
     {
         /// <summary>
         /// How the trading fee is deducted
diff --git a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/ISubscribeSpotOrdersOperation.cs b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/ISubscribeSpotOrdersSocket.cs
similarity index 93%
rename from CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/ISubscribeSpotOrdersOperation.cs
rename to CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/ISubscribeSpotOrdersSocket.cs
index 28ca2bff..58331c8a 100644
--- a/CryptoExchange.Net/SharedApis/Interfaces/V2/Operations/Spot/ISubscribeSpotOrdersOperation.cs
+++ b/CryptoExchange.Net/SharedApis/Interfaces/V2/Socket/Spot/ISubscribeSpotOrdersSocket.cs
@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Client for subscribing to user spot order updates
     /// </summary>
-    public interface ISubscribeSpotOrdersOperation : ISharedSubscription
+    public interface ISubscribeSpotOrdersSocket : ISharedSubscription
     {
         /// <summary>
         /// Spot orders subscription options
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesOrderByClientOrderIdOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesOrderByClientOrderIdOptions.cs
index 5b3f3350..5637ef54 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesOrderByClientOrderIdOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesOrderByClientOrderIdOptions.cs
@@ -3,7 +3,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for canceling a futures order by client order id
     /// </summary>
-    public class CancelFuturesOrderByClientOrderIdOptions : CapabilityOptions<CancelOrderRequest, ICancelFuturesOrderByClientOrderIdEndpoint>
+    public class CancelFuturesOrderByClientOrderIdOptions : CapabilityOptions<CancelOrderRequest, ICancelFuturesOrderByClientOrderIdRest>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a futures order by its client order id";
@@ -11,7 +11,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelFuturesOrderByClientOrderIdOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesOrderByClientOrderIdEndpoint.CancelFuturesOrderByClientOrderIdAsync))
+        public CancelFuturesOrderByClientOrderIdOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesOrderByClientOrderIdRest.CancelFuturesOrderByClientOrderIdAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesOrderOptions.cs
index 09d7c650..326d1f2f 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesOrderOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for canceling a futures order
     /// </summary>
-    public class CancelFuturesOrderOptions : CapabilityOptions<CancelOrderRequest, ICancelFuturesOrderEndpoint>
+    public class CancelFuturesOrderOptions : CapabilityOptions<CancelOrderRequest, ICancelFuturesOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a futures order";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelFuturesOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesOrderEndpoint.CancelFuturesOrderAsync))
+        public CancelFuturesOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesOrderRest.CancelFuturesOrderAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesTpSlOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesTpSlOptions.cs
index 859cfd07..29385672 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesTpSlOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesTpSlOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for canceling a TP/SL
     /// </summary>
-    public class CancelFuturesTpSlOptions : CapabilityOptions<CancelTpSlRequest, ICancelFuturesTpSlEndpoint>
+    public class CancelFuturesTpSlOptions : CapabilityOptions<CancelTpSlRequest, ICancelFuturesTpSlRest>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a take profit or stop loss order for a futures position";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelFuturesTpSlOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesTpSlEndpoint.CancelFuturesTpSlAsync))
+        public CancelFuturesTpSlOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesTpSlRest.CancelFuturesTpSlAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesTriggerOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesTriggerOrderOptions.cs
index 29a3b3ce..f32b6da8 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesTriggerOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelFuturesTriggerOrderOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for canceling spot trigger order
     /// </summary>
-    public class CancelFuturesTriggerOrderOptions : CapabilityOptions<CancelOrderRequest, ICancelFuturesTriggerOrderEndpoint>
+    public class CancelFuturesTriggerOrderOptions : CapabilityOptions<CancelOrderRequest, ICancelFuturesTriggerOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a futures trigger order";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelFuturesTriggerOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesTriggerOrderEndpoint.CancelFuturesTriggerOrderAsync))
+        public CancelFuturesTriggerOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesTriggerOrderRest.CancelFuturesTriggerOrderAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotOrderByClientOrderIdOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotOrderByClientOrderIdOptions.cs
index a161326d..2f104b52 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotOrderByClientOrderIdOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotOrderByClientOrderIdOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for canceling a spot order
     /// </summary>
-    public class CancelSpotOrderByClientOrderIdOptions : CapabilityOptions<CancelOrderRequest, ICancelSpotOrderByClientOrderIdEndpoint>
+    public class CancelSpotOrderByClientOrderIdOptions : CapabilityOptions<CancelOrderRequest, ICancelSpotOrderByClientOrderIdRest>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a spot order by its client order id";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelSpotOrderByClientOrderIdOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelSpotOrderByClientOrderIdEndpoint.CancelSpotOrderByClientOrderIdAsync))
+        public CancelSpotOrderByClientOrderIdOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelSpotOrderByClientOrderIdRest.CancelSpotOrderByClientOrderIdAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(CancelOrderRequest request, ICancelSpotOrderByClientOrderIdEndpoint client)
+        public override Error? ValidateRequest(CancelOrderRequest request, ICancelSpotOrderByClientOrderIdRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotOrderOptions.cs
index 6bb802ed..e5df6306 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotOrderOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for canceling a spot order
     /// </summary>
-    public class CancelSpotOrderOptions : CapabilityOptions<CancelOrderRequest, ICancelSpotOrderEndpoint>
+    public class CancelSpotOrderOptions : CapabilityOptions<CancelOrderRequest, ICancelSpotOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a spot order";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelSpotOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelSpotOrderEndpoint.CancelSpotOrderAsync))
+        public CancelSpotOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelSpotOrderRest.CancelSpotOrderAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(CancelOrderRequest request, ICancelSpotOrderEndpoint client)
+        public override Error? ValidateRequest(CancelOrderRequest request, ICancelSpotOrderRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotTriggerOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotTriggerOrderOptions.cs
index 8058967e..a16c756f 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotTriggerOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/CancelSpotTriggerOrderOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting spot trigger order
     /// </summary>
-    public class CancelSpotTriggerOrderOptions : CapabilityOptions<CancelOrderRequest, ICancelSpotTriggerOrderEndpoint>
+    public class CancelSpotTriggerOrderOptions : CapabilityOptions<CancelOrderRequest, ICancelSpotTriggerOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a spot trigger order";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelSpotTriggerOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelSpotTriggerOrderEndpoint.CancelSpotTriggerOrderAsync))
+        public CancelSpotTriggerOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelSpotTriggerOrderRest.CancelSpotTriggerOrderAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(CancelOrderRequest request, ICancelSpotTriggerOrderEndpoint client)
+        public override Error? ValidateRequest(CancelOrderRequest request, ICancelSpotTriggerOrderRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/ClosePositionOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/ClosePositionOptions.cs
index 3515cf0e..e3221410 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/ClosePositionOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/ClosePositionOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for closing position
     /// </summary>
-    public class ClosePositionOptions : CapabilityOptions<ClosePositionRequest, IClosePositionEndpoint>
+    public class ClosePositionOptions : CapabilityOptions<ClosePositionRequest, IClosePositionRest>
     {
         /// <inheritdoc />
         public override string Description => "Close an open futures position";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public ClosePositionOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IClosePositionEndpoint.ClosePositionAsync))
+        public ClosePositionOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IClosePositionRest.ClosePositionAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllAssetsOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllAssetsOptions.cs
index 4e0245f9..6e1bb5ab 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllAssetsOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllAssetsOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting assets info
     /// </summary>
-    public class GetAllAssetsOptions : CapabilityOptions<GetAssetsRequest, IGetAllAssetsEndpoint>
+    public class GetAllAssetsOptions : CapabilityOptions<GetAssetsRequest, IGetAllAssetsRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve basic info for all assets and the networks they support for withdrawals/deposits";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetAllAssetsOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetAllAssetsEndpoint.GetAllAssetsAsync))
+        public GetAllAssetsOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetAllAssetsRest.GetAllAssetsAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllFuturesTickersOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllFuturesTickersOptions.cs
index 8c35b4c8..214317a7 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllFuturesTickersOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllFuturesTickersOptions.cs
@@ -5,7 +5,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting tickers
     /// </summary>
-    public class GetAllFuturesTickersOptions : CapabilityOptions<GetTickersRequest, IGetAllFuturesTickersEndpoint>
+    public class GetAllFuturesTickersOptions : CapabilityOptions<GetTickersRequest, IGetAllFuturesTickersRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve price ticker information for all futures symbols";
@@ -18,7 +18,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetAllFuturesTickersOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(IGetAllFuturesTickersEndpoint.GetAllFuturesTickersAsync))
+        public GetAllFuturesTickersOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(IGetAllFuturesTickersRest.GetAllFuturesTickersAsync))
         {
             TickerType = tickerCalcType ?? SharedTickerType.Day24H;
         }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllSpotTickersOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllSpotTickersOptions.cs
index 250bc3fb..de26be50 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllSpotTickersOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAllSpotTickersOptions.cs
@@ -5,7 +5,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting tickers
     /// </summary>
-    public class GetAllSpotTickersOptions : CapabilityOptions<GetTickersRequest, IGetAllSpotTickersEndpoint>
+    public class GetAllSpotTickersOptions : CapabilityOptions<GetTickersRequest, IGetAllSpotTickersRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve price ticker information for all spot symbols";
@@ -18,7 +18,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetAllSpotTickersOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(IGetAllSpotTickersEndpoint.GetAllSpotTickersAsync))
+        public GetAllSpotTickersOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(IGetAllSpotTickersRest.GetAllSpotTickersAsync))
         {
             TickerType = tickerCalcType ?? SharedTickerType.Day24H;
         }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAssetOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAssetOptions.cs
index 96c27da9..8f834528 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAssetOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetAssetOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting asset info
     /// </summary>
-    public class GetAssetOptions : CapabilityOptions<GetAssetRequest, IGetAssetEndpoint>
+    public class GetAssetOptions : CapabilityOptions<GetAssetRequest, IGetAssetRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve basic info for a single asset and networks it supports for withdrawals/deposits";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetAssetOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetAssetEndpoint.GetAssetAsync))
+        public GetAssetOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetAssetRest.GetAssetAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetBalancesOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetBalancesOptions.cs
index ce20fef9..d6c56691 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetBalancesOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetBalancesOptions.cs
@@ -6,7 +6,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting a transfer
     /// </summary>
-    public class GetBalancesOptions : CapabilityOptions<GetBalancesRequest, IGetBalancesEndpoint>
+    public class GetBalancesOptions : CapabilityOptions<GetBalancesRequest, IGetBalancesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve account balances";
@@ -19,7 +19,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetBalancesOptions(string exchange, params AccountTypeFilter[] accountTypes) : base(exchange, true, nameof(IGetBalancesEndpoint.GetBalancesAsync))
+        public GetBalancesOptions(string exchange, params AccountTypeFilter[] accountTypes) : base(exchange, true, nameof(IGetBalancesRest.GetBalancesAsync))
         {
             SupportedAccountTypes = accountTypes;
         }
@@ -29,7 +29,7 @@ namespace CryptoExchange.Net.SharedApis
         /// </summary>
         public override Error? ValidateRequest(
             GetBalancesRequest request,
-            IGetBalancesEndpoint client)
+            IGetBalancesRest client)
         {
             if (request.AccountType != null && !IsValid(request.AccountType.Value))
                 return ArgumentError.Invalid(nameof(request.AccountType), "Invalid AccountType");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetBookTickerOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetBookTickerOptions.cs
index ebb690ee..028119c8 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetBookTickerOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetBookTickerOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting book ticker
     /// </summary>
-    public class GetBookTickerOptions : CapabilityOptions<GetBookTickerRequest, IGetBookTickerEndpoint>
+    public class GetBookTickerOptions : CapabilityOptions<GetBookTickerRequest, IGetBookTickerRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve the best bid and ask price for a symbol";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetBookTickerOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetBookTickerEndpoint.GetBookTickerAsync))
+        public GetBookTickerOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetBookTickerRest.GetBookTickerAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositAddressesOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositAddressesOptions.cs
index a2905ed1..d0138d09 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositAddressesOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositAddressesOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting deposit address
     /// </summary>
-    public class GetDepositAddressesOptions : CapabilityOptions<GetDepositAddressesRequest, IGetDepositAddressesEndpoint>
+    public class GetDepositAddressesOptions : CapabilityOptions<GetDepositAddressesRequest, IGetDepositAddressesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve deposit addresses for an asset";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetDepositAddressesOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetDepositAddressesEndpoint.GetDepositAddressesAsync))
+        public GetDepositAddressesOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetDepositAddressesRest.GetDepositAddressesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositHistoryOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositHistoryOptions.cs
index 706faed7..a039a989 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositHistoryOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetDepositHistoryOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting deposits
     /// </summary>
-    public class GetDepositHistoryOptions : PaginatedCapabilityOptions<GetDepositsRequest, IGetDepositHistoryEndpoint>
+    public class GetDepositHistoryOptions : PaginatedCapabilityOptions<GetDepositsRequest, IGetDepositHistoryRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve deposit history";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetDepositHistoryOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit) 
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetDepositHistoryEndpoint.GetDepositHistoryAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetDepositHistoryRest.GetDepositHistoryAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetDepositsRequest request, IGetDepositHistoryEndpoint client)
+        public override Error? ValidateRequest(GetDepositsRequest request, IGetDepositHistoryRest client)
         {
             if (!SupportsAscending && request.Direction == DataDirection.Ascending)
                 return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFeeOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFeeOptions.cs
index 9b0b1487..ea57460c 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFeeOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFeeOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting trading fee info
     /// </summary>
-    public class GetFeeOptions : CapabilityOptions<GetFeeRequest, IGetFeesEndpoint>
+    public class GetFeeOptions : CapabilityOptions<GetFeeRequest, IGetFeesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve trading fee information";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetFeeOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFeesEndpoint.GetFeesAsync))
+        public GetFeeOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFeesRest.GetFeesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFundingRateHistoryOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFundingRateHistoryOptions.cs
index ac5ac84f..d4d14236 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFundingRateHistoryOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFundingRateHistoryOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting funding rate history
     /// </summary>
-    public class GetFundingRateHistoryOptions : PaginatedCapabilityOptions<GetFundingRateHistoryRequest, IGetFundingRateHistoryEndpoint>
+    public class GetFundingRateHistoryOptions : PaginatedCapabilityOptions<GetFundingRateHistoryRequest, IGetFundingRateHistoryRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve historical funding rates for a futures symbol";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetFundingRateHistoryOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit, bool needsAuthentication) 
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetFundingRateHistoryEndpoint.GetFundingRateHistoryAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetFundingRateHistoryRest.GetFundingRateHistoryAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetFundingRateHistoryRequest request, IGetFundingRateHistoryEndpoint client)
+        public override Error? ValidateRequest(GetFundingRateHistoryRequest request, IGetFundingRateHistoryRest client)
         {
             if (!SupportsAscending && request.Direction == DataDirection.Ascending)
                 return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesClosedOrdersOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesClosedOrdersOptions.cs
index 814bc428..648b6c52 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesClosedOrdersOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesClosedOrdersOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting closed orders
     /// </summary>
-    public class GetFuturesClosedOrdersOptions : PaginatedCapabilityOptions<GetClosedOrdersRequest, IGetClosedFuturesOrdersEndpoint>
+    public class GetFuturesClosedOrdersOptions : PaginatedCapabilityOptions<GetClosedOrdersRequest, IGetClosedFuturesOrdersRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve closed futures orders";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetFuturesClosedOrdersOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit)
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetClosedFuturesOrdersEndpoint.GetClosedFuturesOrdersAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetClosedFuturesOrdersRest.GetClosedFuturesOrdersAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetClosedOrdersRequest request, IGetClosedFuturesOrdersEndpoint client)
+        public override Error? ValidateRequest(GetClosedOrdersRequest request, IGetClosedFuturesOrdersRest client)
         {
             if (!SupportsAscending && request.Direction == DataDirection.Ascending)
                 return ArgumentError.Invalid(nameof(GetClosedOrdersRequest.Direction), $"Ascending direction is not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderByClientOrderIdOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderByClientOrderIdOptions.cs
index 1b450b10..bd090342 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderByClientOrderIdOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderByClientOrderIdOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for getting a spot order by client order id
     /// </summary>
-    public class GetFuturesOrderByClientOrderIdOptions : CapabilityOptions<GetOrderRequest, IGetFuturesOrderByClientOrderIdEndpoint>
+    public class GetFuturesOrderByClientOrderIdOptions : CapabilityOptions<GetOrderRequest, IGetFuturesOrderByClientOrderIdRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve a futures order by its client order id";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetFuturesOrderByClientOrderIdOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesOrderByClientOrderIdEndpoint.GetFuturesOrderByClientOrderIdAsync))
+        public GetFuturesOrderByClientOrderIdOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesOrderByClientOrderIdRest.GetFuturesOrderByClientOrderIdAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderOptions.cs
index a80843bb..dd9d9660 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for getting a futures order by id endpoint
     /// </summary>
-    public class GetFuturesOrderOptions : CapabilityOptions<GetOrderRequest, IGetFuturesOrderEndpoint>
+    public class GetFuturesOrderOptions : CapabilityOptions<GetOrderRequest, IGetFuturesOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve a futures order";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetFuturesOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesOrderEndpoint.GetFuturesOrderAsync))
+        public GetFuturesOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesOrderRest.GetFuturesOrderAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderTradesOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderTradesOptions.cs
index 89f4238d..90fccf8e 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderTradesOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesOrderTradesOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for getting a trades for an order
     /// </summary>
-    public class GetFuturesOrderTradesOptions : CapabilityOptions<GetOrderTradesRequest, IGetFuturesOrderTradesEndpoint>
+    public class GetFuturesOrderTradesOptions : CapabilityOptions<GetOrderTradesRequest, IGetFuturesOrderTradesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve trades for a futures order";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetFuturesOrderTradesOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesOrderTradesEndpoint.GetFuturesOrderTradesAsync))
+        public GetFuturesOrderTradesOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesOrderTradesRest.GetFuturesOrderTradesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesSymbolsOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesSymbolsOptions.cs
index 683485cc..8fd2d12f 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesSymbolsOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesSymbolsOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting symbol info
     /// </summary>
-    public class GetFuturesSymbolsOptions : CapabilityOptions<GetSymbolsRequest, IGetFuturesSymbolsEndpoint>
+    public class GetFuturesSymbolsOptions : CapabilityOptions<GetSymbolsRequest, IGetFuturesSymbolsRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve supported futures symbols and their trading rules";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetFuturesSymbolsOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesSymbolsEndpoint.GetFuturesSymbolsAsync))
+        public GetFuturesSymbolsOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesSymbolsRest.GetFuturesSymbolsAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetSymbolsRequest request, IGetFuturesSymbolsEndpoint client)
+        public override Error? ValidateRequest(GetSymbolsRequest request, IGetFuturesSymbolsRest client)
         {
             if (request.BaseAssetType != null && request.BaseAssetSubType != null)
             {
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesTickerOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesTickerOptions.cs
index 041ed78d..2a25f533 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesTickerOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesTickerOptions.cs
@@ -5,7 +5,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting ticker
     /// </summary>
-    public class GetFuturesTickerOptions : CapabilityOptions<GetTickerRequest, IGetFuturesTickerEndpoint>
+    public class GetFuturesTickerOptions : CapabilityOptions<GetTickerRequest, IGetFuturesTickerRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve price ticker information for a futures symbol";
@@ -18,7 +18,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetFuturesTickerOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(IGetFuturesTickerEndpoint.GetFuturesTickerAsync))
+        public GetFuturesTickerOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(IGetFuturesTickerRest.GetFuturesTickerAsync))
         {
             TickerType = tickerCalcType ?? SharedTickerType.Day24H;
         }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesTriggerOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesTriggerOrderOptions.cs
index 6ccbbd2d..eca06e4d 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesTriggerOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesTriggerOrderOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting futures trigger order
     /// </summary>
-    public class GetFuturesTriggerOrderOptions : CapabilityOptions<GetOrderRequest, IGetFuturesTriggerOrderEndpoint>
+    public class GetFuturesTriggerOrderOptions : CapabilityOptions<GetOrderRequest, IGetFuturesTriggerOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve a futures trigger order";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetFuturesTriggerOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesTriggerOrderEndpoint.GetFuturesTriggerOrderAsync))
+        public GetFuturesTriggerOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetFuturesTriggerOrderRest.GetFuturesTriggerOrderAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesUserTradeHistoryOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesUserTradeHistoryOptions.cs
index 05e4d3a8..a1b5128a 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesUserTradeHistoryOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetFuturesUserTradeHistoryOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting user trades
     /// </summary>
-    public class GetFuturesUserTradeHistoryOptions : PaginatedCapabilityOptions<GetUserTradesRequest, IGetFuturesUserTradeHistoryEndpoint>
+    public class GetFuturesUserTradeHistoryOptions : PaginatedCapabilityOptions<GetUserTradesRequest, IGetFuturesUserTradeHistoryRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve futures user trade history";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetFuturesUserTradeHistoryOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit) 
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetFuturesUserTradeHistoryEndpoint.GetFuturesUserTradeHistoryAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetFuturesUserTradeHistoryRest.GetFuturesUserTradeHistoryAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetUserTradesRequest request, IGetFuturesUserTradeHistoryEndpoint client)
+        public override Error? ValidateRequest(GetUserTradesRequest request, IGetFuturesUserTradeHistoryRest client)
         {
             if (!SupportsAscending && request.Direction == DataDirection.Ascending)
                 return ArgumentError.Invalid(nameof(GetUserTradesRequest.Direction), $"Ascending direction is not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetIndexPriceKlinesOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetIndexPriceKlinesOptions.cs
index d05837ad..0ac32c41 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetIndexPriceKlinesOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetIndexPriceKlinesOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting kline/candlestick data
     /// </summary>
-    public class GetIndexPriceKlinesOptions : PaginatedCapabilityOptions<GetKlinesRequest, IGetIndexPriceKlinesEndpoint>
+    public class GetIndexPriceKlinesOptions : PaginatedCapabilityOptions<GetKlinesRequest, IGetIndexPriceKlinesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve index price candlestick data";
@@ -26,7 +26,7 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetIndexPriceKlinesOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit, bool needsAuthentication)
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetIndexPriceKlinesEndpoint.GetIndexPriceKlinesAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetIndexPriceKlinesRest.GetIndexPriceKlinesAsync))
         {
             SupportIntervals = new[]
             {
@@ -64,7 +64,7 @@ namespace CryptoExchange.Net.SharedApis
         public bool IsSupported(SharedKlineInterval interval) => SupportIntervals.Contains(interval);
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetKlinesRequest request, IGetIndexPriceKlinesEndpoint client)
+        public override Error? ValidateRequest(GetKlinesRequest request, IGetIndexPriceKlinesRest client)
         {
             if (!IsSupported(request.Interval))
                 return ArgumentError.Invalid(nameof(GetKlinesRequest.Interval), $"Interval {request.Interval} not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetKlinesOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetKlinesOptions.cs
index 00f6b58d..173fcb83 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetKlinesOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetKlinesOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting kline/candlestick data
     /// </summary>
-    public class GetKlinesOptions : PaginatedCapabilityOptions<GetKlinesRequest, IGetKlinesEndpoint>
+    public class GetKlinesOptions : PaginatedCapabilityOptions<GetKlinesRequest, IGetKlinesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve candlestick data for a symbol";
@@ -26,7 +26,7 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetKlinesOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit, bool needsAuthentication)
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetKlinesEndpoint.GetKlinesAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetKlinesRest.GetKlinesAsync))
         {
             SupportIntervals = new[]
             {
@@ -51,7 +51,7 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetKlinesOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit, bool needsAuthentication, params SharedKlineInterval[] intervals) 
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetKlinesEndpoint.GetKlinesAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetKlinesRest.GetKlinesAsync))
         {
             SupportIntervals = intervals;
         }
@@ -64,7 +64,7 @@ namespace CryptoExchange.Net.SharedApis
         public bool IsSupported(SharedKlineInterval interval) => SupportIntervals.Contains(interval);
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetKlinesRequest request, IGetKlinesEndpoint client)
+        public override Error? ValidateRequest(GetKlinesRequest request, IGetKlinesRest client)
         {
             if (!IsSupported(request.Interval))
                 return ArgumentError.Invalid(nameof(GetKlinesRequest.Interval), $"Interval {request.Interval} not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetLeverageOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetLeverageOptions.cs
index c79a3b4b..9f68beaf 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetLeverageOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetLeverageOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting asset info
     /// </summary>
-    public class GetLeverageOptions : CapabilityOptions<GetLeverageRequest, IGetLeverageEndpoint>
+    public class GetLeverageOptions : CapabilityOptions<GetLeverageRequest, IGetLeverageRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve the current leverage for a futures symbol";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetLeverageOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetLeverageEndpoint.GetLeverageAsync))
+        public GetLeverageOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetLeverageRest.GetLeverageAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetMarkPriceKlinesOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetMarkPriceKlinesOptions.cs
index 9a06ffa6..a245288f 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetMarkPriceKlinesOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetMarkPriceKlinesOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting kline/candlestick data
     /// </summary>
-    public class GetMarkPriceKlinesOptions : PaginatedCapabilityOptions<GetKlinesRequest, IGetMarkPriceKlinesEndpoint>
+    public class GetMarkPriceKlinesOptions : PaginatedCapabilityOptions<GetKlinesRequest, IGetMarkPriceKlinesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve mark price candlestick data";
@@ -26,7 +26,7 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetMarkPriceKlinesOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit, bool needsAuthentication)
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetMarkPriceKlinesEndpoint.GetMarkPriceKlinesAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetMarkPriceKlinesRest.GetMarkPriceKlinesAsync))
         {
             SupportIntervals = new[]
             {
@@ -51,7 +51,7 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetMarkPriceKlinesOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit, bool needsAuthentication, params SharedKlineInterval[] intervals) 
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetMarkPriceKlinesEndpoint.GetMarkPriceKlinesAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetMarkPriceKlinesRest.GetMarkPriceKlinesAsync))
         {
             SupportIntervals = intervals;
         }
@@ -64,7 +64,7 @@ namespace CryptoExchange.Net.SharedApis
         public bool IsSupported(SharedKlineInterval interval) => SupportIntervals.Contains(interval);
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetKlinesRequest request, IGetMarkPriceKlinesEndpoint client)
+        public override Error? ValidateRequest(GetKlinesRequest request, IGetMarkPriceKlinesRest client)
         {
             if (!IsSupported(request.Interval))
                 return ArgumentError.Invalid(nameof(GetKlinesRequest.Interval), $"Interval {request.Interval} not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenFuturesOrdersOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenFuturesOrdersOptions.cs
index dee8f9d5..f54174e9 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenFuturesOrdersOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenFuturesOrdersOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for getting a futures order by id endpoint
     /// </summary>
-    public class GetOpenFuturesOrdersOptions : CapabilityOptions<GetOpenOrdersRequest, IGetOpenFuturesOrdersEndpoint>
+    public class GetOpenFuturesOrdersOptions : CapabilityOptions<GetOpenOrdersRequest, IGetOpenFuturesOrdersRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve open futures orders";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetOpenFuturesOrdersOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetOpenFuturesOrdersEndpoint.GetOpenFuturesOrdersAsync))
+        public GetOpenFuturesOrdersOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetOpenFuturesOrdersRest.GetOpenFuturesOrdersAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenInterestOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenInterestOptions.cs
index e63e57c5..95c1dfac 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenInterestOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenInterestOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting open interest
     /// </summary>
-    public class GetOpenInterestOptions : CapabilityOptions<GetOpenInterestRequest, IGetOpenInterestEndpoint>
+    public class GetOpenInterestOptions : CapabilityOptions<GetOpenInterestRequest, IGetOpenInterestRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve open interest for a futures symbol";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetOpenInterestOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetOpenInterestEndpoint.GetOpenInterestAsync))
+        public GetOpenInterestOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetOpenInterestRest.GetOpenInterestAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenSpotOrdersOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenSpotOrdersOptions.cs
index 21bf9219..4855d6fd 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenSpotOrdersOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOpenSpotOrdersOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for getting a spot order by id endpoint
     /// </summary>
-    public class GetOpenSpotOrdersOptions : CapabilityOptions<GetOpenOrdersRequest, IGetOpenSpotOrdersEndpoint>
+    public class GetOpenSpotOrdersOptions : CapabilityOptions<GetOpenOrdersRequest, IGetOpenSpotOrdersRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve open spot orders";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetOpenSpotOrdersOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetOpenSpotOrdersEndpoint.GetOpenSpotOrdersAsync))
+        public GetOpenSpotOrdersOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetOpenSpotOrdersRest.GetOpenSpotOrdersAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOrderBookOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOrderBookOptions.cs
index 1a158442..50dcb998 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOrderBookOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetOrderBookOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting order book
     /// </summary>
-    public class GetOrderBookOptions : CapabilityOptions<GetOrderBookRequest, IGetOrderBookEndpoint>
+    public class GetOrderBookOptions : CapabilityOptions<GetOrderBookRequest, IGetOrderBookRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve the current order book for a symbol";
@@ -31,7 +31,7 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetOrderBookOptions(string exchange, int minLimit, int maxLimit, bool authenticated) 
-            : base(exchange, authenticated, nameof(IGetOrderBookEndpoint.GetOrderBookAsync))
+            : base(exchange, authenticated, nameof(IGetOrderBookRest.GetOrderBookAsync))
         {
             MinLimit = minLimit;
             MaxLimit = maxLimit;
@@ -41,13 +41,13 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetOrderBookOptions(string exchange, int[] supportedLimits, bool authenticated) 
-            : base(exchange, authenticated, nameof(IGetOrderBookEndpoint.GetOrderBookAsync))
+            : base(exchange, authenticated, nameof(IGetOrderBookRest.GetOrderBookAsync))
         {
             SupportedLimits = supportedLimits;
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetOrderBookRequest request, IGetOrderBookEndpoint client)
+        public override Error? ValidateRequest(GetOrderBookRequest request, IGetOrderBookRest client)
         {
             if (request.Limit == null)
                 return base.ValidateRequest(request, client);
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionHistoryOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionHistoryOptions.cs
index fe49c668..cfa220e0 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionHistoryOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionHistoryOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting position history
     /// </summary>
-    public class GetPositionHistoryOptions : PaginatedCapabilityOptions<GetPositionHistoryRequest, IGetPositionHistoryEndpoint>
+    public class GetPositionHistoryOptions : PaginatedCapabilityOptions<GetPositionHistoryRequest, IGetPositionHistoryRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve historical futures positions";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetPositionHistoryOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit) 
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetPositionHistoryEndpoint.GetPositionHistoryAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetPositionHistoryRest.GetPositionHistoryAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetPositionHistoryRequest request, IGetPositionHistoryEndpoint client)
+        public override Error? ValidateRequest(GetPositionHistoryRequest request, IGetPositionHistoryRest client)
         {
             if (!SupportsAscending && request.Direction == DataDirection.Ascending)
                 return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionModeOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionModeOptions.cs
index ab141c98..552b96a7 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionModeOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionModeOptions.cs
@@ -3,7 +3,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting current position mode
     /// </summary>
-    public class GetPositionModeOptions : CapabilityOptions<GetPositionModeRequest, IGetPositionModeEndpoint>
+    public class GetPositionModeOptions : CapabilityOptions<GetPositionModeRequest, IGetPositionModeRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve the current futures position mode";
@@ -11,7 +11,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetPositionModeOptions(string exchange) : base(exchange, true, nameof(IGetPositionModeEndpoint.GetPositionModeAsync))
+        public GetPositionModeOptions(string exchange) : base(exchange, true, nameof(IGetPositionModeRest.GetPositionModeAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionsOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionsOptions.cs
index dafc06a6..49d63baa 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionsOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetPositionsOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting open positions
     /// </summary>
-    public class GetPositionsOptions : CapabilityOptions<GetPositionsRequest, IGetPositionsEndpoint>
+    public class GetPositionsOptions : CapabilityOptions<GetPositionsRequest, IGetPositionsRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve open futures positions";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetPositionsOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetPositionsEndpoint.GetPositionsAsync))
+        public GetPositionsOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetPositionsRest.GetPositionsAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetRecentTradesOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetRecentTradesOptions.cs
index 52adeb64..a8157019 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetRecentTradesOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetRecentTradesOptions.cs
@@ -6,7 +6,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting recent trades
     /// </summary>
-    public class GetRecentTradesOptions : CapabilityOptions<GetRecentTradesRequest, IGetRecentTradesEndpoint>
+    public class GetRecentTradesOptions : CapabilityOptions<GetRecentTradesRequest, IGetRecentTradesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve recent public trades for a symbol";
@@ -20,13 +20,13 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetRecentTradesOptions(string exchange, int limit, bool authenticated) 
-            : base(exchange, authenticated, nameof(IGetRecentTradesEndpoint.GetRecentTradesAsync))
+            : base(exchange, authenticated, nameof(IGetRecentTradesRest.GetRecentTradesAsync))
         {
             MaxLimit = limit;
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetRecentTradesRequest request, IGetRecentTradesEndpoint client)
+        public override Error? ValidateRequest(GetRecentTradesRequest request, IGetRecentTradesRest client)
         {
             var baseError = base.ValidateRequest(request, client);
             if (baseError != null)
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotClosedOrdersOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotClosedOrdersOptions.cs
index d8268aeb..54128c92 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotClosedOrdersOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotClosedOrdersOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting user trades
     /// </summary>
-    public class GetSpotClosedOrdersOptions : PaginatedCapabilityOptions<GetClosedOrdersRequest, IGetClosedSpotOrdersEndpoint>
+    public class GetSpotClosedOrdersOptions : PaginatedCapabilityOptions<GetClosedOrdersRequest, IGetClosedSpotOrdersRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve closed spot orders";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetSpotClosedOrdersOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit)
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetClosedSpotOrdersEndpoint.GetClosedSpotOrdersAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetClosedSpotOrdersRest.GetClosedSpotOrdersAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetClosedOrdersRequest request, IGetClosedSpotOrdersEndpoint client)
+        public override Error? ValidateRequest(GetClosedOrdersRequest request, IGetClosedSpotOrdersRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderByClientOrderIdOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderByClientOrderIdOptions.cs
index 540cb9db..d306fa7c 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderByClientOrderIdOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderByClientOrderIdOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for getting a spot order by client order id endpoint
     /// </summary>
-    public class GetSpotOrderByClientOrderIdOptions : CapabilityOptions<GetOrderRequest, IGetSpotOrderByClientOrderIdEndpoint>
+    public class GetSpotOrderByClientOrderIdOptions : CapabilityOptions<GetOrderRequest, IGetSpotOrderByClientOrderIdRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve a spot order by its client order id";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetSpotOrderByClientOrderIdOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotOrderByClientOrderIdEndpoint.GetSpotOrderByClientOrderIdAsync))
+        public GetSpotOrderByClientOrderIdOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotOrderByClientOrderIdRest.GetSpotOrderByClientOrderIdAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetOrderRequest request, IGetSpotOrderByClientOrderIdEndpoint client)
+        public override Error? ValidateRequest(GetOrderRequest request, IGetSpotOrderByClientOrderIdRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderOptions.cs
index 0f848bbe..df2d1993 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for getting a spot order by id endpoint
     /// </summary>
-    public class GetSpotOrderOptions : CapabilityOptions<GetOrderRequest, IGetSpotOrderEndpoint>
+    public class GetSpotOrderOptions : CapabilityOptions<GetOrderRequest, IGetSpotOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve a spot order";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetSpotOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotOrderEndpoint.GetSpotOrderAsync))
+        public GetSpotOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotOrderRest.GetSpotOrderAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetOrderRequest request, IGetSpotOrderEndpoint client)
+        public override Error? ValidateRequest(GetOrderRequest request, IGetSpotOrderRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderTradesOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderTradesOptions.cs
index ddacf366..88fcca1a 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderTradesOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotOrderTradesOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for getting trades for a spot order
     /// </summary>
-    public class GetSpotOrderTradesOptions : CapabilityOptions<GetOrderTradesRequest, IGetSpotOrderTradesEndpoint>
+    public class GetSpotOrderTradesOptions : CapabilityOptions<GetOrderTradesRequest, IGetSpotOrderTradesRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve trades for a spot order";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetSpotOrderTradesOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotOrderTradesEndpoint.GetSpotOrderTradesAsync))
+        public GetSpotOrderTradesOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotOrderTradesRest.GetSpotOrderTradesAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetOrderTradesRequest request, IGetSpotOrderTradesEndpoint client)
+        public override Error? ValidateRequest(GetOrderTradesRequest request, IGetSpotOrderTradesRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotSymbolsOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotSymbolsOptions.cs
index 4fa459fc..34dcb4c3 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotSymbolsOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotSymbolsOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting symbol info
     /// </summary>
-    public class GetSpotSymbolsOptions : CapabilityOptions<GetSymbolsRequest, IGetSpotSymbolsEndpoint>
+    public class GetSpotSymbolsOptions : CapabilityOptions<GetSymbolsRequest, IGetSpotSymbolsRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve supported spot symbols and their trading rules";
@@ -16,13 +16,13 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetSpotSymbolsOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotSymbolsEndpoint.GetSpotSymbolsAsync))
+        public GetSpotSymbolsOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotSymbolsRest.GetSpotSymbolsAsync))
         {
         }
 
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetSymbolsRequest request, IGetSpotSymbolsEndpoint client)
+        public override Error? ValidateRequest(GetSymbolsRequest request, IGetSpotSymbolsRest client)
         {
             if (request.BaseAssetType != null && request.BaseAssetSubType != null)
             {
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotTickerOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotTickerOptions.cs
index fcab31af..f0a751e5 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotTickerOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotTickerOptions.cs
@@ -5,7 +5,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting ticker
     /// </summary>
-    public class GetSpotTickerOptions : CapabilityOptions<GetTickerRequest, IGetSpotTickerEndpoint>
+    public class GetSpotTickerOptions : CapabilityOptions<GetTickerRequest, IGetSpotTickerRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve price ticker information for a spot symbol";
@@ -18,7 +18,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetSpotTickerOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(IGetSpotTickerEndpoint.GetSpotTickerAsync))
+        public GetSpotTickerOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(IGetSpotTickerRest.GetSpotTickerAsync))
         {
             TickerType = tickerCalcType ?? SharedTickerType.Day24H;
         }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotTriggerOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotTriggerOrderOptions.cs
index 8f7fbca7..825fba62 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotTriggerOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotTriggerOrderOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting spot trigger order
     /// </summary>
-    public class GetSpotTriggerOrderOptions : CapabilityOptions<GetOrderRequest, IGetSpotTriggerOrderEndpoint>
+    public class GetSpotTriggerOrderOptions : CapabilityOptions<GetOrderRequest, IGetSpotTriggerOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve a spot trigger order";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public GetSpotTriggerOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotTriggerOrderEndpoint.GetSpotTriggerOrderAsync))
+        public GetSpotTriggerOrderOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(IGetSpotTriggerOrderRest.GetSpotTriggerOrderAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetOrderRequest request, IGetSpotTriggerOrderEndpoint client)
+        public override Error? ValidateRequest(GetOrderRequest request, IGetSpotTriggerOrderRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotUserTradeHistoryOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotUserTradeHistoryOptions.cs
index 9b84ee4c..313f6d7e 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotUserTradeHistoryOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetSpotUserTradeHistoryOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting user trades
     /// </summary>
-    public class GetSpotUserTradeHistoryOptions : PaginatedCapabilityOptions<GetUserTradesRequest, IGetSpotUserTradeHistoryEndpoint>
+    public class GetSpotUserTradeHistoryOptions : PaginatedCapabilityOptions<GetUserTradesRequest, IGetSpotUserTradeHistoryRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve spot user trade history";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetSpotUserTradeHistoryOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit) 
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetSpotUserTradeHistoryEndpoint.GetSpotUserTradeHistoryAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetSpotUserTradeHistoryRest.GetSpotUserTradeHistoryAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetUserTradesRequest request, IGetSpotUserTradeHistoryEndpoint client)
+        public override Error? ValidateRequest(GetUserTradesRequest request, IGetSpotUserTradeHistoryRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetTradeHistoryOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetTradeHistoryOptions.cs
index a0b8ee8b..7325db2b 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetTradeHistoryOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetTradeHistoryOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting trade history
     /// </summary>
-    public class GetTradeHistoryOptions : PaginatedCapabilityOptions<GetTradeHistoryRequest, IGetTradeHistoryEndpoint>
+    public class GetTradeHistoryOptions : PaginatedCapabilityOptions<GetTradeHistoryRequest, IGetTradeHistoryRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve public trade history for a symbol";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetTradeHistoryOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit, bool needsAuthentication)
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetTradeHistoryEndpoint.GetTradeHistoryAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, needsAuthentication, nameof(IGetTradeHistoryRest.GetTradeHistoryAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetTradeHistoryRequest request, IGetTradeHistoryEndpoint client)
+        public override Error? ValidateRequest(GetTradeHistoryRequest request, IGetTradeHistoryRest client)
         {
             if (!SupportsAscending && request.Direction == DataDirection.Ascending)
                 return ArgumentError.Invalid(nameof(GetTradeHistoryRequest.Direction), $"Ascending direction is not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetWithdrawalHistoryOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetWithdrawalHistoryOptions.cs
index ea7fe3a4..51d74af2 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetWithdrawalHistoryOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetWithdrawalHistoryOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting withdrawals
     /// </summary>
-    public class GetWithdrawalHistoryOptions : PaginatedCapabilityOptions<GetWithdrawalsRequest, IGetWithdrawalHistoryEndpoint>
+    public class GetWithdrawalHistoryOptions : PaginatedCapabilityOptions<GetWithdrawalsRequest, IGetWithdrawalHistoryRest>
     {
         /// <inheritdoc />
         public override string Description => "Retrieve withdrawal history";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public GetWithdrawalHistoryOptions(string exchange, bool supportsAscending, bool supportsDescending, bool timeFilterSupported, int maxLimit)
-            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetWithdrawalHistoryEndpoint.GetWithdrawalHistoryAsync))
+            : base(exchange, supportsAscending, supportsDescending, timeFilterSupported, maxLimit, true, nameof(IGetWithdrawalHistoryRest.GetWithdrawalHistoryAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(GetWithdrawalsRequest request, IGetWithdrawalHistoryEndpoint client)
+        public override Error? ValidateRequest(GetWithdrawalsRequest request, IGetWithdrawalHistoryRest client)
         {
             if (!SupportsAscending && request.Direction == DataDirection.Ascending)
                 return ArgumentError.Invalid(nameof(GetWithdrawalsRequest.Direction), $"Ascending direction is not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceFuturesOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceFuturesOrderOptions.cs
index 35b0eee5..2b0553be 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceFuturesOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceFuturesOrderOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for placing a new futures order
     /// </summary>
-    public class PlaceFuturesOrderOptions : CapabilityOptions<PlaceFuturesOrderRequest, IPlaceFuturesOrderEndpoint>
+    public class PlaceFuturesOrderOptions : CapabilityOptions<PlaceFuturesOrderRequest, IPlaceFuturesOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Place a new futures order";
@@ -20,7 +20,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public PlaceFuturesOrderOptions(string exchange, bool supportsTpSl) : base(exchange, true, nameof(IPlaceFuturesOrderEndpoint.PlaceFuturesOrderAsync))
+        public PlaceFuturesOrderOptions(string exchange, bool supportsTpSl) : base(exchange, true, nameof(IPlaceFuturesOrderRest.PlaceFuturesOrderAsync))
         {
             SupportsTpSl = supportsTpSl;
         }
@@ -30,7 +30,7 @@ namespace CryptoExchange.Net.SharedApis
         /// </summary>
         public override Error? ValidateRequest(
             PlaceFuturesOrderRequest request,
-            IPlaceFuturesOrderEndpoint client
+            IPlaceFuturesOrderRest client
             )
         {
             if (!SupportsTpSl && (request.StopLossPrice != null || request.TakeProfitPrice != null))
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceFuturesTriggerOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceFuturesTriggerOrderOptions.cs
index 7cda394a..a674b63b 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceFuturesTriggerOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceFuturesTriggerOrderOptions.cs
@@ -5,7 +5,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for placing a new spot trigger order
     /// </summary>
-    public class PlaceFuturesTriggerOrderOptions : CapabilityOptions<PlaceFuturesTriggerOrderRequest, IPlaceFuturesTriggerOrderEndpoint>
+    public class PlaceFuturesTriggerOrderOptions : CapabilityOptions<PlaceFuturesTriggerOrderRequest, IPlaceFuturesTriggerOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Place a new futures trigger order";
@@ -18,7 +18,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public PlaceFuturesTriggerOrderOptions(string exchange, bool holdsFunds) : base(exchange, true, nameof(IPlaceFuturesTriggerOrderEndpoint.PlaceFuturesTriggerOrderAsync))
+        public PlaceFuturesTriggerOrderOptions(string exchange, bool holdsFunds) : base(exchange, true, nameof(IPlaceFuturesTriggerOrderRest.PlaceFuturesTriggerOrderAsync))
         {
             HoldsFunds = holdsFunds;
         }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceSpotOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceSpotOrderOptions.cs
index 6ca98fe8..06f63de7 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceSpotOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceSpotOrderOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for placing a new spot order
     /// </summary>
-    public class PlaceSpotOrderOptions : CapabilityOptions<PlaceSpotOrderRequest, IPlaceSpotOrderEndpoint>
+    public class PlaceSpotOrderOptions : CapabilityOptions<PlaceSpotOrderRequest, IPlaceSpotOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Place a new spot order";
@@ -16,7 +16,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public PlaceSpotOrderOptions(string exchange) : base(exchange, true, nameof(IPlaceSpotOrderEndpoint.PlaceSpotOrderAsync))
+        public PlaceSpotOrderOptions(string exchange) : base(exchange, true, nameof(IPlaceSpotOrderRest.PlaceSpotOrderAsync))
         {
         }
 
@@ -25,7 +25,7 @@ namespace CryptoExchange.Net.SharedApis
         /// </summary>
         public override Error? ValidateRequest(
             PlaceSpotOrderRequest request,
-            IPlaceSpotOrderEndpoint client)
+            IPlaceSpotOrderRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceSpotTriggerOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceSpotTriggerOrderOptions.cs
index 0ad29ed8..56f1942e 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceSpotTriggerOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/PlaceSpotTriggerOrderOptions.cs
@@ -5,7 +5,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for placing a new spot trigger order
     /// </summary>
-    public class PlaceSpotTriggerOrderOptions : CapabilityOptions<PlaceSpotTriggerOrderRequest, IPlaceSpotTriggerOrderEndpoint>
+    public class PlaceSpotTriggerOrderOptions : CapabilityOptions<PlaceSpotTriggerOrderRequest, IPlaceSpotTriggerOrderRest>
     {
         /// <inheritdoc />
         public override string Description => "Place a new spot trigger order";
@@ -18,7 +18,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public PlaceSpotTriggerOrderOptions(string exchange, bool holdsFunds) : base(exchange, true, nameof(IPlaceSpotTriggerOrderEndpoint.PlaceSpotTriggerOrderAsync))
+        public PlaceSpotTriggerOrderOptions(string exchange, bool holdsFunds) : base(exchange, true, nameof(IPlaceSpotTriggerOrderRest.PlaceSpotTriggerOrderAsync))
         {
             HoldsFunds = holdsFunds;
         }
@@ -28,7 +28,7 @@ namespace CryptoExchange.Net.SharedApis
         /// </summary>
         public override Error? ValidateRequest(
             PlaceSpotTriggerOrderRequest request,
-            IPlaceSpotTriggerOrderEndpoint client)
+            IPlaceSpotTriggerOrderRest client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetFuturesTpSlOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetFuturesTpSlOptions.cs
index cb3c5281..07046d4c 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetFuturesTpSlOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetFuturesTpSlOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for setting a TP/SL
     /// </summary>
-    public class SetFuturesTpSlOptions : CapabilityOptions<SetTpSlRequest, ISetFuturesTpSlEndpoint>
+    public class SetFuturesTpSlOptions : CapabilityOptions<SetTpSlRequest, ISetFuturesTpSlRest>
     {
         /// <inheritdoc />
         public override string Description => "Set take profit or stop loss values for a futures position";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SetFuturesTpSlOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ISetFuturesTpSlEndpoint.SetFuturesTpSlAsync))
+        public SetFuturesTpSlOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ISetFuturesTpSlRest.SetFuturesTpSlAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetLeverageOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetLeverageOptions.cs
index 1fd87669..1413266d 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetLeverageOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetLeverageOptions.cs
@@ -3,7 +3,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for setting leverage
     /// </summary>
-    public class SetLeverageOptions : CapabilityOptions<SetLeverageRequest, ISetLeverageEndpoint>
+    public class SetLeverageOptions : CapabilityOptions<SetLeverageRequest, ISetLeverageRest>
     {
         /// <inheritdoc />
         public override string Description => "Set the leverage for a futures symbol";
@@ -11,7 +11,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SetLeverageOptions(string exchange) : base(exchange, true, nameof(ISetLeverageEndpoint.SetLeverageAsync))
+        public SetLeverageOptions(string exchange) : base(exchange, true, nameof(ISetLeverageRest.SetLeverageAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetPositionModeOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetPositionModeOptions.cs
index c6c83c6b..9cd8edbb 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetPositionModeOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/SetPositionModeOptions.cs
@@ -3,7 +3,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for setting position mode
     /// </summary>
-    public class SetPositionModeOptions : CapabilityOptions<SetPositionModeRequest, ISetPositionModeEndpoint>
+    public class SetPositionModeOptions : CapabilityOptions<SetPositionModeRequest, ISetPositionModeRest>
     {
         /// <inheritdoc />
         public override string Description => "Set the futures position mode";
@@ -11,7 +11,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SetPositionModeOptions(string exchange) : base(exchange, true, nameof(ISetPositionModeEndpoint.SetPositionModeOptions))
+        public SetPositionModeOptions(string exchange) : base(exchange, true, nameof(ISetPositionModeRest.SetPositionModeOptions))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/TransferOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/TransferOptions.cs
index 9b667cef..a8956d48 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/TransferOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/TransferOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting a transfer
     /// </summary>
-    public class TransferOptions : CapabilityOptions<TransferRequest, ITransferEndpoint>
+    public class TransferOptions : CapabilityOptions<TransferRequest, ITransferRest>
     {
         /// <inheritdoc />
         public override string Description => "Transfer funds between account types";
@@ -20,7 +20,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public TransferOptions(string exchange, SharedAccountType[] accountTypes) : base(exchange, true, nameof(ITransferEndpoint.TransferAsync))
+        public TransferOptions(string exchange, SharedAccountType[] accountTypes) : base(exchange, true, nameof(ITransferRest.TransferAsync))
         {
             SupportedAccountTypes = accountTypes;
         }
@@ -30,7 +30,7 @@ namespace CryptoExchange.Net.SharedApis
         /// </summary>
         public override Error? ValidateRequest(
             TransferRequest request,
-            ITransferEndpoint client)
+            ITransferRest client)
         {
             if (!SupportedAccountTypes.Contains(request.FromAccountType))
                 return ArgumentError.Invalid(nameof(request.FromAccountType), "Invalid FromAccountType");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/WithdrawOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/WithdrawOptions.cs
index 064f4153..4221c7a2 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/WithdrawOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Endpoints/WithdrawOptions.cs
@@ -3,7 +3,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for requesting a withdrawal
     /// </summary>
-    public class WithdrawOptions : CapabilityOptions<WithdrawRequest, IWithdrawEndpoint>
+    public class WithdrawOptions : CapabilityOptions<WithdrawRequest, IWithdrawRest>
     {
         /// <inheritdoc />
         public override string Description => "Withdraw an asset";
@@ -11,7 +11,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public WithdrawOptions(string exchange) : base(exchange, true, nameof(IWithdrawEndpoint.WithdrawAsync))
+        public WithdrawOptions(string exchange) : base(exchange, true, nameof(IWithdrawRest.WithdrawAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/CancelFuturesOrderSocketOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/CancelFuturesOrderSocketOptions.cs
index eaa4fae8..39a45a7e 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/CancelFuturesOrderSocketOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/CancelFuturesOrderSocketOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for canceling a futures order
     /// </summary>
-    public class CancelFuturesOrderSocketOptions : CapabilityOptions<CancelOrderRequest, ICancelFuturesOrderOperation>
+    public class CancelFuturesOrderSocketOptions : CapabilityOptions<CancelOrderRequest, ICancelFuturesOrderSocket>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a futures order over a socket connection";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelFuturesOrderSocketOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesOrderOperation.CancelFuturesOrderAsync))
+        public CancelFuturesOrderSocketOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelFuturesOrderSocket.CancelFuturesOrderAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/CancelSpotOrderSocketOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/CancelSpotOrderSocketOptions.cs
index 9844107e..2e625528 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/CancelSpotOrderSocketOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/CancelSpotOrderSocketOptions.cs
@@ -8,7 +8,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for canceling a spot order
     /// </summary>
-    public class CancelSpotOrderSocketOptions : CapabilityOptions<CancelOrderRequest, ICancelSpotOrderOperation>
+    public class CancelSpotOrderSocketOptions : CapabilityOptions<CancelOrderRequest, ICancelSpotOrderSocket>
     {
         /// <inheritdoc />
         public override string Description => "Cancel a spot order over a socket connection";
@@ -16,12 +16,12 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public CancelSpotOrderSocketOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelSpotOrderOperation.CancelSpotOrderAsync))
+        public CancelSpotOrderSocketOptions(string exchange, bool authenticated) : base(exchange, authenticated, nameof(ICancelSpotOrderSocket.CancelSpotOrderAsync))
         {
         }
 
         /// <inheritdoc />
-        public override Error? ValidateRequest(CancelOrderRequest request, ICancelSpotOrderOperation client)
+        public override Error? ValidateRequest(CancelOrderRequest request, ICancelSpotOrderSocket client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/PlaceFuturesOrderSocketOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/PlaceFuturesOrderSocketOptions.cs
index 7d860cd5..5483112e 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/PlaceFuturesOrderSocketOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/PlaceFuturesOrderSocketOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for placing a new futures order
     /// </summary>
-    public class PlaceFuturesOrderSocketOptions : CapabilityOptions<PlaceFuturesOrderRequest, IPlaceFuturesOrderOperation>
+    public class PlaceFuturesOrderSocketOptions : CapabilityOptions<PlaceFuturesOrderRequest, IPlaceFuturesOrderSocket>
     {
         /// <inheritdoc />
         public override string Description => "Place a new futures order over a socket connection";
@@ -20,7 +20,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public PlaceFuturesOrderSocketOptions(string exchange, bool supportsTpSl) : base(exchange, true, nameof(IPlaceFuturesOrderOperation.PlaceFuturesOrderAsync))
+        public PlaceFuturesOrderSocketOptions(string exchange, bool supportsTpSl) : base(exchange, true, nameof(IPlaceFuturesOrderSocket.PlaceFuturesOrderAsync))
         {
             SupportsTpSl = supportsTpSl;
         }
@@ -30,7 +30,7 @@ namespace CryptoExchange.Net.SharedApis
         /// </summary>
         public override Error? ValidateRequest(
             PlaceFuturesOrderRequest request,
-            IPlaceFuturesOrderOperation client
+            IPlaceFuturesOrderSocket client
             )
         {
             if (!SupportsTpSl && (request.StopLossPrice != null || request.TakeProfitPrice != null))
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/PlaceSpotOrderSocketOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/PlaceSpotOrderSocketOptions.cs
index bb36196d..d0c4ef40 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/PlaceSpotOrderSocketOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/PlaceSpotOrderSocketOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for placing a new spot order
     /// </summary>
-    public class PlaceSpotOrderSocketOptions : CapabilityOptions<PlaceSpotOrderRequest, IPlaceSpotOrderOperation>
+    public class PlaceSpotOrderSocketOptions : CapabilityOptions<PlaceSpotOrderRequest, IPlaceSpotOrderSocket>
     {
         /// <inheritdoc />
         public override string Description => "Place a new spot order over a socket connection";
@@ -16,7 +16,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public PlaceSpotOrderSocketOptions(string exchange) : base(exchange, true, nameof(IPlaceSpotOrderOperation.PlaceSpotOrderAsync))
+        public PlaceSpotOrderSocketOptions(string exchange) : base(exchange, true, nameof(IPlaceSpotOrderSocket.PlaceSpotOrderAsync))
         {
         }
 
@@ -25,7 +25,7 @@ namespace CryptoExchange.Net.SharedApis
         /// </summary>
         public override Error? ValidateRequest(
             PlaceSpotOrderRequest request,
-            IPlaceSpotOrderOperation client)
+            IPlaceSpotOrderSocket client)
         {
             if (request.Symbol!.TradingMode != TradingMode.Spot)
                 return ArgumentError.Invalid("TradingMode", $"TradingMode.{request.Symbol!.TradingMode} is not supported, should be Spot");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeBalanceOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeBalanceOptions.cs
index eddc90bc..4dc5818c 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeBalanceOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeBalanceOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to balance updates
     /// </summary>
-    public class SubscribeBalanceOptions : CapabilityOptions<SubscribeBalancesRequest, ISubscribeBalancesOperation>
+    public class SubscribeBalanceOptions : CapabilityOptions<SubscribeBalancesRequest, ISubscribeBalancesSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to balance updates";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeBalanceOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeBalancesOperation.SubscribeToBalanceUpdatesAsync))
+        public SubscribeBalanceOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeBalancesSocket.SubscribeToBalanceUpdatesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeBookTickerOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeBookTickerOptions.cs
index 625d3ce1..82e11dbe 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeBookTickerOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeBookTickerOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to book ticker updates
     /// </summary>
-    public class SubscribeBookTickerOptions : CapabilityOptions<SubscribeBookTickerRequest, ISubscribeBookTickerOperation>
+    public class SubscribeBookTickerOptions : CapabilityOptions<SubscribeBookTickerRequest, ISubscribeBookTickerSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to best bid and ask price updates";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeBookTickerOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeBookTickerOperation.SubscribeToBookTickerUpdatesAsync))
+        public SubscribeBookTickerOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeBookTickerSocket.SubscribeToBookTickerUpdatesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeFuturesOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeFuturesOrderOptions.cs
index 5889971d..0006a915 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeFuturesOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeFuturesOrderOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to order updates
     /// </summary>
-    public class SubscribeFuturesOrderOptions : CapabilityOptions<SubscribeFuturesOrderRequest, ISubscribeFuturesOrdersOperation>
+    public class SubscribeFuturesOrderOptions : CapabilityOptions<SubscribeFuturesOrderRequest, ISubscribeFuturesOrdersSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to futures order updates";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeFuturesOrderOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeFuturesOrdersOperation.SubscribeToFuturesOrderUpdatesAsync))
+        public SubscribeFuturesOrderOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeFuturesOrdersSocket.SubscribeToFuturesOrderUpdatesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeIncrementalOrderBookOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeIncrementalOrderBookOptions.cs
index 2b10ada4..6046852d 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeIncrementalOrderBookOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeIncrementalOrderBookOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to order book snapshot updates
     /// </summary>
-    public class SubscribeIncrementalOrderBookOptions : CapabilityOptions<SubscribeOrderBookRequest, ISubscribeIncrementalOrderBookOperation>
+    public class SubscribeIncrementalOrderBookOptions : CapabilityOptions<SubscribeOrderBookRequest, ISubscribeIncrementalOrderBookSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to incremental order book updates for a symbol";
@@ -26,7 +26,7 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public SubscribeIncrementalOrderBookOptions(string exchange, bool needsAuthentication, int[] limits, SharedOrderBookSubscriptionType updateType)
-            : base(exchange, needsAuthentication, nameof(ISubscribeIncrementalOrderBookOperation.SubscribeToOrderBookUpdatesAsync))
+            : base(exchange, needsAuthentication, nameof(ISubscribeIncrementalOrderBookSocket.SubscribeToOrderBookUpdatesAsync))
         {
             SupportedLimits = limits;
             UpdateType = updateType;
@@ -35,7 +35,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Validate a request
         /// </summary>
-        public override Error? ValidateRequest(SubscribeOrderBookRequest request, ISubscribeIncrementalOrderBookOperation client)
+        public override Error? ValidateRequest(SubscribeOrderBookRequest request, ISubscribeIncrementalOrderBookSocket client)
         {
             if (request.Limit != null && !SupportedLimits.Contains(request.Limit.Value))
                 return ArgumentError.Invalid(nameof(SubscribeOrderBookRequest.Limit), "Limit not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeKlineOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeKlineOptions.cs
index d768bdd0..b662dc37 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeKlineOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeKlineOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to kline/candlestick updates
     /// </summary>
-    public class SubscribeKlineOptions : CapabilityOptions<SubscribeKlineRequest, ISubscribeKlinesOperation>
+    public class SubscribeKlineOptions : CapabilityOptions<SubscribeKlineRequest, ISubscribeKlinesSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to candlestick updates for a symbol";
@@ -20,7 +20,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeKlineOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeKlinesOperation.SubscribeToKlineUpdatesAsync))
+        public SubscribeKlineOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeKlinesSocket.SubscribeToKlineUpdatesAsync))
         {
             SupportIntervals = new[]
             {
@@ -45,7 +45,7 @@ namespace CryptoExchange.Net.SharedApis
         /// ctor
         /// </summary>
         public SubscribeKlineOptions(string exchange, bool needsAuthentication, params SharedKlineInterval[] intervals) 
-            : base(exchange, needsAuthentication, nameof(ISubscribeKlinesOperation.SubscribeToKlineUpdatesAsync))
+            : base(exchange, needsAuthentication, nameof(ISubscribeKlinesSocket.SubscribeToKlineUpdatesAsync))
         {
             SupportIntervals = intervals;
         }
@@ -60,7 +60,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Validate a request
         /// </summary>
-        public override Error? ValidateRequest(SubscribeKlineRequest request, ISubscribeKlinesOperation client)
+        public override Error? ValidateRequest(SubscribeKlineRequest request, ISubscribeKlinesSocket client)
         {
             if (!IsSupported(request.Interval))
                 return ArgumentError.Invalid(nameof(SubscribeKlineRequest.Interval), "Interval not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeOrderBookOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeOrderBookOptions.cs
index dc38fcb4..2a55f349 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeOrderBookOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeOrderBookOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to order book snapshot updates
     /// </summary>
-    public class SubscribeOrderBookOptions : CapabilityOptions<SubscribeOrderBookRequest, ISubscribeOrderBookOperation>
+    public class SubscribeOrderBookOptions : CapabilityOptions<SubscribeOrderBookRequest, ISubscribeOrderBookSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to order book updates for a symbol";
@@ -20,7 +20,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeOrderBookOptions(string exchange, bool needsAuthentication, int[] limits) : base(exchange, needsAuthentication, nameof(ISubscribeOrderBookOperation.SubscribeToOrderBookUpdatesAsync))
+        public SubscribeOrderBookOptions(string exchange, bool needsAuthentication, int[] limits) : base(exchange, needsAuthentication, nameof(ISubscribeOrderBookSocket.SubscribeToOrderBookUpdatesAsync))
         {
             SupportedLimits = limits;
         }
@@ -28,7 +28,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// Validate a request
         /// </summary>
-        public override Error? ValidateRequest(SubscribeOrderBookRequest request, ISubscribeOrderBookOperation client)
+        public override Error? ValidateRequest(SubscribeOrderBookRequest request, ISubscribeOrderBookSocket client)
         {
             if (request.Limit != null && !SupportedLimits.Contains(request.Limit.Value))
                 return ArgumentError.Invalid(nameof(SubscribeOrderBookRequest.Limit), "Limit not supported");
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribePositionOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribePositionOptions.cs
index 55a0284e..55bd75a0 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribePositionOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribePositionOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to position updates
     /// </summary>
-    public class SubscribePositionOptions : CapabilityOptions<SubscribePositionRequest, ISubscribePositionsOperation>
+    public class SubscribePositionOptions : CapabilityOptions<SubscribePositionRequest, ISubscribePositionsSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to futures position updates";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribePositionOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribePositionsOperation.SubscribeToPositionUpdatesAsync))
+        public SubscribePositionOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribePositionsSocket.SubscribeToPositionUpdatesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeSpotOrderOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeSpotOrderOptions.cs
index 8ac9f8b6..b81d7aef 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeSpotOrderOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeSpotOrderOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to order updates
     /// </summary>
-    public class SubscribeSpotOrderOptions : CapabilityOptions<SubscribeSpotOrderRequest, ISubscribeSpotOrdersOperation>
+    public class SubscribeSpotOrderOptions : CapabilityOptions<SubscribeSpotOrderRequest, ISubscribeSpotOrdersSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to spot order updates";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeSpotOrderOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeSpotOrdersOperation.SubscribeToSpotOrderUpdatesAsync))
+        public SubscribeSpotOrderOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeSpotOrdersSocket.SubscribeToSpotOrderUpdatesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTickerOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTickerOptions.cs
index 77bbf56b..92a6232e 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTickerOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTickerOptions.cs
@@ -3,7 +3,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to ticker updates
     /// </summary>
-    public class SubscribeTickerOptions : CapabilityOptions<SubscribeTickerRequest, ISubscribeTickerOperation>
+    public class SubscribeTickerOptions : CapabilityOptions<SubscribeTickerRequest, ISubscribeTickerSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to price ticker updates for a symbol";
@@ -16,7 +16,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeTickerOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(ISubscribeTickerOperation.SubscribeToTickerUpdatesAsync))
+        public SubscribeTickerOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(ISubscribeTickerSocket.SubscribeToTickerUpdatesAsync))
         {
             TickerType = tickerCalcType ?? SharedTickerType.Day24H;
         }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTickersOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTickersOptions.cs
index c7fce342..9973c039 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTickersOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTickersOptions.cs
@@ -3,7 +3,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to ticker updates
     /// </summary>
-    public class SubscribeTickersOptions : CapabilityOptions<SubscribeAllTickersRequest, ISubscribeAllTickersOperation>
+    public class SubscribeTickersOptions : CapabilityOptions<SubscribeAllTickersRequest, ISubscribeAllTickersSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to price ticker updates for all symbols";
@@ -16,7 +16,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeTickersOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(ISubscribeAllTickersOperation.SubscribeToAllTickersUpdatesAsync))
+        public SubscribeTickersOptions(string exchange, SharedTickerType? tickerCalcType = null) : base(exchange, false, nameof(ISubscribeAllTickersSocket.SubscribeToAllTickersUpdatesAsync))
         {
             TickerType = tickerCalcType ?? SharedTickerType.Day24H;
         }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTradeOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTradeOptions.cs
index 1cef9c17..27bed500 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTradeOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeTradeOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to trade updates
     /// </summary>
-    public class SubscribeTradeOptions : CapabilityOptions<SubscribeTradeRequest, ISubscribeTradesOperation>
+    public class SubscribeTradeOptions : CapabilityOptions<SubscribeTradeRequest, ISubscribeTradesSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to public trade updates for a symbol";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeTradeOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeTradesOperation.SubscribeToTradeUpdatesAsync))
+        public SubscribeTradeOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeTradesSocket.SubscribeToTradeUpdatesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeUserTradeOptions.cs b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeUserTradeOptions.cs
index 427b0fa8..225d1ab2 100644
--- a/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeUserTradeOptions.cs
+++ b/CryptoExchange.Net/SharedApis/Models/Options/Operations/SubscribeUserTradeOptions.cs
@@ -7,7 +7,7 @@ namespace CryptoExchange.Net.SharedApis
     /// <summary>
     /// Options for subscribing to user trade updates
     /// </summary>
-    public class SubscribeUserTradeOptions : CapabilityOptions<SubscribeUserTradeRequest, ISubscribeUserTradesOperation>
+    public class SubscribeUserTradeOptions : CapabilityOptions<SubscribeUserTradeRequest, ISubscribeUserTradesSocket>
     {
         /// <inheritdoc />
         public override string Description => "Subscribe to user trade updates";
@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.SharedApis
         /// <summary>
         /// ctor
         /// </summary>
-        public SubscribeUserTradeOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeUserTradesOperation.SubscribeToUserTradeUpdatesAsync))
+        public SubscribeUserTradeOptions(string exchange, bool needsAuthentication) : base(exchange, needsAuthentication, nameof(ISubscribeUserTradesSocket.SubscribeToUserTradeUpdatesAsync))
         {
         }
     }
diff --git a/CryptoExchange.Net/SharedApis/SharedApiBase.cs b/CryptoExchange.Net/SharedApis/SharedApiBase.cs
index 9b7d9b00..059a65ff 100644
--- a/CryptoExchange.Net/SharedApis/SharedApiBase.cs
+++ b/CryptoExchange.Net/SharedApis/SharedApiBase.cs
@@ -19,6 +19,9 @@ namespace CryptoExchange.Net.SharedApis
         /// <inheritdoc />
         public string Exchange { get; }
 
+        /// <inheritdoc />
+        public SharedTransport Transport { get; }
+
         /// <inheritdoc />
         public TradingMode[] SupportedTradingModes { get; }
 
@@ -29,11 +32,13 @@ namespace CryptoExchange.Net.SharedApis
         /// Shared API base client
         /// </summary>
         public SharedApiBase(
+            SharedTransport transport,
             string exchange,
             TradingMode[] supportedTradingModes,
             Func<bool> authenticated,
             Func<string, string, TradingMode, DateTime?, string> formatSymbol)
         {
+            Transport = transport;
             Exchange = exchange;
             SupportedTradingModes = supportedTradingModes;
             _authDelegate = authenticated;
diff --git a/CryptoExchange.Net/Testing/TestHelpers.cs b/CryptoExchange.Net/Testing/TestHelpers.cs
index 5d80504c..457c19ca 100644
--- a/CryptoExchange.Net/Testing/TestHelpers.cs
+++ b/CryptoExchange.Net/Testing/TestHelpers.cs
@@ -200,8 +200,8 @@ namespace CryptoExchange.Net.Testing
                 .Where(x =>
                     x != typeof(T)
                     && x != typeof(ISharedApiCapability)
-                    && x != typeof(ISharedApiEndpoint)
-                    && x != typeof(ISharedSocketOperation)
+                    && x != typeof(ISharedRest)
+                    && x != typeof(ISharedSocket)
                     && x != typeof(ISharedSubscription)
                     && typeof(ISharedApiCapability).IsAssignableFrom(x))
                 .ToArray();
diff --git a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/BalanceTracker.cs b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/BalanceTracker.cs
index f912906a..43242231 100644
--- a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/BalanceTracker.cs
+++ b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/BalanceTracker.cs
@@ -12,8 +12,8 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
     /// </summary>
     public class BalanceTracker : UserDataItemTracker<SharedBalance>
     {
-        private readonly IGetBalancesEndpoint _restClient;
-        private readonly ISubscribeBalancesOperation? _socketClient;
+        private readonly IGetBalancesRest _restClient;
+        private readonly ISubscribeBalancesSocket? _socketClient;
         private readonly ExchangeParameters? _exchangeParameters;
         private readonly SharedAccountType _accountType;
 
@@ -23,8 +23,8 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
         public BalanceTracker(
             ILogger logger,
             UserDataSymbolTracker symbolTracker,
-            IGetBalancesEndpoint restClient,
-            ISubscribeBalancesOperation? socketClient,
+            IGetBalancesRest restClient,
+            ISubscribeBalancesSocket? socketClient,
             SharedAccountType accountType,
             TrackerItemConfig config,
             ExchangeParameters? exchangeParameters = null
diff --git a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/FuturesOrderTracker.cs b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/FuturesOrderTracker.cs
index 92da259e..e1e3025c 100644
--- a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/FuturesOrderTracker.cs
+++ b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/FuturesOrderTracker.cs
@@ -15,9 +15,9 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
     /// </summary>
     public class FuturesOrderTracker : UserDataItemTracker<SharedFuturesOrder>
     {
-        private readonly IGetOpenFuturesOrdersEndpoint _openOrdersClient;
-        private readonly IGetClosedFuturesOrdersEndpoint _closedOrdersClient;
-        private readonly ISubscribeFuturesOrdersOperation? _socketClient;
+        private readonly IGetOpenFuturesOrdersRest _openOrdersClient;
+        private readonly IGetClosedFuturesOrdersRest _closedOrdersClient;
+        private readonly ISubscribeFuturesOrdersSocket? _socketClient;
         private readonly ExchangeParameters? _exchangeParameters;
         private readonly bool _requiresSymbolParameterOpenOrders;
         private readonly bool _timeFilterSupportedClosedOrders;
@@ -32,9 +32,9 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
         public FuturesOrderTracker(
             ILogger logger,
             UserDataSymbolTracker symbolTracker,
-            IGetOpenFuturesOrdersEndpoint openRestClient,
-            IGetClosedFuturesOrdersEndpoint closedRestClient,
-            ISubscribeFuturesOrdersOperation? socketClient,
+            IGetOpenFuturesOrdersRest openRestClient,
+            IGetClosedFuturesOrdersRest closedRestClient,
+            ISubscribeFuturesOrdersSocket? socketClient,
             TrackerItemConfig config,
             IEnumerable<SharedSymbol> symbols,
             bool onlyTrackProvidedSymbols,
diff --git a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/FuturesUserTradeTracker.cs b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/FuturesUserTradeTracker.cs
index bfe0bdf1..e657ee42 100644
--- a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/FuturesUserTradeTracker.cs
+++ b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/FuturesUserTradeTracker.cs
@@ -15,8 +15,8 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
     /// </summary>
     public class FuturesUserTradeTracker : UserDataItemTracker<SharedUserTrade>
     {
-        private readonly IGetFuturesUserTradeHistoryEndpoint _restClient;
-        private readonly ISubscribeUserTradesOperation? _socketClient;
+        private readonly IGetFuturesUserTradeHistoryRest _restClient;
+        private readonly ISubscribeUserTradesSocket? _socketClient;
         private readonly ExchangeParameters? _exchangeParameters;
         private readonly TimeSpan _pollOverlapPeriod = TimeSpan.FromSeconds(3);
 
@@ -28,8 +28,8 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
         public FuturesUserTradeTracker(
             ILogger logger,
             UserDataSymbolTracker symbolTracker,
-            IGetFuturesUserTradeHistoryEndpoint restClient,
-            ISubscribeUserTradesOperation? socketClient,
+            IGetFuturesUserTradeHistoryRest restClient,
+            ISubscribeUserTradesSocket? socketClient,
             TrackerItemConfig config,
             IEnumerable<SharedSymbol> symbols,
             bool onlyTrackProvidedSymbols,
diff --git a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/PositionTracker.cs b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/PositionTracker.cs
index 2ed55b4b..5bcac4d0 100644
--- a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/PositionTracker.cs
+++ b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/PositionTracker.cs
@@ -15,8 +15,8 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
     /// </summary>
     public class PositionTracker : UserDataItemTracker<SharedPosition>
     {
-        private readonly IGetPositionsEndpoint _restClient;
-        private readonly ISubscribePositionsOperation? _socketClient;
+        private readonly IGetPositionsRest _restClient;
+        private readonly ISubscribePositionsSocket? _socketClient;
         private readonly ExchangeParameters? _exchangeParameters;
 
         /// <summary>
@@ -30,8 +30,8 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
         public PositionTracker(
             ILogger logger,
             UserDataSymbolTracker symbolTracker,
-            IGetPositionsEndpoint restClient,
-            ISubscribePositionsOperation? socketClient,
+            IGetPositionsRest restClient,
+            ISubscribePositionsSocket? socketClient,
             TrackerItemConfig config,
             IEnumerable<SharedSymbol> symbols,
             bool onlyTrackProvidedSymbols,
diff --git a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/SpotOrderTracker.cs b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/SpotOrderTracker.cs
index ff5aefb8..4a98df30 100644
--- a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/SpotOrderTracker.cs
+++ b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/SpotOrderTracker.cs
@@ -15,9 +15,9 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
     /// </summary>
     public class SpotOrderTracker : UserDataItemTracker<SharedSpotOrder>
     {
-        private readonly IGetOpenSpotOrdersEndpoint _openOrderClient;
-        private readonly IGetClosedSpotOrdersEndpoint _closedOrderClient;
-        private readonly ISubscribeSpotOrdersOperation? _socketClient;
+        private readonly IGetOpenSpotOrdersRest _openOrderClient;
+        private readonly IGetClosedSpotOrdersRest _closedOrderClient;
+        private readonly ISubscribeSpotOrdersSocket? _socketClient;
         private readonly ExchangeParameters? _exchangeParameters;
         private readonly bool _requiresSymbolParameterOpenOrders;
         private readonly bool _timeFilterSupportedClosedOrders;
@@ -32,9 +32,9 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
         public SpotOrderTracker(
             ILogger logger,
             UserDataSymbolTracker symbolTracker,
-            IGetOpenSpotOrdersEndpoint openOrderClient,
-            IGetClosedSpotOrdersEndpoint closedOrderClient,
-            ISubscribeSpotOrdersOperation? socketClient,
+            IGetOpenSpotOrdersRest openOrderClient,
+            IGetClosedSpotOrdersRest closedOrderClient,
+            ISubscribeSpotOrdersSocket? socketClient,
             TrackerItemConfig config,
             IEnumerable<SharedSymbol> symbols,
             bool onlyTrackProvidedSymbols,
diff --git a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/SpotUserTradeTracker.cs b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/SpotUserTradeTracker.cs
index 9dc60273..b830aa60 100644
--- a/CryptoExchange.Net/Trackers/UserData/ItemTrackers/SpotUserTradeTracker.cs
+++ b/CryptoExchange.Net/Trackers/UserData/ItemTrackers/SpotUserTradeTracker.cs
@@ -15,8 +15,8 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
     /// </summary>
     public class SpotUserTradeTracker : UserDataItemTracker<SharedUserTrade>
     {
-        private readonly IGetSpotUserTradeHistoryEndpoint _restClient;
-        private readonly ISubscribeUserTradesOperation? _socketClient;
+        private readonly IGetSpotUserTradeHistoryRest _restClient;
+        private readonly ISubscribeUserTradesSocket? _socketClient;
         private readonly ExchangeParameters? _exchangeParameters;
         private readonly TimeSpan _pollOverlapPeriod = TimeSpan.FromSeconds(3);
 
@@ -28,8 +28,8 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
         public SpotUserTradeTracker(
             ILogger logger,
             UserDataSymbolTracker symbolTracker,
-            IGetSpotUserTradeHistoryEndpoint restClient,
-            ISubscribeUserTradesOperation? socketClient,
+            IGetSpotUserTradeHistoryRest restClient,
+            ISubscribeUserTradesSocket? socketClient,
             TrackerItemConfig config,
             IEnumerable<SharedSymbol> symbols,
             bool onlyTrackProvidedSymbols,
diff --git a/CryptoExchange.Net/Trackers/UserData/UserFuturesDataTracker.cs b/CryptoExchange.Net/Trackers/UserData/UserFuturesDataTracker.cs
index 7075c073..614e0f7e 100644
--- a/CryptoExchange.Net/Trackers/UserData/UserFuturesDataTracker.cs
+++ b/CryptoExchange.Net/Trackers/UserData/UserFuturesDataTracker.cs
@@ -18,7 +18,7 @@ namespace CryptoExchange.Net.Trackers.UserData
     /// </summary>
     public abstract class UserFuturesDataTracker : UserDataTracker, IUserFuturesDataTracker
     {
-        private readonly IGetFuturesSymbolsEndpoint _symbolClient;
+        private readonly IGetFuturesSymbolsRest _symbolClient;
         private readonly ExchangeParameters? _exchangeParameters;
         private readonly TradingMode _tradingMode;
 
@@ -51,20 +51,20 @@ namespace CryptoExchange.Net.Trackers.UserData
         /// </summary>
         public UserFuturesDataTracker(
             ILogger logger,
-            IGetFuturesSymbolsEndpoint symbolRestClient,
+            IGetFuturesSymbolsRest symbolRestClient,
 
-            IGetBalancesEndpoint balanceRestClient,
-            ISubscribeBalancesOperation? balanceSocketClient,
+            IGetBalancesRest balanceRestClient,
+            ISubscribeBalancesSocket? balanceSocketClient,
 
-            IGetOpenFuturesOrdersEndpoint openOrderRestClient,
-            IGetClosedFuturesOrdersEndpoint closedOrderRestClient,
-            ISubscribeFuturesOrdersOperation? subscribeFuturesOrdersOperation,
+            IGetOpenFuturesOrdersRest openOrderRestClient,
+            IGetClosedFuturesOrdersRest closedOrderRestClient,
+            ISubscribeFuturesOrdersSocket? subscribeFuturesOrdersOperation,
 
-            IGetFuturesUserTradeHistoryEndpoint getFuturesUserTradeHistoryRestClient,
-            ISubscribeUserTradesOperation? userTradeSocketClient,
+            IGetFuturesUserTradeHistoryRest getFuturesUserTradeHistoryRestClient,
+            ISubscribeUserTradesSocket? userTradeSocketClient,
 
-            IGetPositionsEndpoint positionRestClient,
-            ISubscribePositionsOperation? positionSocketClient,
+            IGetPositionsRest positionRestClient,
+            ISubscribePositionsSocket? positionSocketClient,
 
             string? userIdentifier,
             FuturesUserDataTrackerConfig config,
diff --git a/CryptoExchange.Net/Trackers/UserData/UserSpotDataTracker.cs b/CryptoExchange.Net/Trackers/UserData/UserSpotDataTracker.cs
index b1b6ad87..4cd9fc87 100644
--- a/CryptoExchange.Net/Trackers/UserData/UserSpotDataTracker.cs
+++ b/CryptoExchange.Net/Trackers/UserData/UserSpotDataTracker.cs
@@ -17,7 +17,7 @@ namespace CryptoExchange.Net.Trackers.UserData
     /// </summary>
     public class UserSpotDataTracker : UserDataTracker, IUserSpotDataTracker
     {
-        private readonly IGetSpotSymbolsEndpoint _symbolClient;
+        private readonly IGetSpotSymbolsRest _symbolClient;
         private readonly ExchangeParameters? _exchangeParameters;
 
         /// <inheritdoc />
@@ -34,17 +34,17 @@ namespace CryptoExchange.Net.Trackers.UserData
         /// </summary>
         public UserSpotDataTracker(
             ILogger logger,
-            IGetSpotSymbolsEndpoint symbolRestClient,
+            IGetSpotSymbolsRest symbolRestClient,
 
-            IGetBalancesEndpoint balanceRestClient,
-            ISubscribeBalancesOperation? balanceSocketClient,
+            IGetBalancesRest balanceRestClient,
+            ISubscribeBalancesSocket? balanceSocketClient,
 
-            IGetOpenSpotOrdersEndpoint openOrderRestClient,
-            IGetClosedSpotOrdersEndpoint closedOrderRestClient,
-            ISubscribeSpotOrdersOperation? subscribeSpotOrdersOperation,
+            IGetOpenSpotOrdersRest openOrderRestClient,
+            IGetClosedSpotOrdersRest closedOrderRestClient,
+            ISubscribeSpotOrdersSocket? subscribeSpotOrdersOperation,
 
-            IGetSpotUserTradeHistoryEndpoint? getSpotUserTradeHistoryRestClient,
-            ISubscribeUserTradesOperation? userTradeSocketClient,
+            IGetSpotUserTradeHistoryRest? getSpotUserTradeHistoryRestClient,
+            ISubscribeUserTradesSocket? userTradeSocketClient,
 
             string? userIdentifier,
             SpotUserDataTrackerConfig config,