diff --git a/README.md b/README.md
index d43caeb7..9b29797b 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,6 @@ cmake --build .
 
 ## Constants
 [`include/ccapi_cpp/ccapi_macro.h`](include/ccapi_cpp/ccapi_macro.h)
-* For most cryptocurrencies, the default value of `CCAPI_DECIMAL_SCALE` is sufficient. You can override it if you need more.
 
 ## Examples
 [C++](example)
diff --git a/include/ccapi_cpp/service/ccapi_execution_management_service_gateio_base.h b/include/ccapi_cpp/service/ccapi_execution_management_service_gateio_base.h
index 29288f3e..20b66f52 100644
--- a/include/ccapi_cpp/service/ccapi_execution_management_service_gateio_base.h
+++ b/include/ccapi_cpp/service/ccapi_execution_management_service_gateio_base.h
@@ -119,7 +119,7 @@ class ExecutionManagementServiceGateioBase : public ExecutionManagementService {
     this->substituteParam(target, param,
                           {
                               {"settle", "{settle}"},
-                              {CCAPI_MARGIN_ASSET, "{settle}"},
+                              {CCAPI_SETTLE_ASSET, "{settle}"},
                           });
     std::string settle;
     if (UtilString::endsWith(symbolId, "_USD")) {
diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_bitmex.h b/include/ccapi_cpp/service/ccapi_market_data_service_bitmex.h
index 35aca7ff..8da92187 100644
--- a/include/ccapi_cpp/service/ccapi_market_data_service_bitmex.h
+++ b/include/ccapi_cpp/service/ccapi_market_data_service_bitmex.h
@@ -274,7 +274,7 @@ class MarketDataServiceBitmex : public MarketDataService {
   }
 
   void extractInstrumentInfo(Element& element, const rj::Value& x) {
-    element.insert(CCAPI_MARGIN_ASSET, x["settlCurrency"].GetString());
+    element.insert(CCAPI_SETTLE_ASSET, x["settlCurrency"].GetString());
     element.insert(CCAPI_UNDERLYING_SYMBOL, x["referenceSymbol"].GetString());
     element.insert(CCAPI_ORDER_PRICE_INCREMENT, x["tickSize"].GetString());
     element.insert(CCAPI_ORDER_QUANTITY_INCREMENT, x["lotSize"].GetString());
diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_bybit.h b/include/ccapi_cpp/service/ccapi_market_data_service_bybit.h
index aa66a8ac..2b8950fc 100644
--- a/include/ccapi_cpp/service/ccapi_market_data_service_bybit.h
+++ b/include/ccapi_cpp/service/ccapi_market_data_service_bybit.h
@@ -340,7 +340,7 @@ class MarketDataServiceBybit : public MarketDataService {
     element.insert(CCAPI_QUOTE_ASSET, x["quoteCoin"].GetString());
     auto it = x.FindMember("settleCoin");
     if (it != x.MemberEnd()) {
-      element.insert(CCAPI_MARGIN_ASSET, it->value.GetString());
+      element.insert(CCAPI_SETTLE_ASSET, it->value.GetString());
     }
     element.insert(CCAPI_ORDER_PRICE_INCREMENT, x["priceFilter"]["tickSize"].GetString());
     if (category == "spot") {
diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_deribit.h b/include/ccapi_cpp/service/ccapi_market_data_service_deribit.h
index 97f32f7f..afa8ed01 100644
--- a/include/ccapi_cpp/service/ccapi_market_data_service_deribit.h
+++ b/include/ccapi_cpp/service/ccapi_market_data_service_deribit.h
@@ -417,7 +417,7 @@ class MarketDataServiceDeribit : public MarketDataService {
 
   void extractInstrumentInfo(Element& element, const rj::Value& x) {
     element.insert(CCAPI_INSTRUMENT, x["instrument_name"].GetString());
-    element.insert(CCAPI_MARGIN_ASSET, x["base_currency"].GetString());
+    element.insert(CCAPI_SETTLE_ASSET, x["base_currency"].GetString());
     element.insert(CCAPI_UNDERLYING_SYMBOL, x["base_currency"].GetString());
     element.insert(CCAPI_ORDER_PRICE_INCREMENT, x["tick_size"].GetString());
     element.insert(CCAPI_ORDER_QUANTITY_INCREMENT, x["contract_size"].GetString());
diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_gateio_perpetual_futures.h b/include/ccapi_cpp/service/ccapi_market_data_service_gateio_perpetual_futures.h
index 6cf6b6a1..eeee64f5 100644
--- a/include/ccapi_cpp/service/ccapi_market_data_service_gateio_perpetual_futures.h
+++ b/include/ccapi_cpp/service/ccapi_market_data_service_gateio_perpetual_futures.h
@@ -48,7 +48,7 @@ class MarketDataServiceGateioPerpetualFutures : public MarketDataServiceGateioBa
     this->substituteParam(target, param,
                           {
                               {"settle", "{settle}"},
-                              {CCAPI_MARGIN_ASSET, "{settle}"},
+                              {CCAPI_SETTLE_ASSET, "{settle}"},
                           });
     std::string settle;
     if (UtilString::endsWith(symbolId, "_USD")) {
@@ -99,7 +99,7 @@ class MarketDataServiceGateioPerpetualFutures : public MarketDataServiceGateioBa
         this->substituteParam(target, param,
                               {
                                   {"settle", "{settle}"},
-                                  {CCAPI_MARGIN_ASSET, "{settle}"},
+                                  {CCAPI_SETTLE_ASSET, "{settle}"},
                               });
         req.target(target);
       } break;
diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_mexc_futures.h b/include/ccapi_cpp/service/ccapi_market_data_service_mexc_futures.h
index 171bfd8e..cb5c4c4a 100644
--- a/include/ccapi_cpp/service/ccapi_market_data_service_mexc_futures.h
+++ b/include/ccapi_cpp/service/ccapi_market_data_service_mexc_futures.h
@@ -200,7 +200,7 @@ class MarketDataServiceMexcFutures : public MarketDataService {
 
   void extractInstrumentInfo(Element& element, const rj::Value& x) {
     element.insert(CCAPI_INSTRUMENT, x["symbol"].GetString());
-    element.insert(CCAPI_MARGIN_ASSET, x["settleCoin"].GetString());
+    element.insert(CCAPI_SETTLE_ASSET, x["settleCoin"].GetString());
     element.insert(CCAPI_ORDER_PRICE_INCREMENT, x["priceUnit"].GetString());
     element.insert(CCAPI_ORDER_QUANTITY_INCREMENT, x["volUnit"].GetString());
     element.insert(CCAPI_ORDER_QUANTITY_MIN, x["minVol"].GetString());
diff --git a/include/ccapi_cpp/service/ccapi_market_data_service_okx.h b/include/ccapi_cpp/service/ccapi_market_data_service_okx.h
index 9c1a4a7b..5c6f7cbd 100644
--- a/include/ccapi_cpp/service/ccapi_market_data_service_okx.h
+++ b/include/ccapi_cpp/service/ccapi_market_data_service_okx.h
@@ -419,7 +419,7 @@ class MarketDataServiceOkx : public MarketDataService {
     element.insert(CCAPI_ORDER_PRICE_INCREMENT, x["tickSz"].GetString());
     element.insert(CCAPI_ORDER_QUANTITY_INCREMENT, x["lotSz"].GetString());
     element.insert(CCAPI_ORDER_QUANTITY_MIN, x["minSz"].GetString());
-    element.insert(CCAPI_MARGIN_ASSET, x["settleCcy"].GetString());
+    element.insert(CCAPI_SETTLE_ASSET, x["settleCcy"].GetString());
     element.insert(CCAPI_UNDERLYING_SYMBOL, x["uly"].GetString());
     element.insert(CCAPI_CONTRACT_SIZE, x["ctVal"].GetString());
     element.insert(CCAPI_CONTRACT_MULTIPLIER, x["ctMult"].GetString());