diff --git a/core/src/main/java/haveno/core/offer/Offer.java b/core/src/main/java/haveno/core/offer/Offer.java
index efaf9030..e62fa51a 100644
--- a/core/src/main/java/haveno/core/offer/Offer.java
+++ b/core/src/main/java/haveno/core/offer/Offer.java
@@ -372,8 +372,8 @@ public class Offer implements NetworkPayload, PersistablePayload {
     public String getExtraInfo() {
         if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.F2F_EXTRA_INFO))
             return getExtraDataMap().get(OfferPayload.F2F_EXTRA_INFO);
-        else if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.CASH_BY_MAIL_EXTRA_INFO))
-            return getExtraDataMap().get(OfferPayload.CASH_BY_MAIL_EXTRA_INFO);
+        else if (getExtraDataMap() != null && getExtraDataMap().containsKey(OfferPayload.PAY_BY_MAIL_EXTRA_INFO))
+            return getExtraDataMap().get(OfferPayload.PAY_BY_MAIL_EXTRA_INFO);
         else
             return "";
     }
diff --git a/core/src/main/java/haveno/core/offer/OfferPayload.java b/core/src/main/java/haveno/core/offer/OfferPayload.java
index 81ca2f01..2db05fec 100644
--- a/core/src/main/java/haveno/core/offer/OfferPayload.java
+++ b/core/src/main/java/haveno/core/offer/OfferPayload.java
@@ -95,7 +95,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
     // Only used in payment method F2F
     public static final String F2F_CITY = "f2fCity";
     public static final String F2F_EXTRA_INFO = "f2fExtraInfo";
-    public static final String CASH_BY_MAIL_EXTRA_INFO = "cashByMailExtraInfo";
+    public static final String PAY_BY_MAIL_EXTRA_INFO = "payByMailExtraInfo";
 
     // Comma separated list of ordinal of a haveno.common.app.Capability. E.g. ordinal of
     // Capability.SIGNED_ACCOUNT_AGE_WITNESS is 11 and Capability.MEDIATION is 12 so if we want to signal that maker
diff --git a/core/src/main/java/haveno/core/offer/OfferUtil.java b/core/src/main/java/haveno/core/offer/OfferUtil.java
index e3455a6d..64e9f9b2 100644
--- a/core/src/main/java/haveno/core/offer/OfferUtil.java
+++ b/core/src/main/java/haveno/core/offer/OfferUtil.java
@@ -28,7 +28,7 @@ import haveno.core.locale.Res;
 import haveno.core.monetary.Price;
 import haveno.core.monetary.TraditionalMoney;
 import haveno.core.monetary.Volume;
-import haveno.core.payment.CashByMailAccount;
+import haveno.core.payment.PayByMailAccount;
 import haveno.core.payment.F2FAccount;
 import haveno.core.payment.PaymentAccount;
 import haveno.core.provider.price.MarketPrice;
@@ -58,7 +58,7 @@ import static haveno.common.util.MathUtils.roundDoubleToLong;
 import static haveno.common.util.MathUtils.scaleUpByPowerOf10;
 import static haveno.core.offer.OfferPayload.ACCOUNT_AGE_WITNESS_HASH;
 import static haveno.core.offer.OfferPayload.CAPABILITIES;
-import static haveno.core.offer.OfferPayload.CASH_BY_MAIL_EXTRA_INFO;
+import static haveno.core.offer.OfferPayload.PAY_BY_MAIL_EXTRA_INFO;
 import static haveno.core.offer.OfferPayload.F2F_CITY;
 import static haveno.core.offer.OfferPayload.F2F_EXTRA_INFO;
 import static haveno.core.offer.OfferPayload.REFERRAL_ID;
@@ -199,8 +199,8 @@ public class OfferUtil {
             extraDataMap.put(F2F_EXTRA_INFO, ((F2FAccount) paymentAccount).getExtraInfo());
         }
 
