diff --git a/proto/src/main/proto/grpc.proto b/proto/src/main/proto/grpc.proto
index 86dd3a46..96437dce 100644
--- a/proto/src/main/proto/grpc.proto
+++ b/proto/src/main/proto/grpc.proto
@@ -888,18 +888,17 @@ message TradeInfo {
 message ContractInfo {
     string buyer_node_address = 1;
     string seller_node_address = 2;
-    reserved 3; // was mediator_node_address
-    reserved 4; // was refund_agent_node_address
-    bool is_buyer_maker_and_seller_taker = 5;
-    string maker_account_id = 6;
-    string taker_account_id = 7;
-    PaymentAccountPayload maker_payment_account_payload = 8;
-    PaymentAccountPayload taker_payment_account_payload = 9;
-    string maker_payout_address_string = 10;
-    string taker_payout_address_string = 11;
-    uint64 lock_time = 12;
-
-    string arbitrator_node_address = 100;
+    string arbitrator_node_address = 3;
+    reserved 4; // was mediator_node_address
+    reserved 5; // was refund_agent_node_address
+    bool is_buyer_maker_and_seller_taker = 6;
+    string maker_account_id = 7;
+    string taker_account_id = 8;
+    PaymentAccountPayload maker_payment_account_payload = 9;
+    PaymentAccountPayload taker_payment_account_payload = 10;
+    string maker_payout_address_string = 11;
+    string taker_payout_address_string = 12;
+    uint64 lock_time = 13;
 }
 
 
diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto
index 7ed1081e..97cb969d 100644
--- a/proto/src/main/proto/pb.proto
+++ b/proto/src/main/proto/pb.proto
@@ -647,10 +647,9 @@ message OfferPayload {
     string hash_of_challenge = 33;
     map<string, string> extra_data = 34;
     int32 protocol_version = 35;
-
-    NodeAddress arbitrator_signer = 1001;
-    bytes arbitrator_signature = 1002;
-    repeated string reserve_tx_key_images = 1003;
+    NodeAddress arbitrator_signer = 36;
+    bytes arbitrator_signature = 37;
+    repeated string reserve_tx_key_images = 38;
 }
 
 enum OfferDirection {
@@ -1248,9 +1247,9 @@ message PersistableEnvelope {
         IgnoredMailboxMap ignored_mailbox_map = 16;
         RemovedPayloadsMap removed_payloads_map = 17;
 
-        XmrAddressEntryList xmr_address_entry_list = 1001;
-        SignedOfferList signed_offer_list = 1002;
-        EncryptedConnectionList encrypted_connection_list = 1003;
+        XmrAddressEntryList xmr_address_entry_list = 18;
+        SignedOfferList signed_offer_list = 19;
+        EncryptedConnectionList encrypted_connection_list = 20;
     }
 }
 
@@ -1407,13 +1406,12 @@ message OpenOffer {
 message Tradable {
     oneof message {
         OpenOffer open_offer = 1;
-        BuyerAsMakerTrade buyer_as_maker_trade = 2;
-        BuyerAsTakerTrade buyer_as_taker_trade = 3;
-        SellerAsMakerTrade seller_as_maker_trade = 4;
-        SellerAsTakerTrade seller_as_taker_trade = 5;
-        ArbitratorTrade arbitrator_trade = 6;
-
-        SignedOffer signed_offer = 1001;
+        SignedOffer signed_offer = 2;
+        BuyerAsMakerTrade buyer_as_maker_trade = 3;
+        BuyerAsTakerTrade buyer_as_taker_trade = 4;
+        SellerAsMakerTrade seller_as_maker_trade = 5;
+        SellerAsTakerTrade seller_as_taker_trade = 6;
+        ArbitratorTrade arbitrator_trade = 7;
     }
 }