diff --git a/api.yaml b/api.yaml
index 05d895f..d9b0b41 100644
--- a/api.yaml
+++ b/api.yaml
@@ -8828,7 +8828,7 @@ paths:
   /api/v1/marketdata/cryptocompare/historical/prices:
     get:
       tags:
-        - CryptoCompare
+        - Market Data
       summary: Get historical prices
       description: Get a list of historical prices in a specified time range. Using this endpoint requires an access token with the appropriate enterprise ID.
       operationId: marketdata.cryptocompare.historical.prices.get
@@ -8856,7 +8856,7 @@ paths:
   /api/v1/marketdata/cryptocompare/spot/prices:
     get:
       tags:
-        - CryptoCompare
+        - Market Data
       summary: Get spot prices
       description: Get historical spot prices from a specific time. Using this endpoint requires an access token with the appropriate enterprise ID.
       operationId: marketdata.cryptocompare.spot.prices.get
@@ -21630,7 +21630,7 @@ paths:
       description: Get the current user’s public information.
       operationId: trade.user.current
       tags:
-        - Trade REST API
+        - Accounts
       responses:
         '200':
           description: A user
@@ -21650,7 +21650,7 @@ paths:
       description: Get the list of trading accounts that the current user belongs to.
       operationId: trade.accounts
       tags:
-        - Trade REST API
+        - Accounts
       responses:
         '200':
           description: An array of accounts
@@ -21675,7 +21675,7 @@ paths:
       description: Get balance information about a single trading account.
       operationId: trade.accounts.balances
       tags:
-        - Trade REST API
+        - Accounts
       parameters:
         - name: accountId
           in: path
@@ -21709,7 +21709,7 @@ paths:
       description: Lists all orders from the given trading account.
       operationId: trade.orders.detail
       tags:
-        - Trade REST API
+        - Orders
       parameters:
         - name: accountId
           in: path
@@ -21790,7 +21790,7 @@ paths:
       description: Places a new order. There are several types of orders available - Market, Limit, TWAP and SteadyPace (with or without a limit). Orders can only be placed if your account has a sufficient balance. When an order is placed, funds will be reserved for the amount of the order.
       operationId: trade.orders.add
       tags:
-        - Trade REST API
+        - Orders
       parameters:
         - name: accountId
           in: path
@@ -21825,7 +21825,7 @@ paths:
       description: Get a single order by order id.
       operationId: trade.orders.order
       tags:
-        - Trade REST API
+        - Orders
       parameters:
         - name: accountId
           in: path
@@ -21862,7 +21862,7 @@ paths:
       description: Attempt to cancel an order that was previously placed. The response will return successful if the cancel request is submitted. Use Get Order endpoint or subscribe to the orders websocket to get the order details.
       operationId: trade.orders.order.cancel
       tags:
-        - Trade REST API
+        - Orders
       parameters:
         - name: accountId
           in: path
@@ -21895,7 +21895,7 @@ paths:
       description: Lists trades from the trading account. This will include trades that have not yet settled.
       operationId: trade.trades
       tags:
-        - Trade REST API
+        - Orders
       parameters:
         - name: accountId
           in: path
@@ -21970,7 +21970,7 @@ paths:
       description: Get the details of a single trade by trade id.
       operationId: trade.trades.trade
       tags:
-        - Trade REST API
+        - Orders
       parameters:
         - name: accountId
           in: path
@@ -22007,7 +22007,7 @@ paths:
       description: Gets a list of all available currencies.
       operationId: trade.currencies
       tags:
-        - Trade REST API
+        - Products
       parameters:
         - name: accountId
           in: path
@@ -22041,7 +22041,7 @@ paths:
       description: Gets a list of all available products.
       operationId: trade.products
       tags:
-        - Trade REST API
+        - Products
       parameters:
         - name: accountId
           in: path
@@ -22075,7 +22075,7 @@ paths:
       description: Gets a snapshot of the level1 order book for product
       operationId: trade.products.product.level1
       tags:
-        - Trade REST API
+        - Order Book
       parameters:
         - name: accountId
           in: path
@@ -22112,7 +22112,7 @@ paths:
       description: Gets a snapshot of the order book for product
       operationId: products.product.level2
       tags:
-        - Trade REST API
+        - Order Book
       parameters:
         - name: accountId
           in: path
@@ -22149,7 +22149,7 @@ paths:
       description: Returns the list of currencies that are available for use as collateral.
       operationId: trade.margin.collateral.currencies.list
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22176,7 +22176,7 @@ paths:
       description: Returns the balance of assets deposited as collateral for the specified account.
       operationId: trade.margin.collateral.transferred.list
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22221,7 +22221,7 @@ paths:
       description: Returns the margin risk settings for the specified account.
       operationId: trade.margin.risksettings.get
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22267,7 +22267,7 @@ paths:
       description: Returns the net open positions for the specified account.
       operationId: trade.margin.netopenpositions.get
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22301,7 +22301,7 @@ paths:
       description: Returns the asset-specific net open position limits for the specified account.
       operationId: trade.margin.netopenpositionlimits.get
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22327,7 +22327,7 @@ paths:
       description: Runs margin calculations and returns the margin risk profile for the specified account.
       operationId: trade.margin.riskprofile.get
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22399,7 +22399,7 @@ paths:
       description: Transfers collateral for the specified account.
       operationId: trade.margin.collateral.transfer
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22452,7 +22452,7 @@ paths:
       description: Transfers the amount specified to cover margin position for the specified account.
       operationId: trade.margin.positions.transfer
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22505,7 +22505,7 @@ paths:
       description: Transfers the exact amount to cover all short margin positions for the specified account.
       operationId: trade.margin.positions.cover
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path
@@ -22571,7 +22571,7 @@ paths:
       description: Starts an asynchronous process to automatically close all positions by selling and buying assets to attempt to net them to zero.
       operationId: trade.margin.positions.close
       tags:
-        - Trade REST API
+        - Margin
       parameters:
         - name: accountID
           in: path