diff --git a/market/v1/msg.proto b/market/v1/msg.proto
index 70f4ba6..60e75fb 100644
--- a/market/v1/msg.proto
+++ b/market/v1/msg.proto
@@ -19,11 +19,11 @@ enum MarketOrderSide {
 
 enum MarketOrderStatus {
   MO_UNKNOWN_MP_STATUS = 0; // Unknown
-  MO_CREATED = 1;           // Order is just created and awaits confirmation
-  MO_OPEN = 2;              // Order is open and waiting to be completed
-  MO_CANCEL = 3;            // Cancelled by user
-  MO_COMPLETED = 4;         // Order is completed
-  MO_FAILED = 5;            // Order is failed - bad trx , etc.
+  MO_CREATED = 1; // Order is just created and awaits confirmation
+  MO_OPEN = 2; // Order is open and waiting to be completed
+  MO_CANCEL = 3; // Cancelled by user
+  MO_COMPLETED = 4; // Order is completed
+  MO_FAILED = 5; // Order is failed - bad trx , etc.
   MO_REFUNDED = 6; // Order is refunded by platform to user due to regulation
   // MO_EXPIRED = 7; // Order is expired
 }
@@ -34,18 +34,16 @@ message CalcMarketReq {
   int64 counter_asset_id = 3;
   double amount = 4;
   double unit_price = 5;
-  MarketParticipantType type = 6;
-  wallet.v1.BuyAssetSide req_side =
-      7; // For Calculation : can be from asset or irt
+  MarketParticipantType participant_type = 6;
+  wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
 }
 
 message CalcMarketRes {
   double calculated_irt_amount = 1;
   double calculated_asset_amount = 2;
   wallet.v1.EffectiveCommission commission = 3;
-  MarketParticipantType type = 4;
-  wallet.v1.BuyAssetSide req_side =
-      5; // For Calculation : can be from asset or irt
+  MarketParticipantType participant_type = 4;
+  wallet.v1.BuyAssetSide req_side = 5; // For Calculation : can be from asset or irt
 }
 
 message MPHistoryFilter {}
@@ -78,8 +76,7 @@ message MarketOrder {
 }
 
 message MarketAssetListReq {
-  optional auth.v1.InternalIAM iam =
-      1; // If not set, will returns only public orders which are limited by a
+  optional auth.v1.InternalIAM iam = 1; // If not set, will returns only public orders which are limited by a
   optional uint32 page_no = 2;
   optional uint32 page_size = 3;
 }
@@ -95,8 +92,7 @@ message PurchaseReq {
   auth.v1.InternalIAM iam = 1;
   uint64 order_id = 2;
   double amount = 3;
-  wallet.v1.BuyAssetSide req_side =
-      7; // For Calculation : can be from asset or irt
+  wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
   optional bool accepted_contract = 4;
   optional auth.v1.TFA tfa = 5;
 }
@@ -123,12 +119,11 @@ message NewMarketReq {
   double amount = 4;
   double unit_price = 5;
   // TODO: Change name
-  MarketParticipantType type = 6;
+  MarketParticipantType participant_type = 6;
   // For Calculation : can be from asset or irt
   wallet.v1.BuyAssetSide req_side = 7;
   MarketOrderSide side = 8;
   // TODO: maker market order as optional
-
 }
 
 enum MarketOrdersSortBy {
@@ -180,7 +175,7 @@ message DeclineMarketContractReq {
   uint64 agreement_id = 2;
 }
 
-message ConfirmMarketContractReq{
+message ConfirmMarketContractReq {
   auth.v1.InternalIAM iam = 1;
   uint64 agreement_id = 2;
   optional auth.v1.TFA tfa = 3;