-        if (paymentAccount instanceof CashByMailAccount) {
-            extraDataMap.put(CASH_BY_MAIL_EXTRA_INFO, ((CashByMailAccount) paymentAccount).getExtraInfo());
+        if (paymentAccount instanceof PayByMailAccount) {
+            extraDataMap.put(PAY_BY_MAIL_EXTRA_INFO, ((PayByMailAccount) paymentAccount).getExtraInfo());
         }
 
         extraDataMap.put(CAPABILITIES, Capabilities.app.toStringList());
diff --git a/core/src/main/java/haveno/core/payment/CashByMailAccount.java b/core/src/main/java/haveno/core/payment/PayByMailAccount.java
similarity index 69%
rename from core/src/main/java/haveno/core/payment/CashByMailAccount.java
rename to core/src/main/java/haveno/core/payment/PayByMailAccount.java
index 5fa5c5bd..71e3871c 100644
--- a/core/src/main/java/haveno/core/payment/CashByMailAccount.java
+++ b/core/src/main/java/haveno/core/payment/PayByMailAccount.java
@@ -20,24 +20,24 @@ package haveno.core.payment;
 import haveno.core.api.model.PaymentAccountFormField;
 import haveno.core.locale.CurrencyUtil;
 import haveno.core.locale.TradeCurrency;
-import haveno.core.payment.payload.CashByMailAccountPayload;
+import haveno.core.payment.payload.PayByMailAccountPayload;
 import haveno.core.payment.payload.PaymentAccountPayload;
 import haveno.core.payment.payload.PaymentMethod;
 import lombok.NonNull;
 
 import java.util.List;
 
-public final class CashByMailAccount extends PaymentAccount {
+public final class PayByMailAccount extends PaymentAccount {
 
     public static final List<TradeCurrency> SUPPORTED_CURRENCIES = CurrencyUtil.getAllTraditionalCurrencies();
 
-    public CashByMailAccount() {
-        super(PaymentMethod.CASH_BY_MAIL);
+    public PayByMailAccount() {
+        super(PaymentMethod.PAY_BY_MAIL);
     }
 
     @Override
     protected PaymentAccountPayload createPayload() {
-        return new CashByMailAccountPayload(paymentMethod.getId(), id);
+        return new PayByMailAccountPayload(paymentMethod.getId(), id);
     }
 
     @Override
@@ -51,26 +51,26 @@ public final class CashByMailAccount extends PaymentAccount {
     }
 
     public void setPostalAddress(String postalAddress) {
-        ((CashByMailAccountPayload) paymentAccountPayload).setPostalAddress(postalAddress);
+        ((PayByMailAccountPayload) paymentAccountPayload).setPostalAddress(postalAddress);
     }
 
     public String getPostalAddress() {
-        return ((CashByMailAccountPayload) paymentAccountPayload).getPostalAddress();
+        return ((PayByMailAccountPayload) paymentAccountPayload).getPostalAddress();
     }
 
     public void setContact(String contact) {
-        ((CashByMailAccountPayload) paymentAccountPayload).setContact(contact);
+        ((PayByMailAccountPayload) paymentAccountPayload).setContact(contact);
     }
 
     public String getContact() {
-        return ((CashByMailAccountPayload) paymentAccountPayload).getContact();
+        return ((PayByMailAccountPayload) paymentAccountPayload).getContact();
     }
 
     public void setExtraInfo(String extraInfo) {
-        ((CashByMailAccountPayload) paymentAccountPayload).setExtraInfo(extraInfo);
+        ((PayByMailAccountPayload) paymentAccountPayload).setExtraInfo(extraInfo);
     }
 
     public String getExtraInfo() {
-        return ((CashByMailAccountPayload) paymentAccountPayload).getExtraInfo();
+        return ((PayByMailAccountPayload) paymentAccountPayload).getExtraInfo();
     }
 }
diff --git a/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java b/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java
index a6898552..be4a74d7 100644
--- a/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java
+++ b/core/src/main/java/haveno/core/payment/PaymentAccountFactory.java
@@ -74,8 +74,8 @@ public class PaymentAccountFactory {
                 return new HalCashAccount();
             case PaymentMethod.F2F_ID:
                 return new F2FAccount();
-            case PaymentMethod.CASH_BY_MAIL_ID:
-                return new CashByMailAccount();
+            case PaymentMethod.PAY_BY_MAIL_ID:
+                return new PayByMailAccount();
             case PaymentMethod.PROMPT_PAY_ID:
                 return new PromptPayAccount();
             case PaymentMethod.ADVANCED_CASH_ID:
diff --git a/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java b/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java
index f186bc8e..d4c8fe8b 100644
--- a/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java
+++ b/core/src/main/java/haveno/core/payment/PaymentAccountUtil.java
@@ -47,7 +47,7 @@ import static haveno.core.payment.payload.PaymentMethod.BLOCK_CHAINS;
 import static haveno.core.payment.payload.PaymentMethod.BLOCK_CHAINS_INSTANT;
 import static haveno.core.payment.payload.PaymentMethod.CAPITUAL_ID;
 import static haveno.core.payment.payload.PaymentMethod.CASH_APP_ID;
-import static haveno.core.payment.payload.PaymentMethod.CASH_BY_MAIL_ID;
+import static haveno.core.payment.payload.PaymentMethod.PAY_BY_MAIL_ID;
 import static haveno.core.payment.payload.PaymentMethod.CASH_DEPOSIT_ID;
 import static haveno.core.payment.payload.PaymentMethod.CELPAY_ID;
 import static haveno.core.payment.payload.PaymentMethod.CHASE_QUICK_PAY_ID;
@@ -238,8 +238,8 @@ public class PaymentAccountUtil {
                 return SepaAccount.SUPPORTED_CURRENCIES;
             case SEPA_INSTANT_ID:
                 return SepaInstantAccount.SUPPORTED_CURRENCIES;
-            case CASH_BY_MAIL_ID:
-                return CashByMailAccount.SUPPORTED_CURRENCIES;
+            case PAY_BY_MAIL_ID:
+                return PayByMailAccount.SUPPORTED_CURRENCIES;
             case F2F_ID:
                 return F2FAccount.SUPPORTED_CURRENCIES;
             case NATIONAL_BANK_ID:
diff --git a/core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java b/core/src/main/java/haveno/core/payment/payload/PayByMailAccountPayload.java
similarity index 84%
rename from core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java
rename to core/src/main/java/haveno/core/payment/payload/PayByMailAccountPayload.java
index 8a23039d..49cd1b6d 100644
--- a/core/src/main/java/haveno/core/payment/payload/CashByMailAccountPayload.java
+++ b/core/src/main/java/haveno/core/payment/payload/PayByMailAccountPayload.java
@@ -35,12 +35,12 @@ import java.util.Map;
 @Setter
 @Getter
 @Slf4j
-public final class CashByMailAccountPayload extends PaymentAccountPayload implements PayloadWithHolderName {
+public final class PayByMailAccountPayload extends PaymentAccountPayload implements PayloadWithHolderName {
     private String postalAddress = "";
     private String contact = "";
     private String extraInfo = "";
 
-    public CashByMailAccountPayload(String paymentMethod, String id) {
+    public PayByMailAccountPayload(String paymentMethod, String id) {
         super(paymentMethod, id);
     }
 
@@ -49,7 +49,7 @@ public final class CashByMailAccountPayload extends PaymentAccountPayload implem
     // PROTO BUFFER
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private CashByMailAccountPayload(String paymentMethod, String id,
+    private PayByMailAccountPayload(String paymentMethod, String id,
                                              String postalAddress,
                                              String contact,
                                              String extraInfo,
@@ -67,19 +67,19 @@ public final class CashByMailAccountPayload extends PaymentAccountPayload implem
     @Override
     public Message toProtoMessage() {
         return getPaymentAccountPayloadBuilder()
-                .setCashByMailAccountPayload(protobuf.CashByMailAccountPayload.newBuilder()
+                .setPayByMailAccountPayload(protobuf.PayByMailAccountPayload.newBuilder()
                         .setPostalAddress(postalAddress)
                         .setContact(contact)
                         .setExtraInfo(extraInfo))
                 .build();
     }
 
-    public static CashByMailAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
-        return new CashByMailAccountPayload(proto.getPaymentMethodId(),
+    public static PayByMailAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
+        return new PayByMailAccountPayload(proto.getPaymentMethodId(),
                 proto.getId(),
-                proto.getCashByMailAccountPayload().getPostalAddress(),
-                proto.getCashByMailAccountPayload().getContact(),
-                proto.getCashByMailAccountPayload().getExtraInfo(),
+                proto.getPayByMailAccountPayload().getPostalAddress(),
+                proto.getPayByMailAccountPayload().getContact(),
+                proto.getPayByMailAccountPayload().getExtraInfo(),
                 proto.getMaxTradePeriod(),
                 new HashMap<>(proto.getExcludeFromJsonDataMap()));
     }
diff --git a/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
index 3b803d4c..503ff4ca 100644
--- a/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
+++ b/core/src/main/java/haveno/core/payment/payload/PaymentMethod.java
@@ -31,7 +31,7 @@ import haveno.core.payment.AmazonGiftCardAccount;
 import haveno.core.payment.AustraliaPayidAccount;
 import haveno.core.payment.BizumAccount;
 import haveno.core.payment.CapitualAccount;
-import haveno.core.payment.CashByMailAccount;
+import haveno.core.payment.PayByMailAccount;
 import haveno.core.payment.CashDepositAccount;
 import haveno.core.payment.CelPayAccount;
 import haveno.core.payment.ZelleAccount;
@@ -161,7 +161,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
     public static final String PIX_ID = "PIX";
     public static final String AMAZON_GIFT_CARD_ID = "AMAZON_GIFT_CARD";
     public static final String BLOCK_CHAINS_INSTANT_ID = "BLOCK_CHAINS_INSTANT";
-    public static final String CASH_BY_MAIL_ID = "CASH_BY_MAIL";
+    public static final String PAY_BY_MAIL_ID = "PAY_BY_MAIL";
     public static final String CAPITUAL_ID = "CAPITUAL";
     public static final String CELPAY_ID = "CELPAY";
     public static final String MONESE_ID = "MONESE";
@@ -223,7 +223,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
     public static PaymentMethod PIX;
     public static PaymentMethod AMAZON_GIFT_CARD;
     public static PaymentMethod BLOCK_CHAINS_INSTANT;
-    public static PaymentMethod CASH_BY_MAIL;
+    public static PaymentMethod PAY_BY_MAIL;
     public static PaymentMethod CAPITUAL;
     public static PaymentMethod CELPAY;
     public static PaymentMethod MONESE;
@@ -270,7 +270,7 @@ public final class PaymentMethod implements PersistablePayload, Comparable<Payme
 
             // Global
             CASH_DEPOSIT = new PaymentMethod(CASH_DEPOSIT_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashDepositAccount.SUPPORTED_CURRENCIES)),
-            CASH_BY_MAIL = new PaymentMethod(CASH_BY_MAIL_ID, 8 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(CashByMailAccount.SUPPORTED_CURRENCIES)),
+            PAY_BY_MAIL = new PaymentMethod(PAY_BY_MAIL_ID, 8 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(PayByMailAccount.SUPPORTED_CURRENCIES)),
             MONEY_GRAM = new PaymentMethod(MONEY_GRAM_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_MID_RISK, getAssetCodes(MoneyGramAccount.SUPPORTED_CURRENCIES)),
             WESTERN_UNION = new PaymentMethod(WESTERN_UNION_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_MID_RISK, getAssetCodes(WesternUnionAccount.SUPPORTED_CURRENCIES)),
             NATIONAL_BANK = new PaymentMethod(NATIONAL_BANK_ID, 4 * DAY, DEFAULT_TRADE_LIMIT_HIGH_RISK, getAssetCodes(NationalBankAccount.SUPPORTED_CURRENCIES)),
diff --git a/core/src/main/java/haveno/core/proto/CoreProtoResolver.java b/core/src/main/java/haveno/core/proto/CoreProtoResolver.java
index bf575803..1d3732d7 100644
--- a/core/src/main/java/haveno/core/proto/CoreProtoResolver.java
+++ b/core/src/main/java/haveno/core/proto/CoreProtoResolver.java
@@ -30,7 +30,7 @@ import haveno.core.payment.payload.AustraliaPayidAccountPayload;
 import haveno.core.payment.payload.BizumAccountPayload;
 import haveno.core.payment.payload.CapitualAccountPayload;
 import haveno.core.payment.payload.CashAppAccountPayload;
-import haveno.core.payment.payload.CashByMailAccountPayload;
+import haveno.core.payment.payload.PayByMailAccountPayload;
 import haveno.core.payment.payload.CashDepositAccountPayload;
 import haveno.core.payment.payload.CelPayAccountPayload;
 import haveno.core.payment.payload.ChaseQuickPayAccountPayload;
@@ -199,8 +199,8 @@ public class CoreProtoResolver implements ProtoResolver {
                     return HalCashAccountPayload.fromProto(proto);
                 case U_S_POSTAL_MONEY_ORDER_ACCOUNT_PAYLOAD:
                     return USPostalMoneyOrderAccountPayload.fromProto(proto);
-                case CASH_BY_MAIL_ACCOUNT_PAYLOAD:
-                    return CashByMailAccountPayload.fromProto(proto);
+                case PAY_BY_MAIL_ACCOUNT_PAYLOAD:
+                    return PayByMailAccountPayload.fromProto(proto);
                 case PROMPT_PAY_ACCOUNT_PAYLOAD:
                     return PromptPayAccountPayload.fromProto(proto);
                 case ADVANCED_CASH_ACCOUNT_PAYLOAD:
diff --git a/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java
index beecabf6..ae06b693 100644
--- a/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java
+++ b/core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java
@@ -137,7 +137,7 @@ public final class TradeStatistics3 implements ProcessOncePersistableNetworkPayl
         BLOCK_CHAINS_INSTANT,
         TRANSFERWISE,
         AMAZON_GIFT_CARD,
-        CASH_BY_MAIL,
+        PAY_BY_MAIL,
         CAPITUAL,
         PAYSERA,
         PAXUM,
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 4afd2d3e..f914a759 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -677,9 +677,9 @@ portfolio.pending.step2_buyer.westernUnion.extra=IMPORTANT REQUIREMENT:\nAfter y
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Please send {0} by \"US Postal Money Order\" to the BTC seller.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. \
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. \
   Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. \
-  See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+  See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -774,7 +774,7 @@ has already sufficient blockchain confirmations.\nThe payment amount has to be {
 You can copy & paste your {4} address from the main screen after closing that popup.
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the XMR buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the XMR buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the XMR buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\n\
   Please go to your online banking web page and check if you have received {1} from the XMR buyer.
@@ -2917,7 +2917,7 @@ Failure to provide the required information to the Mediator or Arbitrator will r
 In all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\n\
 If you do not understand these requirements, do not trade using USPMO on Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\
   \n\
   ● XMR buyer should package cash in a tamper-evident cash bag.\n\
   ● XMR buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n\
@@ -2926,22 +2926,22 @@ payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that
   ● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n\
   ● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\
   \n\
-  CBM trades put the onus to act honestly squarely on both peers.\n\
+  PBM trades put the onus to act honestly squarely on both peers.\n\
   \n\
-  ● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n\
-  ● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n\
+  ● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n\
+  ● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n\
   ● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n\
   ● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n\
   ● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n\
-  ● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n\
-  ● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\
+  ● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n\
+  ● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\
   \n\
-  To be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\
+  To be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\
   \n\
-  If you do not understand these requirements, do not trade using CBM on Haveno.
+  If you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=Contact info
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=Contact info
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Contact info
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=City for 'Face to face' meeting
@@ -2949,12 +2949,12 @@ payment.f2f.city.prompt=The city will be displayed with the offer
 payment.shared.optionalExtra=Optional additional information
 payment.shared.extraInfo=Additional information
 payment.shared.extraInfo.prompt=Define any special terms, conditions, or details you would like to be displayed with your offers for this payment account (users will see this info before accepting offers).
-payment.cashByMail.extraInfo.prompt=Please state on your offers: \n\n\
+payment.payByMail.extraInfo.prompt=Please state on your offers: \n\n\
 Country you are located (eg France); \n\
 Countries / regions you would accept trades from (eg France, EU, or any European country); \n\
 Any special terms/conditions; \n\
 Any other details.
-payment.cashByMail.tradingRestrictions=Please review the maker's terms and conditions.\n\
+payment.payByMail.tradingRestrictions=Please review the maker's terms and conditions.\n\
   If you do not meet the requirements do not take this trade.
 payment.f2f.info='Face to Face' trades have different rules and come with different risks than online transactions.\n\n\
   The main differences are:\n\
@@ -2999,7 +2999,7 @@ SAME_BANK=Transfer with same bank
 SPECIFIC_BANKS=Transfers with specific banks
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Cash Deposit
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Face to face (in person)
@@ -3017,7 +3017,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Cash Deposit
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties
index c569c39d..a617f69c 100644
--- a/core/src/main/resources/i18n/displayStrings_cs.properties
+++ b/core/src/main/resources/i18n/displayStrings_cs.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=DŮLEŽITÉ POŽADAVKY:\nPo pro
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Zašlete prosím {0} prodejci BTC pomocí \"US Postal Money Order\".\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Zašlete prosím {0} prodejci BTC v poštovní zásilce (\"Cash by Mail\"). Konkrétní instrukce naleznete v obchodní smlouvě. V případě pochybností se můžete zeptat protistrany pomocí obchodního chatu. Více informací naleznete na Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Zašlete prosím {0} prodejci BTC v poštovní zásilce (\"Pay by Mail\"). Konkrétní instrukce naleznete v obchodní smlouvě. V případě pochybností se můžete zeptat protistrany pomocí obchodního chatu. Více informací naleznete na Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Prosím uhraďte {0} pomocí zvolené platební metody prodejci BTC. V dalším kroku naleznete detaily o účtu prodejce.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=na vaší {0} peněžence
 portfolio.pending.step3_seller.crypto={0}Zkontrolujte prosím {1}, zda transakce na vaši přijímací adresu\n{2}\nmá již dostatečné potvrzení na blockchainu.\nČástka platby musí být {3}\n\nPo zavření vyskakovacího okna můžete zkopírovat a vložit svou {4} adresu z hlavní obrazovky.
 portfolio.pending.step3_seller.postal={0}Zkontrolujte, zda jste od kupujícího BTC obdrželi {1} přes \"US Postal Money Order\".
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Zkontrolujte, zda jste od kupujícího BTC obdrželi {1} přes \"Cash by Mail\".
+portfolio.pending.step3_seller.payByMail={0}Zkontrolujte, zda jste od kupujícího BTC obdrželi {1} přes \"Pay by Mail\".
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Váš obchodní partner potvrdil, že zahájil platbu {0}.\n\nPřejděte na webovou stránku online bankovnictví a zkontrolujte, zda jste od kupujícího BTC obdrželi {1}.
 portfolio.pending.step3_seller.cash=Vzhledem k tomu, že se platba provádí prostřednictvím hotovostního vkladu, musí kupující BTC napsat na papírový doklad \"NO REFUND\", roztrhat ho na 2 části a odeslat vám e-mailem fotografii.\n\nAbyste se vyhnuli riziku zpětného zúčtování, potvrďte pouze, zda jste obdrželi e-mail a zda si jste jisti, že papírový doklad je platný.\nPokud si nejste jisti, {0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Aktualizace účtu pro platbu kartou Ama
 
 payment.usPostalMoneyOrder.info=Obchodování pomocí amerických poštovních poukázek (USPMO) na Haveno vyžaduje, abyste rozuměli následujícímu:\n\n- Kupující BTC musí před odesláním napsat jméno prodejce BTC do polí plátce i příjemce a pořídit fotografii USPMO a obálku s dokladem o sledování ve vysokém rozlišení.\n- Kupující BTC musí odeslat USPMO prodejci BTC s potvrzením dodávky.\n\nV případě, že je nutná mediace, nebo pokud dojde k obchodnímu sporu, budete povinni poslat fotografie mediátorovi Haveno nebo zástupci pro vrácení peněz spolu s pořadovým číslem USPMO, číslem pošty a částkou dolaru, aby mohli ověřit podrobnosti na webu US Post Office.\n\nNeposkytnutí požadovaných informací mediátorovi nebo arbitrovi bude mít za následek ztrátu případu sporu.\n\nVe všech sporných případech nese odesílatel USPMO 100% břemeno odpovědnosti za poskytnutí důkazů mediátorovi nebo arbitrovi.\n\nPokud těmto požadavkům nerozumíte, neobchodujte pomocí USPMO na Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=Kontaktní informace
-payment.cashByMail.contact.prompt=Obálka se jménem nebo pseudonymem by měla být adresována
+payment.payByMail.contact=Kontaktní informace
+payment.payByMail.contact.prompt=Obálka se jménem nebo pseudonymem by měla být adresována
 payment.f2f.contact=Kontaktní informace
 payment.f2f.contact.prompt=Jak byste chtěli být kontaktováni obchodním partnerem? (e-mailová adresa, telefonní číslo, ...)
 payment.f2f.city=Město pro setkání „tváří v tvář“
@@ -2008,7 +2008,7 @@ SAME_BANK=Převod ve stejné bance
 SPECIFIC_BANKS=Převody u konkrétních bank
 US_POSTAL_MONEY_ORDER=Poukázka US Postal
 CASH_DEPOSIT=Vklad hotovosti na účet prodávajícího
-CASH_BY_MAIL=Odeslání hotovosti poštou
+PAY_BY_MAIL=Odeslání hotovosti poštou
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Tváří v tvář (osobně)
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Vklad hotovosti
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=Hotovost poštou
+PAY_BY_MAIL_SHORT=Hotovost poštou
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties
index 0b0107cb..36ebbf18 100644
--- a/core/src/main/resources/i18n/displayStrings_de.properties
+++ b/core/src/main/resources/i18n/displayStrings_de.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=WICHTIGE VORAUSSETZUNG: \nNachd
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Bitte senden Sie {0} per \"US Postal Money Order\" an den BTC-Verkäufer.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Bitte schicken Sie {0} Bargeld per Post an den BTC Verkäufer. Genaue Anweisungen finden Sie im Handelsvertrag, oder Sie stellen über den Handels-Chat Fragen, wenn etwas unklar ist. Weitere Informationen über \"Bargeld per Post\" finden Sie im Haveno-Wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Bitte schicken Sie {0} Bargeld per Post an den BTC Verkäufer. Genaue Anweisungen finden Sie im Handelsvertrag, oder Sie stellen über den Handels-Chat Fragen, wenn etwas unklar ist. Weitere Informationen über \"Bargeld per Post\" finden Sie im Haveno-Wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Bitte zahlen Sie {0} mit der gewählten Zahlungsmethode an den BTC Verkäufer. Sie finden die Konto Details des Verkäufers im nächsten Fenster.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=in ihrer {0} Wallet
 portfolio.pending.step3_seller.crypto={0}Bitte überprüfen Sie mit Ihrem bevorzugten {1}-Blockchain-Explorer, ob die Transaktion zu Ihrer Empfangsadresse\n{2}\nschon genug Blockchain-Bestätigungen hat.\nDer Zahlungsbetrag muss {3} sein\n\nSie können Ihre {4}-Adresse vom Hauptbildschirm kopieren und woanders einfügen, nachdem dieser Dialog geschlossen wurde.
 portfolio.pending.step3_seller.postal={0}Bitte überprüfen Sie, ob Sie {1} per \"US Postal Money Order\" vom BTC-Käufer erhalten haben.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Bitte überprüfen Sie, ob Sie {1} als \"Bargeld per Post\" vom BTC-Käufer erhalten haben.
+portfolio.pending.step3_seller.payByMail={0}Bitte überprüfen Sie, ob Sie {1} als \"Bargeld per Post\" vom BTC-Käufer erhalten haben.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Ihr Handelspartner hat den Beginn der {0}-Zahlung bestätigt.\n\nBitte gehen Sie auf Ihre Online-Banking-Website und überprüfen Sie, ob Sie {1} vom BTC-Käufer erhalten haben.
 portfolio.pending.step3_seller.cash=Da die Zahlung per Cash Deposit ausgeführt wurde, muss der BTC-Käufer \"NO REFUND\" auf die Quittung schreiben, diese in 2 Teile reißen und Ihnen ein Foto per E-Mail schicken.\n\nUm die Gefahr einer Rückbuchung zu vermeiden bestätigen Sie nur, wenn Sie die E-Mail erhalten haben und Sie sicher sind, dass die Quittung gültig ist.\nWenn Sie nicht sicher sind, {0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Amazon Geschenkkarte Konto updaten
 
 payment.usPostalMoneyOrder.info=Der Handel auf Haveno unter Verwendung von US Postal Money Orders (USPMO) setzt voraus, dass Sie Folgendes verstehen:\n\n- Der BTC-Käufer muss den Namen des BTC-Verkäufers sowohl in das Feld des Zahlers als auch in das Feld des Zahlungsempfängers eintragen und vor dem Versand ein hochauflösendes Foto des USPMO und des Umschlags mit dem Tracking-Nachweis machen.\n- BTC-Käufer müssen den USPMO mit Zustellbenachrichtigung an den BTC-Verkäufer schicken.\n\nFür den Fall, dass eine Mediation erforderlich ist oder es zu einem Handelskonflikt kommt, müssen Sie die Fotos zusammen mit der USPMO-Seriennummer, der Nummer des Postamtes und dem Dollarbetrag an den Haveno-Vermittler oder Rückerstattungsbeauftragten schicken, damit dieser die Angaben auf der Website der US-Post überprüfen kann.\n\nWenn Sie dem Vermittler oder der Schiedsperson die erforderlichen Informationen nicht zur Verfügung stellen, führt dies dazu, dass der Konflikt zu Ihrem Nachteil entschieden wird.\n\nIn allen Konfliktfällen trägt der USPMO-Absender 100% der Verantwortung für die Bereitstellung von Beweisen/Nachweisen für den Vermittler oder die Schiedsperson.\n\nWenn Sie diese Anforderungen nicht verstehen, handeln Sie bitte nicht auf Haveno unter Verwendung von USPMO.
 
-payment.cashByMail.info=Beim Bargeld per Post Handel auf Haveno, müssen Sie folgendes verstehen: \n\n● Der BTC Käufer sollte das Bargeld in einen manipulationssicheren Geldbeutel verpacken.\n● Der BTC Käufer sollte den Verpackungsprozess des Bargeldes filmen oder mit hochauflösenden Fotos dokumentieren. Die Adresse & Tracking Nummer sollen auf der Packung bereits angebracht sein.\n● Der BTC Käufer sollte das Bargeld mit Versandbestätigung und ausreichender Versicherung an den Verkäufer senden.\n● Der BTC Verkäufer sollte die Öffnung des Bargeld-Paketes so filmen, dass die Tracking Nummer des Senders im Video sichtbar ist.\n● Der Ersteller des Angebots muss spezielle Bedingungen oder Abmachungen im 'Zusätzliche Informationen'-Feld des Zahlungskontos eintragen.\n● Der Annehmer des Angebots akzeptiert die Bedingungen und Abmachungen des Ersteller des Angebots durch die Annahme des Angebots.\n\nBargeld per Post Trades benötigen die Ehrlichkeit und das Vertrauen beider Peers.\n\n● Bargeld per Post Trades haben weniger verifizierbare Handlungen als andere FIAT Trades. Das macht die Abwicklung von Konflikten viel schwerer.\nCBM trades put the onus to act honestly squarely on both peers.\n● Versuchen Sie den Konflikt mit dem Handelspartner direkt über den Trader Chat zu lösen. Das ist der vielversprechendste Weg Konflikte bei solchen  Trades zu lösen.\n● Mediatoren können den Fall untersuchen und einen Vorschlag machen aber es ist nicht garantiert, dass sie wirklich helfen können.\n● Wenn ein Mediator eingeschalten wurde und beide Peers den Vorschlag des Mediators ablehnen, werden die Gelder beider Peers zu einer Haveno Spendenadresse [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] gesendet und der Trade ist somit abgeschlossen.\n● Wenn ein Trader den Vorschlag des Mediators ablehnt und eine Arbitration eröffnet, kann es zu einem Verlust der Trading- und der Deposit-Funds kommen.\n● Arbitratoren werden ihre Entscheidungen basierend auf den zur Verfügung gestellten Beweisen treffen. Deshalb sollten Sie die Abläufe von oben befolgen und dokumentieren um im Falle eines Konflikts Beweise zu haben. Bei Bargeld per Post Trades ist die Entscheidung des Arbitrators entscheidend.\n● Rückerstattungsanfragen, von verlorenen Funds durch einen Bargeld per Post Trade, über die DAO werden nicht berücksichtigt.\n\nUm sicherzustellen, dass Sie die Anforderungen bei Bargeld per Post Trades verstanden haben lesen Sie: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\nWenn Sie diese Anforderungen nicht verstehen, nutzen Sie die Haveno-Zahlungsmethode Bargeld per Post nicht.
+payment.payByMail.info=Beim Bargeld per Post Handel auf Haveno, müssen Sie folgendes verstehen: \n\n● Der BTC Käufer sollte das Bargeld in einen manipulationssicheren Geldbeutel verpacken.\n● Der BTC Käufer sollte den Verpackungsprozess des Bargeldes filmen oder mit hochauflösenden Fotos dokumentieren. Die Adresse & Tracking Nummer sollen auf der Packung bereits angebracht sein.\n● Der BTC Käufer sollte das Bargeld mit Versandbestätigung und ausreichender Versicherung an den Verkäufer senden.\n● Der BTC Verkäufer sollte die Öffnung des Bargeld-Paketes so filmen, dass die Tracking Nummer des Senders im Video sichtbar ist.\n● Der Ersteller des Angebots muss spezielle Bedingungen oder Abmachungen im 'Zusätzliche Informationen'-Feld des Zahlungskontos eintragen.\n● Der Annehmer des Angebots akzeptiert die Bedingungen und Abmachungen des Ersteller des Angebots durch die Annahme des Angebots.\n\nBargeld per Post Trades benötigen die Ehrlichkeit und das Vertrauen beider Peers.\n\n● Bargeld per Post Trades haben weniger verifizierbare Handlungen als andere FIAT Trades. Das macht die Abwicklung von Konflikten viel schwerer.\nPBM trades put the onus to act honestly squarely on both peers.\n● Versuchen Sie den Konflikt mit dem Handelspartner direkt über den Trader Chat zu lösen. Das ist der vielversprechendste Weg Konflikte bei solchen  Trades zu lösen.\n● Mediatoren können den Fall untersuchen und einen Vorschlag machen aber es ist nicht garantiert, dass sie wirklich helfen können.\n● Wenn ein Mediator eingeschalten wurde und beide Peers den Vorschlag des Mediators ablehnen, werden die Gelder beider Peers zu einer Haveno Spendenadresse [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] gesendet und der Trade ist somit abgeschlossen.\n● Wenn ein Trader den Vorschlag des Mediators ablehnt und eine Arbitration eröffnet, kann es zu einem Verlust der Trading- und der Deposit-Funds kommen.\n● Arbitratoren werden ihre Entscheidungen basierend auf den zur Verfügung gestellten Beweisen treffen. Deshalb sollten Sie die Abläufe von oben befolgen und dokumentieren um im Falle eines Konflikts Beweise zu haben. Bei Bargeld per Post Trades ist die Entscheidung des Arbitrators entscheidend.\n● Rückerstattungsanfragen, von verlorenen Funds durch einen Bargeld per Post Trade, über die DAO werden nicht berücksichtigt.\n\nUm sicherzustellen, dass Sie die Anforderungen bei Bargeld per Post Trades verstanden haben lesen Sie: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\nWenn Sie diese Anforderungen nicht verstehen, nutzen Sie die Haveno-Zahlungsmethode Bargeld per Post nicht.
 
-payment.cashByMail.contact=Kontaktinformationen
-payment.cashByMail.contact.prompt=Name oder Pseudonym Umschlag sollten adressiert werden an
+payment.payByMail.contact=Kontaktinformationen
+payment.payByMail.contact.prompt=Name oder Pseudonym Umschlag sollten adressiert werden an
 payment.f2f.contact=Kontaktinformationen
 payment.f2f.contact.prompt=Wie möchten Sie vom Trading-Peer kontaktiert werden? (E-Mail Adresse, Telefonnummer,...)
 payment.f2f.city=Stadt für ein "Angesicht zu Angesicht" Treffen
@@ -2008,7 +2008,7 @@ SAME_BANK=Überweisung mit derselben Bank
 SPECIFIC_BANKS=Überweisungen mit bestimmten Banken
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Cash Deposit
-CASH_BY_MAIL=Bargeld per Post
+PAY_BY_MAIL=Bargeld per Post
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Angesicht zu Angesicht (persönlich)
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Cash Deposit
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=BargeldPerPost
+PAY_BY_MAIL_SHORT=BargeldPerPost
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties
index 82eb4524..854dad4f 100644
--- a/core/src/main/resources/i18n/displayStrings_es.properties
+++ b/core/src/main/resources/i18n/displayStrings_es.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=REQUERIMIENTO IMPORTANTE:\nDesp
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Por favor envíe {0} mediante \"US Postal Money Order\" a el vendedor de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Por favor envíe {0} usando \"Efectivo por Correo\" al vendedor. Las instrucciones específicas están en el contrato de intercambio, y si no queda claro, pregunte a través del chat de intercambio.\nVea más detalles acerca de Efectivo por Correo en la wiki de Haveno [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Por favor envíe {0} usando \"Efectivo por Correo\" al vendedor. Las instrucciones específicas están en el contrato de intercambio, y si no queda claro, pregunte a través del chat de intercambio.\nVea más detalles acerca de Efectivo por Correo en la wiki de Haveno [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Por favor pague {0} a través del método de pago especificado al vendedor BTC. Encontrará los detalles de la cuenta del vendedor en la siguiente pantalla.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=en su cartera {0}
 portfolio.pending.step3_seller.crypto={0}Por favor compruebe {1} si la transacción a su dirección de recepción\n{2}\ntiene suficientes confirmaciones en la cadena de bloques.\nLa cantidad a pagar tiene que ser {3}\n\nPuede copiar y pegar su dirección {4} desde la pantalla principal después de cerrar este popup.
 portfolio.pending.step3_seller.postal={0}Por favor compruebe si ha recibido {1} con \"US Postal Money Order\" enviados por el comprador BTC.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Por favor compruebe si ha recibido {1} con \"Efectivo por Correo\" enviados por el comprador BTC.
+portfolio.pending.step3_seller.payByMail={0}Por favor compruebe si ha recibido {1} con \"Efectivo por Correo\" enviados por el comprador BTC.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Su par de intercambio confirma que ha iniciado el pago de {0}.\n\nPor favor vaya a la página web de su banco y compruebe si ha recibido {1} del comprador de BTC.
 portfolio.pending.step3_seller.cash=Debido a que el pago se hecho vía depósito en efectivo el comprador de BTC tiene que escribir \"SIN REEMBOLSO\" en el recibo de papel, dividirlo en 2 partes y enviarte una foto por e-mail.\n\nPara impedir el riesgo de reembolso, solo confirme si ha recibido el e-mail y si está seguro de que el recibo es válido.\nSi no está seguro, {0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Actualizar cuenta Tarjeta regalo Amazon
 
 payment.usPostalMoneyOrder.info=Los intercambios usando US Postal Money Orders (USPMO) en Haveno requiere que entienda lo siguiente:\n\n- Los compradores de BTC deben escribir la dirección del vendedor en los campos de "Payer" y "Payee" y tomar una foto en alta resolución de la USPMO y del sobre con la prueba de seguimiento antes de enviar.\n- Los compradores de BTC deben enviar la USPMO con confirmación de entrega.\n\nEn caso de que sea necesaria la mediación, se requerirá al comprador que entregue las fotos al mediador o agente de devolución de fondos, junto con el número de serie de la USPMO, número de oficina postal, y la cantidad de USD, para que puedan verificar los detalles en la web de US Post Office.\n\nNo entregar la información requerida al Mediador o Árbitro resultará en pérdida del caso de disputa. \n\nEn todos los casos de disputa, el emisor de la USPMO tiene el 100% de responsabilidad en aportar la evidencia al Mediador o Árbitro.\n\nSi no entiende estos requerimientos, no comercie usando USPMO en Haveno.
 
-payment.cashByMail.info=Comerciar usando efectivo por correo (CBM) en Haveno requiere que entienda lo siguiente:\n\n● El comprador de BTC debe empaquetar el efectivo en una bolsa de efectivo a prueba de manipulación.\n● El comprador de BTC debe filmar o tomar fotos de alta resolución del empaquetado junto con la dirección y el número de seguimiento ya añadido al paquete.\n● El comprador de BTC debe enviar el paquete de efectivo al vendedor con la confirmación de entrega y un seguro apropiado.\n●  El vendedor de BTC debe filmar la apertura del paquete, asegurándose de que el número de seguimiento entregado por el emisor es visible en todo el video.\n● El creador de la oferta debe especificar cualquier términos o condiciones especiales en el campo 'Información adicional' de la cuenta de pago.\n● Al tomar la oferta, el tomador indica estar de acuredo con los términos y condiciones del tomador.\n\nLos intercambios CBM responsabilizan a ambos pares de actuar honestamente.\n\n● Los intercambios CBM tienen menos acciones verificables que otrosintrecambios de fiat. Esto hace más complicado manejar disputas.\n● Intente a resolver las disputas directamente con su par utilizando el chat de intercambio. Esta es la ruta más prometedora.\n● Los mediadores pueden considerar su caso y hacer una sugerencia, pero no está garantizado que vayan a ayudar.\n● Si se solicita mediación, y si algún par rechaza la sugerencia de mediación, los fondos de ambos pares se enviarán a la dirección de 'donación' de Haveno[HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], y el intercambio concluirá.\n● Si un comerciante rechaza la sugerencia de mediación y abre arbitraje, podría llevar a la pérdida de todos los fondos, de intercambio y depósitos de seguridad.\n● El árbitro tomará una decisión basada en la evidencia entregada. Por tanto, por favor siga y documente el proceso indicado arriba para tener evidencia en caso de disputa.\n● Las solicitudes de reembolso de fondos perdidos resultantes de CBM en la DAO no serán considerados.\n\nAsegúrese de que entiende los requerimientos de los intercambios CBM leyendo: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nSi no entiende estos requisitos, no intercambie usando CBM.
+payment.payByMail.info=Comerciar usando efectivo por correo (PBM) en Haveno requiere que entienda lo siguiente:\n\n● El comprador de BTC debe empaquetar el efectivo en una bolsa de efectivo a prueba de manipulación.\n● El comprador de BTC debe filmar o tomar fotos de alta resolución del empaquetado junto con la dirección y el número de seguimiento ya añadido al paquete.\n● El comprador de BTC debe enviar el paquete de efectivo al vendedor con la confirmación de entrega y un seguro apropiado.\n●  El vendedor de BTC debe filmar la apertura del paquete, asegurándose de que el número de seguimiento entregado por el emisor es visible en todo el video.\n● El creador de la oferta debe especificar cualquier términos o condiciones especiales en el campo 'Información adicional' de la cuenta de pago.\n● Al tomar la oferta, el tomador indica estar de acuredo con los términos y condiciones del tomador.\n\nLos intercambios PBM responsabilizan a ambos pares de actuar honestamente.\n\n● Los intercambios PBM tienen menos acciones verificables que otrosintrecambios de fiat. Esto hace más complicado manejar disputas.\n● Intente a resolver las disputas directamente con su par utilizando el chat de intercambio. Esta es la ruta más prometedora.\n● Los mediadores pueden considerar su caso y hacer una sugerencia, pero no está garantizado que vayan a ayudar.\n● Si se solicita mediación, y si algún par rechaza la sugerencia de mediación, los fondos de ambos pares se enviarán a la dirección de 'donación' de Haveno[HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], y el intercambio concluirá.\n● Si un comerciante rechaza la sugerencia de mediación y abre arbitraje, podría llevar a la pérdida de todos los fondos, de intercambio y depósitos de seguridad.\n● El árbitro tomará una decisión basada en la evidencia entregada. Por tanto, por favor siga y documente el proceso indicado arriba para tener evidencia en caso de disputa.\n● Las solicitudes de reembolso de fondos perdidos resultantes de PBM en la DAO no serán considerados.\n\nAsegúrese de que entiende los requerimientos de los intercambios PBM leyendo: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nSi no entiende estos requisitos, no intercambie usando PBM.
 
-payment.cashByMail.contact=Información de contacto
-payment.cashByMail.contact.prompt=El sobre con nombre o pseudónimo debería ser dirigido a
+payment.payByMail.contact=Información de contacto
+payment.payByMail.contact.prompt=El sobre con nombre o pseudónimo debería ser dirigido a
 payment.f2f.contact=Información de contacto
 payment.f2f.contact.prompt=Cómo le gustaría ser contactado por el par de intercambio? (dirección email, número de teléfono...)
 payment.f2f.city=Ciudad para la reunión 'cara a cara'
@@ -2008,7 +2008,7 @@ SAME_BANK=Transferir con el mismo banco
 SPECIFIC_BANKS=Transferencias con bancos específicos
 US_POSTAL_MONEY_ORDER=Giro postal US Postal
 CASH_DEPOSIT=Depósito en efectivo
-CASH_BY_MAIL=Efectivo por Correo
+PAY_BY_MAIL=Efectivo por Correo
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Cara a cara (en persona)
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=Giro postal US
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Depósito en efectivo
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=EfectivoPorCorreo
+PAY_BY_MAIL_SHORT=EfectivoPorCorreo
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties
index 04f0d147..aef7cf4f 100644
--- a/core/src/main/resources/i18n/displayStrings_fa.properties
+++ b/core/src/main/resources/i18n/displayStrings_fa.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=مورد الزامی مهم:\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=لطفاً {0} را توسط \"US Postal Money Order\" به فروشنده‌ی بیتکوین پرداخت کنید.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=در کیف‌پول {0} شما
 portfolio.pending.step3_seller.crypto={0} لطفا بررسی کنید {1} که آیا تراکنش مربوط به آدرس شما\n{2}\n تعداد تاییدیه‌های کافی بر روی بلاکچین دریافت کرده است یا خیر.\nمبلغ پرداخت باید {3} باشد\nشما می‌توانید آدرس {4} خود را پس از بستن پنجره از صفحه اصلی کپی کنید.
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=چون پرداخت از طریق سپرده‌ی نقدی انجام شده است، خریدار BTC باید عبارت \"غیر قابل استرداد\" را روی رسید کاغذی بنویسد، آن را به 2 قسمت پاره کند و از طریق ایمیل به شما یک عکس ارسال کند.\n\nبه منظور اجتناب از استرداد وجه، تنها در صورتی تایید کنید که ایمیل را دریافت کرده باشید و از صحت رسید کاغذی مطمئن باشید.\nاگر مطمئن نیستید، {0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=اطلاعات تماس
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=اطلاعات تماس
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=اطلاعات تماس
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=شهر جهت ملاقات 'رو در رو'
@@ -2008,7 +2008,7 @@ SAME_BANK=انتقال با همان بانک
 SPECIFIC_BANKS=نقل و انتقالات با بانک های مشخص
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=سپرده ی نقدی
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=مانی گرام
 WESTERN_UNION=Western Union
 F2F=رو در رو (به طور فیزیکی)
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=سپرده ی نقدی
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=مانی گرام
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties
index be01eff4..db20c36a 100644
--- a/core/src/main/resources/i18n/displayStrings_fr.properties
+++ b/core/src/main/resources/i18n/displayStrings_fr.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=CONDITIONS REQUISES:\nAprès av
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Merci d''envoyer {0} par \"US Postal Money Order\" au vendeur de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Veuillez envoyer {0} en utlisant \"Cash by Mail\" au vendeur de BTC. Les instructions spécifiques sont dans le contrat de trade, ou si ce n'est pas clair, vous pouvez poser des questions via le chat des trader. Pour plus de détails sur Cash by Mail, allez sur le wiki Haveno \n[LIEN:https://bisq.wiki/Cash_by_Mail]\n
+portfolio.pending.step2_buyer.payByMail=Veuillez envoyer {0} en utlisant \"Pay by Mail\" au vendeur de BTC. Les instructions spécifiques sont dans le contrat de trade, ou si ce n'est pas clair, vous pouvez poser des questions via le chat des trader. Pour plus de détails sur Pay by Mail, allez sur le wiki Haveno \n[LIEN:https://bisq.wiki/Cash_by_Mail]\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Veuillez payer {0} via la méthode de paiement spécifiée par le vendeur de BTC. Vous trouverez les informations du compte du vendeur à l'écran suivant.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -680,7 +680,7 @@ portfolio.pending.step3_seller.crypto.wallet=Dans votre portefeuille {0}
 portfolio.pending.step3_seller.crypto={0}Veuillez s''il vous plaît vérifier {1} que la transaction vers votre adresse de réception\n{2}\ndispose de suffisamment de confirmations sur la blockchain.\nLe montant du paiement doit être {3}\n\nVous pouvez copier & coller votre adresse {4} à partir de l''écran principal après avoir fermé ce popup.
 portfolio.pending.step3_seller.postal={0}Veuillez vérifier si vous avez reçu {1} avec \"US Postal Money Order\" de la part de l'acheteur de BTC.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Veuillez vérifier si vous avez reçu {1} avec \"Cash by Mail\" de la part de l'acheteur de BTC
+portfolio.pending.step3_seller.payByMail={0}Veuillez vérifier si vous avez reçu {1} avec \"Pay by Mail\" de la part de l'acheteur de BTC
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Votre partenaire de trading a confirmé qu'il a initié le {0} paiement.\n\nVeuillez vous rendre sur votre banque en ligne et vérifier si vous avez reçu {1} de la part de l'acheteur de BTC.
 portfolio.pending.step3_seller.cash=Du fait que le paiement est réalisé via Cash Deposit l''acheteur de BTC doit inscrire \"NO REFUND\" sur le reçu papier, le déchirer en 2 et vous envoyer une photo par email.\n\nPour éviter un risque de rétrofacturation, ne confirmez que si vous recevez le mail et que vous êtes sûr que le reçu papier est valide.\nSi vous n''êtes pas sûr, {0}
@@ -1974,10 +1974,10 @@ payment.amazonGiftCard.upgrade.headLine=Mettre à jour le compte des cartes cade
 
 payment.usPostalMoneyOrder.info=Pour échanger US Postal Money Orders (USPMO) sur Haveno, vous devez comprendre les termes suivants: \n\n- L'acheteur BTC doit écrire le nom du vendeur BTC dans les champs expéditeur et bénéficiaire, et prendre une photo à haute résolution de USPMO et de l'enveloppe avec une preuve de suivi avant l'envoi. \n\n- L'acheteur BTC doit envoyer USPMO avec la confirmation de livraison au vendeur BTC. \n\nSi une médiation est nécessaire, ou s'il y a un différend de transaction, vous devrez envoyer la photo avec le numéro USPMO, le numéro du bureau de poste et le montant de la transaction au médiateur Haveno ou à l'agent de remboursement afin qu'ils puissent vérifier les détails sur le site web de la poste américaine. \n\nSi vous ne fournissez pas les données de transaction requises, vous perdrez directement dans le différend. \n\nDans tous les cas de litige, l'expéditeur de l'USPMO assume à 100% la responsabilité lors de la fourniture de preuves / certification au médiateur ou à l'arbitre. \n\nSi vous ne comprenez pas ces exigences, veuillez ne pas échanger USPMO sur Haveno.
 
-payment.cashByMail.info=Le trading en cash-by-mail (CBM) sur Haveno nécessite que vous compreniez ce qui suit:\n\n● L'acheteur de BTC doit emballer l'argent liquide dans un sac d'argent inviolable.\n● L'acheteur de BTC doit filmer ou prendre des photos haute résolution du processus d'emballage en espèces avec l'adresse et le numéro de suivi déjà apposés sur l'emballage.\n● L'acheteur de BTC doit envoyer le colis en espèces au vendeur BTC avec une confirmation de livraison et une assurance appropriée.\n● Le vendeur de BTC doit filmer l'ouverture du colis, en s'assurant que le numéro de suivi fourni par l'expéditeur est visible dans la vidéo.\n● Le maker de l'offre doit indiquer toutes les conditions particulières dans le champ «Informations supplémentaires» du compte de paiement.\n● Le preneur de l'offre accepte les conditions générales du maker en acceptant l'offre.\n\nLes transactions CBM imposent la responsabilité d'agir honnêtement pour les deux pairs.\n\n● Les transactions CBM ont des actions moins vérifiables que les autres transactions Fiat. Cela rend la gestion des litiges beaucoup plus difficile.\n● Essayez de résoudre les litiges directement avec votre pair en utilisant le chat de trade. C'est la voie la plus prometteuse pour résoudre tout litige CBM.\n● Les médiateurs peuvent examiner votre cas et faire une suggestion, mais il n'est PAS garanti qu'ils puissent vous aider.\n● Si un médiateur est engagé et si un des pair rejette la suggestion du médiateur, les fonds des deux pairs seront envoyés à une adresse de «don» Haveno [LIEN:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], et le trade sera effectivement terminé.\n● Si un commerçant rejette une suggestion de médiation et ouvre un arbitrage, cela pourrait entraîner une perte à la fois des fonds de négociation et du dépôt.\n● Les arbitres prendront une décision sur la base des preuves qui leur auront été fournies. Par conséquent, veuillez suivre et rédiger un document sur  les processus ci-dessus pour avoir des preuves en cas de litige. Pour les transactions Cash by Mail, la décision des arbitres est définitive.\n● Les demandes de remboursement de fonds perdus résultant de transactions Cash By Mail avec le Haveno DAO ne seront PAS prises en compte.\n\nPour être sûr de bien comprendre les exigences des transactions en espèces par courrier, veuillez consulter:[LIEN:https://bisq.wiki/Cash_by_Mail]\n\nSi vous ne comprenez pas ces exigences, n'échangez pas en utilisant CBM sur Haveno.
+payment.payByMail.info=Le trading en pay-by-mail (PBM) sur Haveno nécessite que vous compreniez ce qui suit:\n\n● L'acheteur de BTC doit emballer l'argent liquide dans un sac d'argent inviolable.\n● L'acheteur de BTC doit filmer ou prendre des photos haute résolution du processus d'emballage en espèces avec l'adresse et le numéro de suivi déjà apposés sur l'emballage.\n● L'acheteur de BTC doit envoyer le colis en espèces au vendeur BTC avec une confirmation de livraison et une assurance appropriée.\n● Le vendeur de BTC doit filmer l'ouverture du colis, en s'assurant que le numéro de suivi fourni par l'expéditeur est visible dans la vidéo.\n● Le maker de l'offre doit indiquer toutes les conditions particulières dans le champ «Informations supplémentaires» du compte de paiement.\n● Le preneur de l'offre accepte les conditions générales du maker en acceptant l'offre.\n\nLes transactions PBM imposent la responsabilité d'agir honnêtement pour les deux pairs.\n\n● Les transactions PBM ont des actions moins vérifiables que les autres transactions Fiat. Cela rend la gestion des litiges beaucoup plus difficile.\n● Essayez de résoudre les litiges directement avec votre pair en utilisant le chat de trade. C'est la voie la plus prometteuse pour résoudre tout litige PBM.\n● Les médiateurs peuvent examiner votre cas et faire une suggestion, mais il n'est PAS garanti qu'ils puissent vous aider.\n● Si un médiateur est engagé et si un des pair rejette la suggestion du médiateur, les fonds des deux pairs seront envoyés à une adresse de «don» Haveno [LIEN:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], et le trade sera effectivement terminé.\n● Si un commerçant rejette une suggestion de médiation et ouvre un arbitrage, cela pourrait entraîner une perte à la fois des fonds de négociation et du dépôt.\n● Les arbitres prendront une décision sur la base des preuves qui leur auront été fournies. Par conséquent, veuillez suivre et rédiger un document sur  les processus ci-dessus pour avoir des preuves en cas de litige. Pour les transactions Pay by Mail, la décision des arbitres est définitive.\n● Les demandes de remboursement de fonds perdus résultant de transactions Pay By Mail avec le Haveno DAO ne seront PAS prises en compte.\n\nPour être sûr de bien comprendre les exigences des transactions en espèces par courrier, veuillez consulter:[LIEN:https://bisq.wiki/Cash_by_Mail]\n\nSi vous ne comprenez pas ces exigences, n'échangez pas en utilisant PBM sur Haveno.
 
-payment.cashByMail.contact=information de contact
-payment.cashByMail.contact.prompt=Nom ou nym à qui l'enveloppe devrait être addressée
+payment.payByMail.contact=information de contact
+payment.payByMail.contact.prompt=Nom ou nym à qui l'enveloppe devrait être addressée
 payment.f2f.contact=information de contact
 payment.f2f.contact.prompt=Comment voudriez-vous être contacté par le pair de trading? (addresse mail, numéro de téléphone,...)
 payment.f2f.city=Ville pour la rencontre en face à face
@@ -2009,7 +2009,7 @@ SAME_BANK=Transfert avec la même banque
 SPECIFIC_BANKS=Transferts avec des banques spécifiques
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Dépôt en espèces
-CASH_BY_MAIL=Cash via courrier
+PAY_BY_MAIL=Cash via courrier
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Face à face (en personne)
@@ -2027,7 +2027,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Dépôt en espèces
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=Cash via courrier
+PAY_BY_MAIL_SHORT=Cash via courrier
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties
index 1f0cdb2e..4acace68 100644
--- a/core/src/main/resources/i18n/displayStrings_it.properties
+++ b/core/src/main/resources/i18n/displayStrings_it.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=REQUISITO IMPORTANTE:\nDopo ave
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Invia {0} tramite \"Vaglia Postale Statunitense\" al venditore BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=sul tuo portafoglio {0}
 portfolio.pending.step3_seller.crypto={0}Controlla {1} se la transazione è indirizzata correttamente al tuo indirizzo di ricezione\n{2}\nha già sufficienti conferme sulla blockchain.\nL'importo del pagamento deve essere {3}\n\nPuoi copiare e incollare il tuo indirizzo {4} dalla schermata principale dopo aver chiuso questo popup.
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Poiché il pagamento viene effettuato tramite deposito in contanti, l'acquirente BTC deve scrivere \"NESSUN RIMBORSO\" sulla ricevuta cartacea, strapparlo in 2 parti e inviarti una foto via e-mail.\n\nPer evitare il rischio di storno, conferma solamente se hai ricevuto l'e-mail e se sei sicuro che la ricevuta cartacea sia valida.\nSe non sei sicuro, {0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=Informazioni di contatto
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=Informazioni di contatto
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informazioni di contatto
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Città per l'incontro 'Faccia a faccia'
@@ -2008,7 +2008,7 @@ SAME_BANK=Trasferimento con la stessa banca
 SPECIFIC_BANKS=Trasferimenti con banche specifiche
 US_POSTAL_MONEY_ORDER=Vaglia Postale USA
 CASH_DEPOSIT=Deposito contanti
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Faccia a faccia (di persona)
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Deposito contanti
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties
index 44aa0025..20f78047 100644
--- a/core/src/main/resources/i18n/displayStrings_ja.properties
+++ b/core/src/main/resources/i18n/displayStrings_ja.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=重要な要件: \n支払いが
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal={0}を「米国の郵便為替」でBTCの売り手に送付してください。\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=\"郵送で現金\"で、{0}をBTC売り手に送って下さい。詳細な指示はトレード契約書に書いてあります、そして分からない点があれば取引者チャットで質問できます。「郵送で現金」について詳しくはHavenoのWikiを参照：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n
+portfolio.pending.step2_buyer.payByMail=\"郵送で現金\"で、{0}をBTC売り手に送って下さい。詳細な指示はトレード契約書に書いてあります、そして分からない点があれば取引者チャットで質問できます。「郵送で現金」について詳しくはHavenoのWikiを参照：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=特定された支払い方法で{0}をBTCの売り手に支払ってお願いします。売り手のアカウント詳細は次の画面に表示されます。\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=あなたの{0}ウォレットで
 portfolio.pending.step3_seller.crypto={0}あなたの受け取りアドレスへのトランザクションが{1}かどうかを確認してください\n{2}\nはすでに十分なブロックチェーンの承認があります。\n支払い額は{3}です\n\nポップアップを閉じた後、メイン画面から{4}アドレスをコピーして貼り付けることができます。
 portfolio.pending.step3_seller.postal={0}\"米国の郵便為替\"でBTCの買い手から{1}を受け取ったか確認して下さい。
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}\"郵送で現金\"でBTCの買い手から{1}を受け取ったか確認して下さい。
+portfolio.pending.step3_seller.payByMail={0}\"郵送で現金\"でBTCの買い手から{1}を受け取ったか確認して下さい。
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=トレード相手は{0}の支払いを開始した確認をしました。\n\nオンラインバンキングのWebページにアクセスして、BTCの買い手から{1}を受け取ったか確認してください。
 portfolio.pending.step3_seller.cash=支払いは現金入金で行われるので、BTCの買い手は領収書に「返金無し(NO REFUND)」と記入し、2部に分けて写真を電子メールで送ってください。\n\nチャージバックのリスクを回避するために、Eメールを受信したかどうか、および領収書が有効であることが確実であるかどうかを確認してください。\nよくわからない場合は、{0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=Havenoでアメリカ合衆国郵便為替（USPMO）をトレードするには、以下を理解する必要があります：\n\n-送る前に、BTC買い手は必ずBTC売り手の名前を支払人そして支払先フィールド両方に書いて、追跡証明も含めるUSPMOそして封筒の高解像度写真を取る必要があります。\n-BTC買い手は必ず配達確認を利用してBTC売り手にUSPMOを送る必要があります。\n\n調停が必要になる場合、あるいはトレード係争が開始される場合、調停者や調停人がアメリカ合衆国郵便のサイトで詳細を確認できるように、取った写真、USPMOシリアル番号、郵便局番号、そしてドル金額を送る必要があります。\n\n調停者や調停人に必要な情報を提供しなければ、係争で不利な裁定を下されます。\n\n全ての係争には、調停者や調停人に証明を提供するのは100%USPMO送付者の責任です。\n\n以上の条件を理解しない場合、HavenoでUSPMOのトレードをしないで下さい。
 
-payment.cashByMail.info=Havenoで、郵送で現金（CBM)を利用してトレードするには、以下を理解する必要があります：\n● BTC買い手は現金を開封明示機構のある袋に入れるべき。\n● 送り先住所とトラッキング番号が袋に貼ってある状態で、包装過程の動画あるいはHD写真を取るべき。\n● 配達確認と保険を掛けて、BTC買い手はBTC売り手に袋を送るべき。\n● BTC売り手は送り手にもらったトラッキング番号が見えるように、袋の開梱の動画を撮影するべき。\n● オファーのメイカーは支払いアカウントの「追加情報」フィールドに特別な契約条件を述べるべき。\n● テイカーはオファーを受けることによってその契約条件に同意することを示す。\n\nCBMでトレードする場合では、正直に行動する責任は完全にトレードピアのみに負わされます。\n\n● 他の法定通貨トレードと比べて、CBTトレードには検証可能な行動は少ない。つまり、係争は処理しにくい。\n● 係争が発生した場合、取引者チャットで解決する方が一番効果的です。\n● 調停者が問題を検討し提案できますが、問題を解決できること保障されるものではない。\n● 調停者は取り組まれる場合、何れのトレードピアが調停者の提案を拒否したら両方のピアの資金はHavenoの寄付アドレス [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] まで送られ、トレードは事実上に終了されることになります。\n● 1人の取引者が調停者の提案を拒否して仲裁を開始したら、両方のトレードピアのトレードとデポジット金額両方は失われる可能性があります。\n● 調停人は提供される証拠に基づいて決定を下すので、前もって係争の場合の準備として、以上のトレードプロセスを記録して下さい。郵送で現金トレードの場合、調停人の決定は最終的なものです。\n● 郵送で現金トレードから失われた金額はHavenoのDAOから払い戻しできませんので、払い戻しリクエストは否定されます。\n\n以上の要件を十分に理解することを断言するため、Wikiを参照して下さい：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nこれらの要件を理解していない場合は、HavenoでCBMを利用してトレードしないで下さい。
+payment.payByMail.info=Havenoで、郵送で現金（PBM)を利用してトレードするには、以下を理解する必要があります：\n● BTC買い手は現金を開封明示機構のある袋に入れるべき。\n● 送り先住所とトラッキング番号が袋に貼ってある状態で、包装過程の動画あるいはHD写真を取るべき。\n● 配達確認と保険を掛けて、BTC買い手はBTC売り手に袋を送るべき。\n● BTC売り手は送り手にもらったトラッキング番号が見えるように、袋の開梱の動画を撮影するべき。\n● オファーのメイカーは支払いアカウントの「追加情報」フィールドに特別な契約条件を述べるべき。\n● テイカーはオファーを受けることによってその契約条件に同意することを示す。\n\nPBMでトレードする場合では、正直に行動する責任は完全にトレードピアのみに負わされます。\n\n● 他の法定通貨トレードと比べて、CBTトレードには検証可能な行動は少ない。つまり、係争は処理しにくい。\n● 係争が発生した場合、取引者チャットで解決する方が一番効果的です。\n● 調停者が問題を検討し提案できますが、問題を解決できること保障されるものではない。\n● 調停者は取り組まれる場合、何れのトレードピアが調停者の提案を拒否したら両方のピアの資金はHavenoの寄付アドレス [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction] まで送られ、トレードは事実上に終了されることになります。\n● 1人の取引者が調停者の提案を拒否して仲裁を開始したら、両方のトレードピアのトレードとデポジット金額両方は失われる可能性があります。\n● 調停人は提供される証拠に基づいて決定を下すので、前もって係争の場合の準備として、以上のトレードプロセスを記録して下さい。郵送で現金トレードの場合、調停人の決定は最終的なものです。\n● 郵送で現金トレードから失われた金額はHavenoのDAOから払い戻しできませんので、払い戻しリクエストは否定されます。\n\n以上の要件を十分に理解することを断言するため、Wikiを参照して下さい：[HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nこれらの要件を理解していない場合は、HavenoでPBMを利用してトレードしないで下さい。
 
-payment.cashByMail.contact=連絡情報
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=連絡情報
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=連絡情報
 payment.f2f.contact.prompt=トレードピアからどのように連絡を受け取りたいのでしょうか？（メールアドレス、電話番号…）
 payment.f2f.city=「対面」で会うための市区町村
@@ -2008,7 +2008,7 @@ SAME_BANK=同じ銀行での送金
 SPECIFIC_BANKS=特定銀行での送金
 US_POSTAL_MONEY_ORDER=米国郵便為替
 CASH_DEPOSIT=現金入金
-CASH_BY_MAIL=郵送で現金
+PAY_BY_MAIL=郵送で現金
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=対面（直接）
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=米国為替
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=現金入金
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=郵送で現金
+PAY_BY_MAIL_SHORT=郵送で現金
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties
index 1525ba19..72dfabb6 100644
--- a/core/src/main/resources/i18n/displayStrings_pt-br.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties
@@ -617,7 +617,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=IMPORTANTE:\nApós ter feito o
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Envie {0} através de \"US Postal Money Order\" para o vendedor de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -682,7 +682,7 @@ portfolio.pending.step3_seller.crypto.wallet=em sua carteira {0}
 portfolio.pending.step3_seller.crypto={0}Verifique em {1} se a transação para o seu endereço de recebimento\n{2}\njá tem confirmações suficientes na blockchain.\nA quantia do pagamento deve ser {3}\n\nVocê pode copiar e colar seu endereço {4} na janela principal, após fechar esse popup.
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Como o pagamento é realizado através de depósito de dinheiro em espécie, o comprador de BTC obrigatoriamente deve escrever \"SEM REEMBOLSO\" no comprovante de depósito, rasgá-lo em duas partes e enviar uma foto do comprovante para você por e-mail.\n\nPara reduzir a chance de um reembolso (restituição do valor depositado para o comprador), confirme apenas se você tiver recebido o e-mail e tiver certeza de que o comprovante de depósito é autêntico.\nSe você não tiver certeza, {0}
@@ -1981,10 +1981,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=Informações para contato
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=Informações para contato
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informações para contato
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Cidade para se encontrar 'Cara-a-cara'
@@ -2016,7 +2016,7 @@ SAME_BANK=Transferência para mesmo banco
 SPECIFIC_BANKS=Transferência com bancos específicos
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Depósito em dinheiro (cash deposit)
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Face a face (pessoalmente)
@@ -2034,7 +2034,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Depósito em dinheiro (cash deposit)
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties
index 29e52fd2..365d6c12 100644
--- a/core/src/main/resources/i18n/displayStrings_pt.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=REQUISITO IMPORTANTE:\nDepois d
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Por favor envie {0} por \"US Postal Money Order\" para o vendedor de BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=na sua carteira de {0}
 portfolio.pending.step3_seller.crypto={0} Por favor verifique {1} se a transação para o seu endereço recipiente\n{2}\njá possui confirmações suficientes da blockchain.\nA quantia de pagamento deve ser {3}\n\nVocê pode copiar e colar o seu endereço {4} do ecrã principal depois de fechar o pop-up.
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Como o pagamento é feito via Depósito em Dinheiro, o comprador do BTC deve escrever "SEM REEMBOLSO" no recibo de papel, rasgá-lo em 2 partes e enviar uma foto por e-mail.\n\nPara evitar o risco de estorno, confirme apenas se você recebeu o e-mail e se tiver certeza de que o recibo de papel é válido.\nSe você não tiver certeza, {0}
@@ -1971,10 +1971,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=Informação de contacto
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=Informação de contacto
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Informação de contacto
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Cidade para o encontro 'Face à face'
@@ -2006,7 +2006,7 @@ SAME_BANK=Transferência para mesmo banco
 SPECIFIC_BANKS=Transferência com banco escpecífico
 US_POSTAL_MONEY_ORDER=US Postal Money Order
 CASH_DEPOSIT=Depósito em dinheiro
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Face à face (em pessoa)
@@ -2024,7 +2024,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Depósito em dinheiro
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties
index 1397ab7d..52b25bb5 100644
--- a/core/src/main/resources/i18n/displayStrings_ru.properties
+++ b/core/src/main/resources/i18n/displayStrings_ru.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=ВАЖНОЕ ТРЕБОВАНИ
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Отправьте {0} \«Почтовым денежным переводом США\» продавцу BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=в вашем кошельке {0}
 portfolio.pending.step3_seller.crypto={0}Проверьте {1}, была ли транзакция в ваш адрес\n{2}\nподтверждена достаточное количество раз.\nСумма платежа должна составлять {3}.\n\n Вы можете скопировать и вставить свой адрес {4} из главного окна после закрытия этого окна.
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Так как оплата осуществляется наличными на счёт, покупатель BTC должен написать \«НЕ ПОДЛЕЖИТ ВОЗВРАТУ\» на квитанции, разорвать её на 2 части и отправить вам её фото по электронной почте.\n\nЧтобы избежать возврата платёжа, подтверждайте его получение только после получения этого фото, если вы не сомневаетесь в подлинности квитанции.\nЕсли вы не уверены, {0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=Контактная информация
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=Контактная информация
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=Контактная информация
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Город для личной встречи
@@ -2008,7 +2008,7 @@ SAME_BANK=Перевод в тот же банк
 SPECIFIC_BANKS=Перевод через определённый банк
 US_POSTAL_MONEY_ORDER=Почтовый денежный перевод США
 CASH_DEPOSIT=Внесение наличных
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Личная встреча
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=Денежный перевод США
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Внесение наличных
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties
index 7c8776df..042829b2 100644
--- a/core/src/main/resources/i18n/displayStrings_th.properties
+++ b/core/src/main/resources/i18n/displayStrings_th.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=ข้อกำหนดที
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=โปรดส่ง {0} โดยธนาณัติ \"US Postal Money Order \" ไปยังผู้ขาย BTC\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=ณ กระเป๋าสตา
 portfolio.pending.step3_seller.crypto={0}โปรดตรวจสอบ {1} หากการทำธุรกรรมส่วนที่อยู่รับของคุณ\n{2}\nมีการยืนยันบล็อกเชนแล้วเรียบร้อย\nยอดการชำระเงินต้องเป็น {3}\n\nคุณสามารถคัดลอกและวาง {4} ข้อมูลที่อยู่ของคุณได้จากหน้าจอหลักหลังจากปิดหน้าต่างป๊อปอัพ
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=เนื่องจากการชำระเงินผ่าน Cash Deposit (ฝากเงินสด) ผู้ซื้อ BTC จะต้องเขียน \"NO REFUND \" ในใบเสร็จรับเงินและให้แบ่งออกเป็น 2 ส่วนและส่งรูปถ่ายทางอีเมล\n\nเพื่อหลีกเลี่ยงความเสี่ยงจากการปฏิเสธการชำระเงิน  ให้ยืนยันเฉพาะถ้าคุณได้รับอีเมลและหากคุณแน่ใจว่าใบเสร็จถูกต้องแล้ว\nถ้าคุณไม่แน่ใจ {0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=ข้อมูลติดต่อ
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=ข้อมูลติดต่อ
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=ข้อมูลติดต่อ
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=เมืองสำหรับการประชุมแบบเห็นหน้ากัน
@@ -2008,7 +2008,7 @@ SAME_BANK=โอนเงินผ่านธนาคารเดียวก
 SPECIFIC_BANKS=การโอนเงินกับธนาคารเฉพาะ
 US_POSTAL_MONEY_ORDER=US Postal Money Order ใบสั่งซื้อทางไปรษณีย์ของสหรัฐฯ
 CASH_DEPOSIT=ฝากเงินสด
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=เห็นหน้ากัน (แบบตัวต่อตัว)
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=US Money Order ใบสั่งทางการ
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=ฝากเงินสด
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties
index 55410f90..6513e36e 100644
--- a/core/src/main/resources/i18n/displayStrings_vi.properties
+++ b/core/src/main/resources/i18n/displayStrings_vi.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=YÊU CẦU QUAN TRỌNG:\nSau k
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=Hãy gửi {0} bằng \"Phiếu chuyển tiền US\" cho người bán BTC.\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=Trên ví {0} của bạn
 portfolio.pending.step3_seller.crypto={0}Vui lòng kiểm tra {1} xem giao dịch tới địa chỉ nhận của bạn \n{2}\nđã nhận được đủ xác nhận blockchain hay chưa.\nSố tiền thanh toán phải là {3}\n\nBạn có thể copy & paste địa chỉ {4} của bạn từ màn hình chính sau khi đóng cửa sổ này.
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=Vì thanh toán được thực hiện qua Tiền gửi tiền mặt nên người mua BTC phải viết rõ \"KHÔNG HOÀN LẠI\" trên giấy biên nhận, xé làm 2 phần và gửi ảnh cho bạn qua email.\n\nĐể tránh bị đòi tiền lại, chỉ xác nhận bạn đã nhận được email và bạn chắc chắn giấy biên nhận là có hiệu lực.\nNếu bạn không chắc chắn, {0}
@@ -1975,10 +1975,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Haveno requires that you understand the following:\n\n- BTC buyers must write the BTC Seller’s name in both the Payer and the Payee’s fields & take a high-resolution photo of the USPMO and envelope with proof of tracking before sending.\n- BTC buyers must send the USPMO to the BTC seller with Delivery Confirmation.\n\nIn the event mediation is necessary, or if there is a trade dispute, you will be required to send the photos to the Haveno mediator or refund agent, together with the USPMO Serial Number, Post Office Number, and dollar amount, so they can verify the details on the US Post Office website.\n\nFailure to provide the required information to the Mediator or Arbitrator will result in losing the dispute case.\n\nIn all dispute cases, the USPMO sender bears 100% of the burden of responsibility in providing evidence/proof to the Mediator or Arbitrator.\n\nIf you do not understand these requirements, do not trade using USPMO on Haveno.
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=thông tin liên hệ
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=thông tin liên hệ
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=thông tin liên hệ
 payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...)
 payment.f2f.city=Thành phố để gặp mặt trực tiếp
@@ -2010,7 +2010,7 @@ SAME_BANK=Chuyển khoản cùng ngân hàng
 SPECIFIC_BANKS=Chuyển khoản với ngân hàng cụ thể
 US_POSTAL_MONEY_ORDER=Thư chuyển tiền US
 CASH_DEPOSIT=Tiền gửi tiền mặt
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=Western Union
 F2F=Giao dịch trực tiếp (gặp mặt)
@@ -2028,7 +2028,7 @@ US_POSTAL_MONEY_ORDER_SHORT=Thư chuyển tiền US
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=Tiền gửi tiền mặt
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
index 873af7f9..9e6ac24f 100644
--- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=重要要求：\n完成支付
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=请用“美国邮政汇票”发送 {0} 给 BTC 卖家。\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=在您的 {0} 钱包
 portfolio.pending.step3_seller.crypto={0} 请检查 {1} 是否交易已经到您的接收地址\n{2}\n已经有足够的区块链确认了\n支付金额必须为 {3}\n\n关闭该弹出窗口后，您可以从主界面复制并粘贴 {4} 地址。
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=因为付款是通过现金存款完成的，BTC 买家必须在纸质收据上写“不退款”，将其撕成2份，并通过电子邮件向您发送照片。\n\n为避免退款风险，请仅确认您是否收到电子邮件，如果您确定收据有效。\n如果您不确定，{0}
@@ -1977,10 +1977,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=在 Haveno 上交易  US Postal Money Orders （USPMO）您必须理解下述条款：\n\n- BTC 买方必须在发送方和收款人字段中都写上 BTC 卖方的名称，并在发送之前对 USPMO 和信封进行高分辨率照片拍照，并带有跟踪证明。\n- BTC 买方必须将 USPMO 连同交货确认书一起发送给 BTC 卖方。\n\n如果需要调解，或有交易纠纷，您将需要将照片连同 USPMO 编号，邮局编号和交易金额一起发送给 Haveno 调解员或退款代理，以便他们进行验证美国邮局网站上的详细信息。\n\n如未能提供要求的交易数据将在纠纷中直接判负\n\n在所有争议案件中，USPMO 发送方在向调解人或仲裁员提供证据/证明时承担 100％ 的责任。\n\n如果您不理解这些要求，请不要在 Haveno 上使用 USPMO 进行交易。
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=联系方式
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=联系方式
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=联系方式
 payment.f2f.contact.prompt=您希望如何与交易伙伴联系？（电子邮箱、电话号码、…）
 payment.f2f.city=“面对面”会议的城市
@@ -2012,7 +2012,7 @@ SAME_BANK=同银行转账
 SPECIFIC_BANKS=转到指定银行
 US_POSTAL_MONEY_ORDER=美国邮政汇票
 CASH_DEPOSIT=现金/ATM 存款
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=西联汇款
 F2F=面对面（当面交易）
@@ -2030,7 +2030,7 @@ US_POSTAL_MONEY_ORDER_SHORT=美国汇票
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=现金/ATM 存款
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
index 9248d41e..bdef0eb4 100644
--- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
@@ -614,7 +614,7 @@ portfolio.pending.step2_buyer.westernUnion.extra=重要要求：\n完成支付
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.postal=請用“美國郵政匯票”發送 {0} 給 BTC 賣家。\n\n
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step2_buyer.cashByMail=Please send {0} using \"Cash by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Cash by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
+portfolio.pending.step2_buyer.payByMail=Please send {0} using \"Pay by Mail\" to the BTC seller. Specific instructions are in the trade contract, or if unclear you may ask questions via trader chat. See more details about Pay by Mail on the Haveno wiki [HYPERLINK:https://bisq.wiki/Cash_by_Mail].\n\n
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2_buyer.pay=Please pay {0} via the specified payment method to the BTC seller. You''ll find the seller's account details on the next screen.\n\n
 # suppress inspection "TrailingSpacesInProperty"
@@ -679,7 +679,7 @@ portfolio.pending.step3_seller.crypto.wallet=在您的 {0} 錢包
 portfolio.pending.step3_seller.crypto={0} 請檢查 {1} 是否交易已經到您的接收地址\n{2}\n已經有足夠的區塊鏈確認了\n支付金額必須為 {3}\n\n關閉該彈出窗口後，您可以從主界面複製並粘貼 {4} 地址。
 portfolio.pending.step3_seller.postal={0}Please check if you have received {1} with \"US Postal Money Order\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
-portfolio.pending.step3_seller.cashByMail={0}Please check if you have received {1} with \"Cash by Mail\" from the BTC buyer.
+portfolio.pending.step3_seller.payByMail={0}Please check if you have received {1} with \"Pay by Mail\" from the BTC buyer.
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step3_seller.bank=Your trading partner has confirmed that they have initiated the {0} payment.\n\nPlease go to your online banking web page and check if you have received {1} from the BTC buyer.
 portfolio.pending.step3_seller.cash=因為付款是通過現金存款完成的，BTC 買家必須在紙質收據上寫“不退款”，將其撕成2份，並通過電子郵件向您發送照片。\n\n為避免退款風險，請僅確認您是否收到電子郵件，如果您確定收據有效。\n如果您不確定，{0}
@@ -1973,10 +1973,10 @@ payment.amazonGiftCard.upgrade.headLine=Update Amazon Gift Card account
 
 payment.usPostalMoneyOrder.info=在 Haveno 上交易  US Postal Money Orders （USPMO）您必須理解下述條款：\n\n- BTC 買方必須在發送方和收款人字段中都寫上 BTC 賣方的名稱，並在發送之前對 USPMO 和信封進行高分辨率照片拍照，並帶有跟蹤證明。\n- BTC 買方必須將 USPMO 連同交貨確認書一起發送給 BTC 賣方。\n\n如果需要調解，或有交易糾紛，您將需要將照片連同 USPMO 編號，郵局編號和交易金額一起發送給 Haveno 調解員或退款代理，以便他們進行驗證美國郵局網站上的詳細信息。\n\n如未能提供要求的交易數據將在糾紛中直接判負\n\n在所有爭議案件中，USPMO 發送方在向調解人或仲裁員提供證據/證明時承擔 100％ 的責任。\n\n如果您不理解這些要求，請不要在 Haveno 上使用 USPMO 進行交易。
 
-payment.cashByMail.info=Trading using cash-by-mail (CBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nCBM trades put the onus to act honestly squarely on both peers.\n\n● CBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any CBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Cash by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Cash By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of cash-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using CBM on Haveno.
+payment.payByMail.info=Trading using pay-by-mail (PBM) on Haveno requires that you understand the following:\n\n● BTC buyer should package cash in a tamper-evident cash bag.\n● BTC buyer should film or take high-resolution photos of the cash packaging process with the address & tracking number already affixed to packaging.\n● BTC buyer should send the cash package to the BTC seller with Delivery Confirmation and appropriate Insurance.\n● BTC seller should film the opening of the package, making sure that the tracking number provided by the sender is visible in the video.\n● Offer maker must state any special terms or conditions in the 'Additional Information' field of the payment account.\n● Offer taker agrees to the offer maker's terms and conditions by taking the offer.\n\nPBM trades put the onus to act honestly squarely on both peers.\n\n● PBM trades have less verifiable actions than other traditional trades. This makes handling dispute much harder.\n● Try to resolve disputes directly with your peer using trader chat. This is your most promising route to solving any PBM dispute.\n● Mediators can consider your case and make a suggestion, but they are NOT guaranteed to help.\n● If a mediator is engaged, and if either peer rejects the mediator's suggestion, both peers' funds will be sent to a Haveno 'donation' address [HYPERLINK:https://bisq.wiki/Arbitration#Time-Locked_Payout_Transaction], and the trade will effectively be completed.\n● If a trader rejects a mediation suggestion and opens arbitration, it could lead to a loss of both the trading and the deposit funds.\n● Arbitrators will make a decision based on the evidence provided to them. Therefore, please follow and document the above processes to have evidence in case of dispute. For Pay by Mail trades the Arbitrators decision is final.\n● Reimbursement requests any lost funds resulting from Pay By Mail trades to the Haveno DAO will NOT be considered.\n\nTo be sure you fully understand the requirements of pay-by-mail trades, please see: [HYPERLINK:https://bisq.wiki/Cash_by_Mail]\n\nIf you do not understand these requirements, do not trade using PBM on Haveno.
 
-payment.cashByMail.contact=聯繫方式
-payment.cashByMail.contact.prompt=Name or nym envelope should be addressed to
+payment.payByMail.contact=聯繫方式
+payment.payByMail.contact.prompt=Name or nym envelope should be addressed to
 payment.f2f.contact=聯繫方式
 payment.f2f.contact.prompt=您希望如何與交易夥伴聯繫？（電子郵箱、電話號碼、…）
 payment.f2f.city=“面對面”會議的城市
@@ -2008,7 +2008,7 @@ SAME_BANK=同銀行轉賬
 SPECIFIC_BANKS=轉到指定銀行
 US_POSTAL_MONEY_ORDER=美國郵政匯票
 CASH_DEPOSIT=現金/ATM 存款
-CASH_BY_MAIL=Cash By Mail
+PAY_BY_MAIL=Pay By Mail
 MONEY_GRAM=MoneyGram
 WESTERN_UNION=西聯匯款
 F2F=面對面（當面交易）
@@ -2026,7 +2026,7 @@ US_POSTAL_MONEY_ORDER_SHORT=美國匯票
 # suppress inspection "UnusedProperty"
 CASH_DEPOSIT_SHORT=現金/ATM 存款
 # suppress inspection "UnusedProperty"
-CASH_BY_MAIL_SHORT=CashByMail
+PAY_BY_MAIL_SHORT=PayByMail
 # suppress inspection "UnusedProperty"
 MONEY_GRAM_SHORT=MoneyGram
 # suppress inspection "UnusedProperty"
diff --git a/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashByMailForm.java b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PayByMailForm.java
similarity index 81%
rename from desktop/src/main/java/haveno/desktop/components/paymentmethods/CashByMailForm.java
rename to desktop/src/main/java/haveno/desktop/components/paymentmethods/PayByMailForm.java
index 4df92672..7305cd58 100644
--- a/desktop/src/main/java/haveno/desktop/components/paymentmethods/CashByMailForm.java
+++ b/desktop/src/main/java/haveno/desktop/components/paymentmethods/PayByMailForm.java
@@ -22,9 +22,9 @@ import haveno.core.account.witness.AccountAgeWitnessService;
 import haveno.core.locale.CurrencyUtil;
 import haveno.core.locale.Res;
 import haveno.core.locale.TradeCurrency;
-import haveno.core.payment.CashByMailAccount;
+import haveno.core.payment.PayByMailAccount;
 import haveno.core.payment.PaymentAccount;
-import haveno.core.payment.payload.CashByMailAccountPayload;
+import haveno.core.payment.payload.PayByMailAccountPayload;
 import haveno.core.payment.payload.PaymentAccountPayload;
 import haveno.core.util.coin.CoinFormatter;
 import haveno.core.util.validation.InputValidator;
@@ -40,13 +40,13 @@ import static haveno.desktop.util.FormBuilder.addInputTextField;
 import static haveno.desktop.util.FormBuilder.addTopLabelTextArea;
 import static haveno.desktop.util.FormBuilder.addTopLabelTextFieldWithCopyIcon;
 
-public class CashByMailForm extends PaymentMethodForm {
-    private final CashByMailAccount cashByMailAccount;
+public class PayByMailForm extends PaymentMethodForm {
+    private final PayByMailAccount payByMailAccount;
     private TextArea postalAddressTextArea;
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
-        CashByMailAccountPayload cbm = (CashByMailAccountPayload) paymentAccountPayload;
+        PayByMailAccountPayload cbm = (PayByMailAccountPayload) paymentAccountPayload;
         addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1,
                 Res.get("payment.account.owner"),
                 cbm.getHolderName(),
@@ -64,11 +64,11 @@ public class CashByMailForm extends PaymentMethodForm {
         return gridRow;
     }
 
-    public CashByMailForm(PaymentAccount paymentAccount,
+    public PayByMailForm(PaymentAccount paymentAccount,
                                   AccountAgeWitnessService accountAgeWitnessService,
                                   InputValidator inputValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) {
         super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter);
-        this.cashByMailAccount = (CashByMailAccount) paymentAccount;
+        this.payByMailAccount = (PayByMailAccount) paymentAccount;
     }
 
     @Override
@@ -79,11 +79,11 @@ public class CashByMailForm extends PaymentMethodForm {
         currencyComboBox.setItems(FXCollections.observableArrayList(CurrencyUtil.getAllSortedTraditionalCurrencies()));
 
         InputTextField contactField = addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.cashByMail.contact"));
-        contactField.setPromptText(Res.get("payment.cashByMail.contact.prompt"));
+                Res.get("payment.payByMail.contact"));
+        contactField.setPromptText(Res.get("payment.payByMail.contact.prompt"));
         contactField.setValidator(inputValidator);
         contactField.textProperty().addListener((ov, oldValue, newValue) -> {
-            cashByMailAccount.setContact(newValue);
+            payByMailAccount.setContact(newValue);
             updateFromInputs();
         });
 
@@ -91,16 +91,16 @@ public class CashByMailForm extends PaymentMethodForm {
                 Res.get("payment.postal.address"), "").second;
         postalAddressTextArea.setMinHeight(70);
         postalAddressTextArea.textProperty().addListener((ov, oldValue, newValue) -> {
-            cashByMailAccount.setPostalAddress(newValue);
+            payByMailAccount.setPostalAddress(newValue);
             updateFromInputs();
         });
 
         TextArea extraTextArea = addTopLabelTextArea(gridPane, ++gridRow,
-                Res.get("payment.shared.optionalExtra"), Res.get("payment.cashByMail.extraInfo.prompt")).second;
+                Res.get("payment.shared.optionalExtra"), Res.get("payment.payByMail.extraInfo.prompt")).second;
         extraTextArea.setMinHeight(70);
         ((JFXTextArea) extraTextArea).setLabelFloat(false);
         extraTextArea.textProperty().addListener((ov, oldValue, newValue) -> {
-            cashByMailAccount.setExtraInfo(newValue);
+            payByMailAccount.setExtraInfo(newValue);
             updateFromInputs();
         });
 
@@ -110,7 +110,7 @@ public class CashByMailForm extends PaymentMethodForm {
 
     @Override
     protected void autoFillNameTextField() {
-        setAccountNameWithString(cashByMailAccount.getContact());
+        setAccountNameWithString(payByMailAccount.getContact());
     }
 
     @Override
@@ -118,21 +118,21 @@ public class CashByMailForm extends PaymentMethodForm {
         gridRowFrom = gridRow;
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
-                Res.get(cashByMailAccount.getPaymentMethod().getId()));
+                Res.get(payByMailAccount.getPaymentMethod().getId()));
 
         TradeCurrency tradeCurrency = paymentAccount.getSingleTradeCurrency();
         String nameAndCode = tradeCurrency != null ? tradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
 
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.f2f.contact"),
-                cashByMailAccount.getContact());
+                payByMailAccount.getContact());
         TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second;
-        textArea.setText(cashByMailAccount.getPostalAddress());
+        textArea.setText(payByMailAccount.getPostalAddress());
         textArea.setMinHeight(70);
         textArea.setEditable(false);
 
         TextArea textAreaExtra = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.shared.extraInfo"), "").second;
-        textAreaExtra.setText(cashByMailAccount.getExtraInfo());
+        textAreaExtra.setText(payByMailAccount.getExtraInfo());
         textAreaExtra.setMinHeight(70);
         textAreaExtra.setEditable(false);
 
@@ -142,8 +142,8 @@ public class CashByMailForm extends PaymentMethodForm {
     @Override
     public void updateAllInputsValid() {
         allInputsValid.set(isAccountNameValid()
-                && !cashByMailAccount.getPostalAddress().isEmpty()
-                && inputValidator.validate(cashByMailAccount.getContact()).isValid
+                && !payByMailAccount.getPostalAddress().isEmpty()
+                && inputValidator.validate(payByMailAccount.getContact()).isValid
                 && paymentAccount.getSingleTradeCurrency() != null);
     }
 }
diff --git a/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java b/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java
index 6cf19f23..aef3d182 100644
--- a/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java
+++ b/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsView.java
@@ -26,7 +26,7 @@ import haveno.core.locale.Res;
 import haveno.core.offer.OfferRestrictions;
 import haveno.core.payment.AmazonGiftCardAccount;
 import haveno.core.payment.AustraliaPayidAccount;
-import haveno.core.payment.CashByMailAccount;
+import haveno.core.payment.PayByMailAccount;
 import haveno.core.payment.CashDepositAccount;
 import haveno.core.payment.ZelleAccount;
 import haveno.core.payment.F2FAccount;
@@ -72,7 +72,7 @@ import haveno.desktop.components.paymentmethods.AmazonGiftCardForm;
 import haveno.desktop.components.paymentmethods.AustraliaPayidForm;
 import haveno.desktop.components.paymentmethods.BizumForm;
 import haveno.desktop.components.paymentmethods.CapitualForm;
-import haveno.desktop.components.paymentmethods.CashByMailForm;
+import haveno.desktop.components.paymentmethods.PayByMailForm;
 import haveno.desktop.components.paymentmethods.CashDepositForm;
 import haveno.desktop.components.paymentmethods.CelPayForm;
 import haveno.desktop.components.paymentmethods.ChaseQuickPayForm;
@@ -262,9 +262,9 @@ public class TraditionalAccountsView extends PaymentAccountsView<GridPane, Tradi
                     .actionButtonText(Res.get("shared.iUnderstand"))
                     .onAction(() -> doSaveNewAccount(paymentAccount))
                     .show();
-        } else if (paymentAccount instanceof CashByMailAccount) {
-            // CashByMail has no chargeback risk so we don't show the text from payment.limits.info.
-            new Popup().information(Res.get("payment.cashByMail.info"))
+        } else if (paymentAccount instanceof PayByMailAccount) {
+            // PayByMail has no chargeback risk so we don't show the text from payment.limits.info.
+            new Popup().information(Res.get("payment.payByMail.info"))
                     .width(850)
                     .closeButtonText(Res.get("shared.cancel"))
                     .actionButtonText(Res.get("shared.iUnderstand"))
@@ -557,8 +557,8 @@ public class TraditionalAccountsView extends PaymentAccountsView<GridPane, Tradi
                 return new WesternUnionForm(paymentAccount, accountAgeWitnessService, inputValidator, root, gridRow, formatter);
             case PaymentMethod.CASH_DEPOSIT_ID:
                 return new CashDepositForm(paymentAccount, accountAgeWitnessService, inputValidator, root, gridRow, formatter);
-            case PaymentMethod.CASH_BY_MAIL_ID:
-                return new CashByMailForm(paymentAccount, accountAgeWitnessService, inputValidator, root, gridRow, formatter);
+            case PaymentMethod.PAY_BY_MAIL_ID:
+                return new PayByMailForm(paymentAccount, accountAgeWitnessService, inputValidator, root, gridRow, formatter);
             case PaymentMethod.HAL_CASH_ID:
                 return new HalCashForm(paymentAccount, accountAgeWitnessService, halCashValidator, inputValidator, root, gridRow, formatter);
             case PaymentMethod.F2F_ID:
diff --git a/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java
index c8d41241..e77c8165 100644
--- a/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java
+++ b/desktop/src/main/java/haveno/desktop/main/offer/takeoffer/TakeOfferView.java
@@ -160,7 +160,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
     private int gridRow = 0;
     private final HashMap<String, Boolean> paymentAccountWarningDisplayed = new HashMap<>();
     private boolean offerDetailsWindowDisplayed, zelleWarningDisplayed, fasterPaymentsWarningDisplayed,
-            takeOfferFromUnsignedAccountWarningDisplayed, cashByMailWarningDisplayed;
+            takeOfferFromUnsignedAccountWarningDisplayed, payByMailWarningDisplayed;
     private SimpleBooleanProperty errorPopupDisplayed;
     private ChangeListener<Boolean> amountFocusedListener, getShowWalletFundedNotificationListener;
 
@@ -267,7 +267,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
         maybeShowZelleWarning(lastPaymentAccount);
         maybeShowFasterPaymentsWarning(lastPaymentAccount);
         maybeShowAccountWarning(lastPaymentAccount, model.dataModel.isBuyOffer());
-        maybeShowCashByMailWarning(lastPaymentAccount, model.dataModel.getOffer());
+        maybeShowPayByMailWarning(lastPaymentAccount, model.dataModel.getOffer());
 
         if (!model.isRange()) {
             nextButton.setVisible(false);
@@ -1118,13 +1118,13 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
         OfferViewUtil.showPaymentAccountWarning(msgKey, paymentAccountWarningDisplayed);
     }
 
-    private void maybeShowCashByMailWarning(PaymentAccount paymentAccount, Offer offer) {
-        if (paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.CASH_BY_MAIL_ID) &&
-                !cashByMailWarningDisplayed && !offer.getExtraInfo().isEmpty()) {
-            cashByMailWarningDisplayed = true;
+    private void maybeShowPayByMailWarning(PaymentAccount paymentAccount, Offer offer) {
+        if (paymentAccount.getPaymentMethod().getId().equals(PaymentMethod.PAY_BY_MAIL_ID) &&
+                !payByMailWarningDisplayed && !offer.getExtraInfo().isEmpty()) {
+            payByMailWarningDisplayed = true;
             UserThread.runAfter(() -> {
                 new GenericMessageWindow()
-                        .preamble(Res.get("payment.cashByMail.tradingRestrictions"))
+                        .preamble(Res.get("payment.payByMail.tradingRestrictions"))
                         .instruction(offer.getExtraInfo())
                         .actionButtonText(Res.get("shared.iConfirm"))
                         .closeButtonText(Res.get("shared.close"))
diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java
index 11c69d25..6d5f2177 100644
--- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java
+++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java
@@ -174,7 +174,7 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
         List<String> acceptedCountryCodes = offer.getAcceptedCountryCodes();
         boolean showAcceptedCountryCodes = acceptedCountryCodes != null && !acceptedCountryCodes.isEmpty();
         boolean isF2F = offer.getPaymentMethod().equals(PaymentMethod.F2F);
-        boolean showExtraInfo = offer.getPaymentMethod().equals(PaymentMethod.F2F) || offer.getPaymentMethod().equals(PaymentMethod.CASH_BY_MAIL);
+        boolean showExtraInfo = offer.getPaymentMethod().equals(PaymentMethod.F2F) || offer.getPaymentMethod().equals(PaymentMethod.PAY_BY_MAIL);
         if (!takeOfferHandlerOptional.isPresent())
             rows++;
         if (showAcceptedBanks)
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
index a50f7d68..6c3182c0 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
@@ -27,12 +27,12 @@ import haveno.core.offer.Offer;
 import haveno.core.payment.PaymentAccount;
 import haveno.core.payment.PaymentAccountUtil;
 import haveno.core.payment.payload.AssetAccountPayload;
-import haveno.core.payment.payload.CashByMailAccountPayload;
 import haveno.core.payment.payload.CashDepositAccountPayload;
 import haveno.core.payment.payload.F2FAccountPayload;
 import haveno.core.payment.payload.FasterPaymentsAccountPayload;
 import haveno.core.payment.payload.HalCashAccountPayload;
 import haveno.core.payment.payload.MoneyGramAccountPayload;
+import haveno.core.payment.payload.PayByMailAccountPayload;
 import haveno.core.payment.payload.PaymentAccountPayload;
 import haveno.core.payment.payload.PaymentMethod;
 import haveno.core.payment.payload.SwiftAccountPayload;
@@ -51,7 +51,7 @@ import haveno.desktop.components.paymentmethods.AmazonGiftCardForm;
 import haveno.desktop.components.paymentmethods.AssetsForm;
 import haveno.desktop.components.paymentmethods.BizumForm;
 import haveno.desktop.components.paymentmethods.CapitualForm;
-import haveno.desktop.components.paymentmethods.CashByMailForm;
+import haveno.desktop.components.paymentmethods.PayByMailForm;
 import haveno.desktop.components.paymentmethods.CashDepositForm;
 import haveno.desktop.components.paymentmethods.CelPayForm;
 import haveno.desktop.components.paymentmethods.ChaseQuickPayForm;
@@ -292,8 +292,8 @@ public class BuyerStep2View extends TradeStepView {
             case PaymentMethod.CASH_DEPOSIT_ID:
                 gridRow = CashDepositForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload);
                 break;
-            case PaymentMethod.CASH_BY_MAIL_ID:
-                gridRow = CashByMailForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload);
+            case PaymentMethod.PAY_BY_MAIL_ID:
+                gridRow = PayByMailForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload);
                 break;
             case PaymentMethod.MONEY_GRAM_ID:
                 gridRow = MoneyGramForm.addFormForBuyer(gridPane, gridRow, paymentAccountPayload);
@@ -617,7 +617,7 @@ public class BuyerStep2View extends TradeStepView {
                         Res.get("portfolio.pending.step2_buyer.fasterPaymentsHolderNameInfo") + "\n\n" +
                         refTextWarn + "\n\n" +
                         fees;
-            } else if (paymentAccountPayload instanceof CashByMailAccountPayload ||
+            } else if (paymentAccountPayload instanceof PayByMailAccountPayload ||
                     paymentAccountPayload instanceof HalCashAccountPayload) {
                 message += Res.get("portfolio.pending.step2_buyer.pay", amount);
             } else if (paymentAccountPayload instanceof SwiftAccountPayload) {
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
index 58d845b0..b28307f0 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
@@ -28,7 +28,7 @@ import haveno.core.payment.PaymentAccountUtil;
 import haveno.core.payment.payload.AmazonGiftCardAccountPayload;
 import haveno.core.payment.payload.AssetAccountPayload;
 import haveno.core.payment.payload.BankAccountPayload;
-import haveno.core.payment.payload.CashByMailAccountPayload;
+import haveno.core.payment.payload.PayByMailAccountPayload;
 import haveno.core.payment.payload.CashDepositAccountPayload;
 import haveno.core.payment.payload.F2FAccountPayload;
 import haveno.core.payment.payload.HalCashAccountPayload;
@@ -400,8 +400,8 @@ public class SellerStep3View extends TradeStepView {
         } else {
             if (paymentAccountPayload instanceof USPostalMoneyOrderAccountPayload) {
                 message = Res.get("portfolio.pending.step3_seller.postal", part1, tradeVolumeWithCode);
-            } else if (paymentAccountPayload instanceof CashByMailAccountPayload) {
-                    message = Res.get("portfolio.pending.step3_seller.cashByMail", part1, tradeVolumeWithCode);
+            } else if (paymentAccountPayload instanceof PayByMailAccountPayload) {
+                    message = Res.get("portfolio.pending.step3_seller.payByMail", part1, tradeVolumeWithCode);
             } else if (!(paymentAccountPayload instanceof WesternUnionAccountPayload) &&
                     !(paymentAccountPayload instanceof HalCashAccountPayload) &&
                     !(paymentAccountPayload instanceof F2FAccountPayload) &&
diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto
index da71e8b0..cddf8be0 100644
--- a/proto/src/main/proto/pb.proto
+++ b/proto/src/main/proto/pb.proto
@@ -848,7 +848,7 @@ message PaymentAccountPayload {
         TransferwiseAccountPayload Transferwise_account_payload = 29;
         AustraliaPayidPayload australia_payid_payload = 30;
         AmazonGiftCardAccountPayload amazon_gift_card_account_payload = 31;
-        CashByMailAccountPayload cash_by_mail_account_payload = 32;
+        PayByMailAccountPayload pay_by_mail_account_payload = 32;
         CapitualAccountPayload capitual_account_payload = 33;
         PayseraAccountPayload Paysera_account_payload = 34;
         PaxumAccountPayload Paxum_account_payload = 35;
@@ -1106,7 +1106,7 @@ message PaytmAccountPayload {
     string email_or_mobile_nr = 1;
 }
 
-message CashByMailAccountPayload {
+message PayByMailAccountPayload {
     string postal_address = 1;
     string contact = 2;
     string extra_info = 3;