diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
index 5261676e23..002c5907e1 100644
--- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
+++ b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
@@ -597,11 +597,11 @@ public class AccountAgeWitnessService {
         // TOLERATED_SMALL_TRADE_AMOUNT (0.01 BTC) and only in that case return false.
         return findWitness(offer)
                 .map(witness -> verifyPeersTradeLimit(offer, tradeAmount, witness, new Date(), errorMessageHandler))
-                .orElse(isToleratedSmalleAmount(tradeAmount));
+                .orElse(isToleratedSmallestAmount(tradeAmount));
     }
 
-    private boolean isToleratedSmalleAmount(Coin tradeAmount) {
-        return tradeAmount.value <= OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value;
+    private boolean isToleratedSmallestAmount(Coin tradeAmount) {
+        return tradeAmount.value >= OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value;
     }
 
 
diff --git a/core/src/main/java/bisq/core/payment/SbpAccount.java b/core/src/main/java/bisq/core/payment/SbpAccount.java
index 50be0237a1..78ab512ab7 100644
--- a/core/src/main/java/bisq/core/payment/SbpAccount.java
+++ b/core/src/main/java/bisq/core/payment/SbpAccount.java
@@ -67,12 +67,4 @@ public final class SbpAccount extends PaymentAccount {
     public String getBankName() {
         return ((SbpAccountPayload) paymentAccountPayload).getBankName();
     }
-
-    public void setHolderName(String holderName) {
-        ((SbpAccountPayload) paymentAccountPayload).setHolderName(holderName);
-    }
-
-    public String getHolderName() {
-        return ((SbpAccountPayload) paymentAccountPayload).getHolderName();
-    }
 }
diff --git a/core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java
index f8600ab36a..c54862b1a0 100644
--- a/core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java
@@ -101,7 +101,7 @@ public final class AustraliaPayidAccountPayload extends PaymentAccountPayload {
     public String getPaymentDetailsForTradePopup() {
         return
                 Res.get("payment.australia.payid") + ": " + payid + "\n" +
-                        Res.get("payment.account.owner") + ": " + bankAccountName;
+                        Res.get("payment.account.owner.fullname") + ": " + bankAccountName;
     }
 
 
diff --git a/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java
index 31a086a60e..1d7eae1688 100644
--- a/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java
@@ -131,7 +131,7 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo
         String holderTaxIdString = BankUtil.isHolderIdRequired(countryCode) ?
                 (BankUtil.getHolderIdLabel(countryCode) + ": " + holderTaxId + "\n") : "";
 
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 bankName +
                 bankId +
                 branchId +
diff --git a/core/src/main/java/bisq/core/payment/payload/CashByMailAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CashByMailAccountPayload.java
index 2971f9d731..488e91acb0 100644
--- a/core/src/main/java/bisq/core/payment/payload/CashByMailAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/CashByMailAccountPayload.java
@@ -95,14 +95,14 @@ public final class CashByMailAccountPayload extends PaymentAccountPayload implem
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + contact + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + contact + ", " +
                 Res.getWithCol("payment.postal.address") + " " + postalAddress + ", " +
                 Res.getWithCol("payment.shared.extraInfo") + " " + extraInfo;
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + contact + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + contact + "\n" +
                 Res.getWithCol("payment.postal.address") + " " + postalAddress;
     }
 
diff --git a/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java
index 344c5b7dc1..85bafc6e80 100644
--- a/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java
@@ -162,7 +162,7 @@ public class CashDepositAccountPayload extends BankAccountPayload {
         String emailString = holderEmail != null ?
                 (Res.getWithCol("payment.email") + " " + holderEmail + "\n") : "";
 
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 emailString +
                 bankName +
                 bankId +
diff --git a/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java
index a47d05f675..8135127bfc 100644
--- a/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java
@@ -93,13 +93,13 @@ public final class ChaseQuickPayAccountPayload extends PaymentAccountPayload imp
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.get("payment.email") + " " + email;
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 Res.getWithCol("payment.email") + " " + email;
     }
 
diff --git a/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java
index f437d5d672..8bfa60f228 100644
--- a/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java
@@ -90,13 +90,13 @@ public final class ClearXchangeAccountPayload extends PaymentAccountPayload impl
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.getWithCol("payment.emailOrMobile") + " " + emailOrMobileNr;
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 Res.getWithCol("payment.emailOrMobile") + " " + emailOrMobileNr;
     }
 
diff --git a/core/src/main/java/bisq/core/payment/payload/DomesticWireTransferAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/DomesticWireTransferAccountPayload.java
index f3bba3223e..983cbc867a 100644
--- a/core/src/main/java/bisq/core/payment/payload/DomesticWireTransferAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/DomesticWireTransferAccountPayload.java
@@ -110,7 +110,7 @@ public final class DomesticWireTransferAccountPayload extends BankAccountPayload
     @Override
     public String getPaymentDetails() {
         String paymentDetails = (Res.get(paymentMethodId) + " - " +
-                Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+                Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 BankUtil.getBankNameLabel(countryCode) + ": " + this.bankName + ", " +
                 BankUtil.getBranchIdLabel(countryCode) + ": " + this.branchId + ", " +
                 BankUtil.getAccountNrLabel(countryCode) + ": " + this.accountNr);
diff --git a/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java
index 1c14c47faf..7c3fa3a965 100644
--- a/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java
@@ -112,7 +112,7 @@ public final class FasterPaymentsAccountPayload extends PaymentAccountPayload {
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return (getHolderName().isEmpty() ? "" : Res.getWithCol("payment.account.owner") + " " + getHolderName() + "\n") +
+        return (getHolderName().isEmpty() ? "" : Res.getWithCol("payment.account.owner.fullname") + " " + getHolderName() + "\n") +
                 "UK Sort code: " + sortCode + "\n" +
                 Res.getWithCol("payment.accountNr") + " " + accountNr;
     }
diff --git a/core/src/main/java/bisq/core/payment/payload/IfscBasedAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/IfscBasedAccountPayload.java
index 12945c335f..7ca10ee360 100644
--- a/core/src/main/java/bisq/core/payment/payload/IfscBasedAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/IfscBasedAccountPayload.java
@@ -75,7 +75,7 @@ public abstract class IfscBasedAccountPayload extends CountryBasedPaymentAccount
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 BankUtil.getAccountNrLabel(countryCode) + ": " + accountNr + "\n" +
                 BankUtil.getBankIdLabel(countryCode) + ": " + ifsc + "\n" +
                 Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
diff --git a/core/src/main/java/bisq/core/payment/payload/ImpsAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/ImpsAccountPayload.java
index 6edf10b329..164c58d39b 100644
--- a/core/src/main/java/bisq/core/payment/payload/ImpsAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/ImpsAccountPayload.java
@@ -92,7 +92,7 @@ public final class ImpsAccountPayload extends IfscBasedAccountPayload {
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.getWithCol("payment.account.no") + " " + accountNr +
                 Res.getWithCol("payment.ifsc") + " " + ifsc;
     }
diff --git a/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java
index 88b2042af8..6a8cae28c0 100644
--- a/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java
@@ -101,14 +101,14 @@ public final class InteracETransferAccountPayload extends PaymentAccountPayload
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.get("payment.email") + " " + email + ", " + Res.getWithCol("payment.secret") + " " +
                 question + ", " + Res.getWithCol("payment.answer") + " " + answer;
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 Res.getWithCol("payment.email") + " " + email + "\n" +
                 Res.getWithCol("payment.secret") + " " + question + "\n" +
                 Res.getWithCol("payment.answer") + " " + answer;
diff --git a/core/src/main/java/bisq/core/payment/payload/MercadoPagoAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/MercadoPagoAccountPayload.java
index cc7a92cc58..df8b2dd7cf 100644
--- a/core/src/main/java/bisq/core/payment/payload/MercadoPagoAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/MercadoPagoAccountPayload.java
@@ -92,7 +92,7 @@ public final class MercadoPagoAccountPayload extends CountryBasedPaymentAccountP
     @Override
     public String getPaymentDetailsForTradePopup() {
         return Res.get("payment.mercadoPago.holderId") + ": " + accountHolderId + "\n" +
-               Res.get("payment.account.owner") + ": " + accountHolderName;
+               Res.get("payment.account.owner.fullname") + ": " + accountHolderName;
     }
 
     @Override
diff --git a/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java
index a81c9486c6..e80c1a9cc5 100644
--- a/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java
@@ -93,7 +93,7 @@ public final class MoneyBeamAccountPayload extends PaymentAccountPayload {
     @Override
     public String getPaymentDetailsForTradePopup() {
         return Res.getWithCol("payment.account") + " " + accountId + "\n" +
-                Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
+                Res.getWithCol("payment.account.owner.fullname") + " " + getHolderNameOrPromptIfEmpty();
     }
 
     @Override
diff --git a/core/src/main/java/bisq/core/payment/payload/NeftAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/NeftAccountPayload.java
index ab2b9a3dae..3ba7452434 100644
--- a/core/src/main/java/bisq/core/payment/payload/NeftAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/NeftAccountPayload.java
@@ -92,7 +92,7 @@ public final class NeftAccountPayload extends IfscBasedAccountPayload {
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.getWithCol("payment.account.no") + " " + accountNr +
                 Res.getWithCol("payment.ifsc") + " " + ifsc;
     }
diff --git a/core/src/main/java/bisq/core/payment/payload/PixAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PixAccountPayload.java
index c5eba2d939..0661593a44 100644
--- a/core/src/main/java/bisq/core/payment/payload/PixAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/PixAccountPayload.java
@@ -92,7 +92,7 @@ public final class PixAccountPayload extends CountryBasedPaymentAccountPayload {
     @Override
     public String getPaymentDetailsForTradePopup() {
         return Res.getWithCol("payment.pix.key") + " " + pixKey + "\n" +
-                Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
+                Res.getWithCol("payment.account.owner.fullname") + " " + getHolderNameOrPromptIfEmpty();
     }
 
     @Override
diff --git a/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java
index 3a451bda61..a2ec052363 100644
--- a/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java
@@ -90,7 +90,7 @@ public final class PopmoneyAccountPayload extends PaymentAccountPayload implemen
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.getWithCol("payment.popmoney.accountId") + " " + accountId;
     }
 
diff --git a/core/src/main/java/bisq/core/payment/payload/RtgsAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/RtgsAccountPayload.java
index 4f1c1335d4..a489ff5248 100644
--- a/core/src/main/java/bisq/core/payment/payload/RtgsAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/RtgsAccountPayload.java
@@ -92,7 +92,7 @@ public final class RtgsAccountPayload extends IfscBasedAccountPayload {
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.getWithCol("payment.account.no") + " " + accountNr +
                 Res.getWithCol("payment.ifsc") + " " + ifsc;
     }
diff --git a/core/src/main/java/bisq/core/payment/payload/SbpAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SbpAccountPayload.java
index ca6ec229f8..c2c6b0c5b9 100644
--- a/core/src/main/java/bisq/core/payment/payload/SbpAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/SbpAccountPayload.java
@@ -98,14 +98,14 @@ public final class SbpAccountPayload extends PaymentAccountPayload implements Pa
     @Override
     public String getPaymentDetails() {
         return Res.get(paymentMethodId) + " - " +
-                Res.getWithCol("payment.account.owner.sbp") + " " + holderName + ", " +
+                Res.getWithCol("payment.account.owner.name") + " " + holderName + ", " +
                 Res.getWithCol("payment.mobile") + " " + mobileNumber + ", " +
                 Res.getWithCol("payment.bank.name") + " " + bankName;
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner.sbp") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.name") + " " + holderName + "\n" +
                 Res.getWithCol("payment.mobile") + " " + mobileNumber + "\n" +
                 Res.getWithCol("payment.bank.name") + " " + bankName;
     }
diff --git a/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java
index 695359a202..305d10105b 100644
--- a/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java
@@ -152,13 +152,13 @@ public final class SepaAccountPayload extends CountryBasedPaymentAccountPayload
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", IBAN: " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", IBAN: " +
                 iban + ", BIC: " + bic + ", " + Res.getWithCol("payment.bank.country") + " " + getCountryCode();
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 "IBAN: " + iban + "\n" +
                 "BIC: " + bic + "\n" +
                 Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
diff --git a/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java
index 379b81a456..39c7720d44 100644
--- a/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java
@@ -147,13 +147,13 @@ public final class SepaInstantAccountPayload extends CountryBasedPaymentAccountP
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", IBAN: " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", IBAN: " +
                 iban + ", BIC: " + bic + ", " + Res.getWithCol("payment.bank.country") + " " + getCountryCode();
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 "IBAN: " + iban + "\n" +
                 "BIC: " + bic + "\n" +
                 Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
diff --git a/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java
index f14eafb92e..e5ebf8595f 100644
--- a/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java
@@ -88,13 +88,13 @@ public final class SwishAccountPayload extends PaymentAccountPayload implements
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName +
                 ", " + Res.getWithCol("payment.mobile") + " " + mobileNr;
     }
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 Res.getWithCol("payment.mobile") + " " + mobileNr;
     }
 
diff --git a/core/src/main/java/bisq/core/payment/payload/TransferwiseAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/TransferwiseAccountPayload.java
index ce319e4c34..203baa373a 100644
--- a/core/src/main/java/bisq/core/payment/payload/TransferwiseAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/TransferwiseAccountPayload.java
@@ -92,7 +92,7 @@ public final class TransferwiseAccountPayload extends PaymentAccountPayload {
     @Override
     public String getPaymentDetailsForTradePopup() {
         return Res.getWithCol("payment.email") + " " + email + "\n" +
-                Res.getWithCol("payment.account.owner") + " " + getHolderNameOrPromptIfEmpty();
+                Res.getWithCol("payment.account.owner.fullname") + " " + getHolderNameOrPromptIfEmpty();
     }
 
     @Override
diff --git a/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java
index 96a8dec520..213060dcbe 100644
--- a/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java
@@ -90,14 +90,14 @@ public final class USPostalMoneyOrderAccountPayload extends PaymentAccountPayloa
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.getWithCol("payment.postal.address") + " " + postalAddress;
     }
 
 
     @Override
     public String getPaymentDetailsForTradePopup() {
-        return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
+        return Res.getWithCol("payment.account.owner.fullname") + " " + holderName + "\n" +
                 Res.getWithCol("payment.postal.address") + " " + postalAddress;
     }
 
diff --git a/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java
index a925b2721b..f97032b10c 100644
--- a/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java
@@ -103,11 +103,11 @@ public final class UpholdAccountPayload extends PaymentAccountPayload {
         if (accountOwner.isEmpty()) {
             return
                     Res.get("payment.account") + ": " + accountId + "\n" +
-                            Res.get("payment.account.owner") + ": N/A";
+                            Res.get("payment.account.owner.fullname") + ": N/A";
         } else {
             return
                     Res.get("payment.account") + ": " + accountId + "\n" +
-                            Res.get("payment.account.owner") + ": " + accountOwner;
+                            Res.get("payment.account.owner.fullname") + ": " + accountOwner;
         }
     }
 
diff --git a/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java
index 230ccdd9a5..794ccbc65c 100644
--- a/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java
@@ -93,7 +93,7 @@ public final class VenmoAccountPayload extends PaymentAccountPayload {
 
     @Override
     public String getPaymentDetails() {
-        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
+        return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner.fullname") + " " + holderName + ", " +
                 Res.getWithCol("payment.venmo.venmoUserName") + " " + venmoUserName;
     }
 
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index b280361ca9..872e90950b 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -3719,7 +3719,8 @@ payment.account.no=Account no.
 payment.account.name=Account name
 payment.account.userName=User name
 payment.account.phoneNr=Phone number
-payment.account.owner=Account owner full name
+payment.account.owner.fullname=Account owner full name
+payment.account.owner.name=Account owner name
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Full name (first, middle, last)
diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties
index ebfc65b3e2..59c75ec2f1 100644
--- a/core/src/main/resources/i18n/displayStrings_cs.properties
+++ b/core/src/main/resources/i18n/displayStrings_cs.properties
@@ -2945,7 +2945,7 @@ payment.account.no=Číslo účtu
 payment.account.name=Název účtu
 payment.account.userName=Uživatelské jméno
 payment.account.phoneNr=Telefonní číslo
-payment.account.owner=Celé jméno vlastníka účtu
+payment.account.owner.fullname=Celé jméno vlastníka účtu
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Celé jméno (křestní, střední, příjmení)
diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties
index 1d6fb4d065..d5cc22c64c 100644
--- a/core/src/main/resources/i18n/displayStrings_de.properties
+++ b/core/src/main/resources/i18n/displayStrings_de.properties
@@ -2945,7 +2945,7 @@ payment.account.no=Kontonummer
 payment.account.name=Kontoname
 payment.account.userName=Benutzername
 payment.account.phoneNr=Telefonnummer
-payment.account.owner=Vollständiger Name des Kontoinhabers
+payment.account.owner.fullname=Vollständiger Name des Kontoinhabers
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Vollständiger Name (vor, zweit, nach)
diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties
index aa75b9b890..36d994409e 100644
--- a/core/src/main/resources/i18n/displayStrings_es.properties
+++ b/core/src/main/resources/i18n/displayStrings_es.properties
@@ -2945,7 +2945,7 @@ payment.account.no=Número de cuenta
 payment.account.name=Nombre de cuenta
 payment.account.userName=Nombre de usuario
 payment.account.phoneNr=Número de teléfono
-payment.account.owner=Nombre completo del propietario de la cuenta
+payment.account.owner.fullname=Nombre completo del propietario de la cuenta
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Nombre completo
diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties
index b1b236a4b5..e9a58e1025 100644
--- a/core/src/main/resources/i18n/displayStrings_fa.properties
+++ b/core/src/main/resources/i18n/displayStrings_fa.properties
@@ -2945,7 +2945,7 @@ payment.account.no=شماره حساب
 payment.account.name=نام حساب
 payment.account.userName=User name
 payment.account.phoneNr=Phone number
-payment.account.owner=نام کامل مالک حساب
+payment.account.owner.fullname=نام کامل مالک حساب
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=نام کامل (اول، وسط، آخر)
diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties
index 2c25d9dac8..bbd6b54584 100644
--- a/core/src/main/resources/i18n/displayStrings_fr.properties
+++ b/core/src/main/resources/i18n/displayStrings_fr.properties
@@ -2945,7 +2945,7 @@ payment.account.no=N° de compte
 payment.account.name=Nom du compte
 payment.account.userName=Nom d'utilisateur
 payment.account.phoneNr=Numéro de téléphone
-payment.account.owner=Nom et prénoms du propriétaire du compte
+payment.account.owner.fullname=Nom et prénoms du propriétaire du compte
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Nom complet (prénom, deuxième prénom, nom de famille)
diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties
index ae3e6f3a99..be8b14098d 100644
--- a/core/src/main/resources/i18n/displayStrings_it.properties
+++ b/core/src/main/resources/i18n/displayStrings_it.properties
@@ -2945,7 +2945,7 @@ payment.account.no=Account n°
 payment.account.name=Nome conto
 payment.account.userName=User name
 payment.account.phoneNr=Phone number
-payment.account.owner=Nome completo del proprietario del conto
+payment.account.owner.fullname=Nome completo del proprietario del conto
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Nome completo (nome, secondo nome, cognome)
diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties
index 9c25740e85..513a59a5d2 100644
--- a/core/src/main/resources/i18n/displayStrings_ja.properties
+++ b/core/src/main/resources/i18n/displayStrings_ja.properties
@@ -2945,7 +2945,7 @@ payment.account.no=アカウント番号
 payment.account.name=アカウント名
 payment.account.userName=ユーザ名
 payment.account.phoneNr=電話番号
-payment.account.owner=アカウント所有者の氏名
+payment.account.owner.fullname=アカウント所有者の氏名
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=氏名（名、ミドルネーム、姓）
diff --git a/core/src/main/resources/i18n/displayStrings_pl.properties b/core/src/main/resources/i18n/displayStrings_pl.properties
index 2fd5c4f0c2..11b2d00820 100644
--- a/core/src/main/resources/i18n/displayStrings_pl.properties
+++ b/core/src/main/resources/i18n/displayStrings_pl.properties
@@ -2945,7 +2945,7 @@ payment.account.no=Numer konta
 payment.account.name=Nazwa konta
 payment.account.userName=Nazwa użytkownika
 payment.account.phoneNr=Numer telefonu
-payment.account.owner=Pełna nazwa właściciela konta
+payment.account.owner.fullname=Pełna nazwa właściciela konta
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Pełne imię (pierwsze, drugie, nazwisko)
diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties
index 3424cc6f00..c731333f11 100644
--- a/core/src/main/resources/i18n/displayStrings_pt.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt.properties
@@ -2945,7 +2945,7 @@ payment.account.no=Nº da conta
 payment.account.name=Nome da conta
 payment.account.userName=User name
 payment.account.phoneNr=Phone number
-payment.account.owner=Nome completo do titular da conta
+payment.account.owner.fullname=Nome completo do titular da conta
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Nome completo (primeiro, nome do meio, último)
diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties
index bd61132791..62fbeb0296 100644
--- a/core/src/main/resources/i18n/displayStrings_ru.properties
+++ b/core/src/main/resources/i18n/displayStrings_ru.properties
@@ -2945,7 +2945,7 @@ payment.account.no=Номер счета
 payment.account.name=Название счета
 payment.account.userName=User name
 payment.account.phoneNr=Phone number
-payment.account.owner=Полное имя владельца счета
+payment.account.owner.fullname=Полное имя владельца счета
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Имя владельца счёта (Имя, отчество, первая буква фамилии)
 payment.account.fullName=Полное имя (имя, отчество, фамилия)
diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties
index bfe5230d6e..68497cc64a 100644
--- a/core/src/main/resources/i18n/displayStrings_th.properties
+++ b/core/src/main/resources/i18n/displayStrings_th.properties
@@ -2945,7 +2945,7 @@ payment.account.no=หมายเลขบัญชี
 payment.account.name=ชื่อบัญชี
 payment.account.userName=User name
 payment.account.phoneNr=Phone number
-payment.account.owner=ชื่อเต็มของเจ้าของบัญชี
+payment.account.owner.fullname=ชื่อเต็มของเจ้าของบัญชี
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=ชื่อเต็ม (ชื่อจริง, ชื่อกลาง, นามสกุล)
diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties
index 31b2bb5b75..2474dfaeef 100644
--- a/core/src/main/resources/i18n/displayStrings_vi.properties
+++ b/core/src/main/resources/i18n/displayStrings_vi.properties
@@ -2945,7 +2945,7 @@ payment.account.no=Tài khoản số
 payment.account.name=Tên tài khoản
 payment.account.userName=User name
 payment.account.phoneNr=Phone number
-payment.account.owner=Họ tên chủ tài khoản
+payment.account.owner.fullname=Họ tên chủ tài khoản
 payment.account.owner.ask=[Ask trader to provide account name if needed]
 payment.account.owner.sbp=Account owner name (first, middle, and initial of last name)
 payment.account.fullName=Họ tên (họ, tên lót, tên)
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java
index 03defcc133..0019d91f6d 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java
@@ -42,7 +42,7 @@ public class AustraliaPayidForm extends PaymentMethodForm {
     private final AustraliaPayidValidator australiaPayidValidator;
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 ((AustraliaPayidAccountPayload) paymentAccountPayload).getBankAccountName());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"),
                 ((AustraliaPayidAccountPayload) paymentAccountPayload).getPayid());
@@ -66,7 +66,7 @@ public class AustraliaPayidForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             australiaPayidAccount.setBankAccountName(newValue);
@@ -100,7 +100,7 @@ public class AustraliaPayidForm extends PaymentMethodForm {
                 Res.get(australiaPayidAccount.getPaymentMethod().getId()));
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"),
                 australiaPayidAccount.getPayid());
-        TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 australiaPayidAccount.getBankAccountName()).second;
         field.setMouseTransparent(false);
         TradeCurrency singleTradeCurrency = australiaPayidAccount.getSingleTradeCurrency();
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
index 848db9f606..c745f13fd5 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
@@ -56,11 +56,11 @@ abstract class BankForm extends GeneralBankForm {
         int colIndex = 0;
 
         if (data.getHolderTaxId() != null) {
-            final String title = Res.get("payment.account.owner") + " / " + BankUtil.getHolderIdLabelShort(countryCode);
+            final String title = Res.get("payment.account.owner.fullname") + " / " + BankUtil.getHolderIdLabelShort(countryCode);
             final String value = data.getHolderName() + " / " + data.getHolderTaxId();
             addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), title, value);
         } else {
-            final String title = Res.get("payment.account.owner");
+            final String title = Res.get("payment.account.owner.fullname");
             final String value = data.getHolderName();
             addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), title, value);
         }
@@ -375,7 +375,7 @@ abstract class BankForm extends GeneralBankForm {
 
     private void addHolderNameAndId() {
         Tuple2<InputTextField, InputTextField> tuple = addInputTextFieldInputTextField(gridPane,
-                ++gridRow, Res.get("payment.account.owner"), BankUtil.getHolderIdLabel(""));
+                ++gridRow, Res.get("payment.account.owner.fullname"), BankUtil.getHolderIdLabel(""));
         holderNameInputTextField = tuple.first;
         holderNameInputTextField.setMinWidth(250);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
@@ -419,13 +419,13 @@ abstract class BankForm extends GeneralBankForm {
         String countryCode = bankAccountPayload.getCountryCode();
         if (BankUtil.isHolderIdRequired(countryCode)) {
             Tuple4<Label, TextField, Label, TextField> tuple = addCompactTopLabelTextFieldTopLabelTextField(gridPane, ++gridRow,
-                    Res.get("payment.account.owner"), BankUtil.getHolderIdLabel(countryCode));
+                    Res.get("payment.account.owner.fullname"), BankUtil.getHolderIdLabel(countryCode));
             TextField holderNameTextField = tuple.second;
             holderNameTextField.setText(bankAccountPayload.getHolderName());
             holderNameTextField.setMinWidth(250);
             tuple.fourth.setText(bankAccountPayload.getHolderTaxId());
         } else {
-            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), bankAccountPayload.getHolderName());
+            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), bankAccountPayload.getHolderName());
         }
     }
 
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java
index 765242a1e4..fd320b1860 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java
@@ -47,7 +47,7 @@ public class CashByMailForm extends PaymentMethodForm {
                                       PaymentAccountPayload paymentAccountPayload) {
         CashByMailAccountPayload cbm = (CashByMailAccountPayload) paymentAccountPayload;
         addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1,
-                Res.get("payment.account.owner"),
+                Res.get("payment.account.owner.fullname"),
                 cbm.getHolderName(),
                 Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
 
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
index c92c1cd8b4..81f5801496 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
@@ -414,7 +414,7 @@ public class CashDepositForm extends GeneralBankForm {
 
     private void addHolderNameAndId() {
         Tuple2<InputTextField, InputTextField> tuple = addInputTextFieldInputTextField(gridPane,
-                ++gridRow, Res.get("payment.account.owner"), BankUtil.getHolderIdLabel(""));
+                ++gridRow, Res.get("payment.account.owner.fullname"), BankUtil.getHolderIdLabel(""));
         holderNameInputTextField = tuple.first;
         holderNameInputTextField.setMinWidth(300);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
@@ -468,13 +468,13 @@ public class CashDepositForm extends GeneralBankForm {
         String countryCode = cashDepositAccountPayload.getCountryCode();
         if (BankUtil.isHolderIdRequired(countryCode)) {
             Tuple4<Label, TextField, Label, TextField> tuple = addCompactTopLabelTextFieldTopLabelTextField(gridPane, ++gridRow,
-                    Res.get("payment.account.owner"), BankUtil.getHolderIdLabel(countryCode));
+                    Res.get("payment.account.owner.fullname"), BankUtil.getHolderIdLabel(countryCode));
             TextField holderNameTextField = tuple.second;
             holderNameTextField.setText(cashDepositAccountPayload.getHolderName());
             holderNameTextField.setMinWidth(300);
             tuple.fourth.setText(cashDepositAccountPayload.getHolderTaxId());
         } else {
-            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                     cashDepositAccountPayload.getHolderName());
         }
     }
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java
index 7c3485aa44..aadfca6f5b 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java
@@ -43,7 +43,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm {
     private final ChaseQuickPayValidator chaseQuickPayValidator;
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 ((ChaseQuickPayAccountPayload) paymentAccountPayload).getHolderName());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
                 ((ChaseQuickPayAccountPayload) paymentAccountPayload).getEmail());
@@ -62,7 +62,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             chaseQuickPayAccount.setHolderName(newValue);
@@ -94,7 +94,7 @@ public class ChaseQuickPayForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(chaseQuickPayAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 chaseQuickPayAccount.getHolderName());
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
                 chaseQuickPayAccount.getEmail()).second;
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
index bfaec6d1d8..2b302304b4 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java
@@ -43,7 +43,7 @@ public class ClearXchangeForm extends PaymentMethodForm {
     private final ClearXchangeValidator clearXchangeValidator;
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 ((ClearXchangeAccountPayload) paymentAccountPayload).getHolderName());
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.email.mobile"),
                 ((ClearXchangeAccountPayload) paymentAccountPayload).getEmailOrMobileNr());
@@ -61,7 +61,7 @@ public class ClearXchangeForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             clearXchangeAccount.setHolderName(newValue.trim());
@@ -94,7 +94,7 @@ public class ClearXchangeForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(clearXchangeAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 clearXchangeAccount.getHolderName());
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email.mobile"),
                 clearXchangeAccount.getEmailOrMobileNr()).second;
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
index 4533781722..d799d090c3 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java
@@ -44,7 +44,7 @@ public class FasterPaymentsForm extends PaymentMethodForm {
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
         if (!((FasterPaymentsAccountPayload) paymentAccountPayload).getHolderName().isEmpty()) {
-            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                     ((FasterPaymentsAccountPayload) paymentAccountPayload).getHolderName());
         }
         // do not translate as it is used in English only
@@ -78,7 +78,7 @@ public class FasterPaymentsForm extends PaymentMethodForm {
     @Override
     public void addFormForAddAccount() {
         gridRowFrom = gridRow + 1;
-        holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner"));
+        holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             fasterPaymentsAccount.setHolderName(newValue);
@@ -121,7 +121,7 @@ public class FasterPaymentsForm extends PaymentMethodForm {
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(fasterPaymentsAccount.getPaymentMethod().getId()));
         if (!fasterPaymentsAccount.getHolderName().isEmpty()) {
-            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+            addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                     fasterPaymentsAccount.getHolderName());
         }
         // do not translate as it is used in English only
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralSepaForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralSepaForm.java
index fb5fb5804e..c043640acf 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralSepaForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralSepaForm.java
@@ -69,7 +69,7 @@ public abstract class GeneralSepaForm extends PaymentMethodForm {
                             gridPane.getScene().getWindow().getHeight() * 1.05)
                     .show()));
 
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"), recipient);
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), recipient);
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, BIC, bic);
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow,
                 Res.get("payment.bank.country"), CountryUtil.getNameAndCode(countryCode));
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java
index e2f94fbd00..f32d1be700 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java
@@ -52,7 +52,7 @@ public abstract class GeneralUsBankForm extends GeneralBankForm {
         int colIndex = 1;
 
         addTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++),
-                Res.get("payment.account.owner"), bankAccountPayload.getHolderName(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
+                Res.get("payment.account.owner.fullname"), bankAccountPayload.getHolderName(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
 
         String branchIdLabel = BankUtil.getBranchIdLabel(countryCode);
         String accountNrLabel = BankUtil.getAccountNrLabel(countryCode);
@@ -87,7 +87,7 @@ public abstract class GeneralUsBankForm extends GeneralBankForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(paymentAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), bankAccountPayload.getHolderName());
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), bankAccountPayload.getHolderName());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.address"), cleanString(holderAddress));
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.name"), bankAccountPayload.getBankName());
         addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getBranchIdLabel(country.code), bankAccountPayload.getBranchId());
@@ -105,7 +105,7 @@ public abstract class GeneralUsBankForm extends GeneralBankForm {
         CountryUtil.findCountryByCode("US").ifPresent(c -> onCountrySelected(c));
         Country country = ((CountryBasedPaymentAccount) paymentAccount).getCountry();
 
-        InputTextField holderNameInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner"));
+        InputTextField holderNameInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             bankAccountPayload.setHolderName(newValue);
             updateFromInputs();
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java
index b06f35582b..a24dfc62aa 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java
@@ -46,7 +46,7 @@ public class IfscBankForm extends PaymentMethodForm {
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
         IfscBasedAccountPayload ifscAccountPayload = (IfscBasedAccountPayload) paymentAccountPayload;
-        addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.account.owner"), ifscAccountPayload.getHolderName(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
+        addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.account.owner.fullname"), ifscAccountPayload.getHolderName(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.accountNr"), ifscAccountPayload.getAccountNr());
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.ifsc"), ifscAccountPayload.getIfsc());
         return gridRow;
@@ -71,7 +71,7 @@ public class IfscBankForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             ifscBasedAccountPayload.setHolderName(newValue.trim());
@@ -109,7 +109,7 @@ public class IfscBankForm extends PaymentMethodForm {
         gridRowFrom = gridRow;
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 ifscBasedAccountPayload.getHolderName());
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.accountNr"), ifscBasedAccountPayload.getAccountNr()).second;
         field.setMouseTransparent(false);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
index 13145c24f1..a6e990e12c 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
@@ -43,7 +43,7 @@ public class InteracETransferForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 ((InteracETransferAccountPayload) paymentAccountPayload).getHolderName());
         addCompactTopLabelTextField(gridPane, gridRow, 1, Res.get("payment.emailOrMobile"),
                 ((InteracETransferAccountPayload) paymentAccountPayload).getEmail());
@@ -66,7 +66,7 @@ public class InteracETransferForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             interacETransferAccount.setHolderName(newValue);
@@ -112,7 +112,7 @@ public class InteracETransferForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(interacETransferAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 interacETransferAccount.getHolderName());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
                 interacETransferAccount.getEmail()).second.setMouseTransparent(false);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MercadoPagoForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MercadoPagoForm.java
index f66b83081c..858fe432c9 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MercadoPagoForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MercadoPagoForm.java
@@ -52,7 +52,7 @@ public class MercadoPagoForm extends PaymentMethodForm {
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
         MercadoPagoAccountPayload mercadoPagoAccountPayload = (MercadoPagoAccountPayload) paymentAccountPayload;
 
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 mercadoPagoAccountPayload.getAccountHolderName());
         addCompactTopLabelTextField(gridPane, gridRow, 1, Res.get("shared.country"),
                 CountryUtil.getNameAndCode(mercadoPagoAccountPayload.getCountryCode()));
@@ -78,7 +78,7 @@ public class MercadoPagoForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             mercadoPagoAccount.setAccountHolderName(newValue);
@@ -132,7 +132,7 @@ public class MercadoPagoForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(mercadoPagoAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 mercadoPagoAccount.getAccountHolderName());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mercadoPago.holderId"),
                 mercadoPagoAccount.getAccountHolderId());
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java
index 5288e845a3..141d766523 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java
@@ -40,7 +40,7 @@ public class MoneseForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, 0, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, 0, Res.get("payment.account.owner.fullname"),
                 ((MoneseAccountPayload) paymentAccountPayload).getHolderName());
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.mobile"),
                 ((MoneseAccountPayload) paymentAccountPayload).getMobileNr());
@@ -58,7 +58,7 @@ public class MoneseForm extends PaymentMethodForm {
     public void addFormForAddAccount() {
         gridRowFrom = gridRow + 1;
 
-        InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner"));
+        InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             account.setHolderName(newValue.trim());
@@ -102,7 +102,7 @@ public class MoneseForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(account.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), account.getHolderName())
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), account.getHolderName())
                 .second.setMouseTransparent(false);
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mobile"), account.getMobileNr())
                 .second.setMouseTransparent(false);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java
index 48edd80787..f7361315a5 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java
@@ -44,7 +44,7 @@ public class MoneyBeamForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId"), ((MoneyBeamAccountPayload) paymentAccountPayload).getAccountId());
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.account.owner.fullname"),
                 paymentAccountPayload.getHolderNameOrPromptIfEmpty());
         return gridRow;
     }
@@ -67,7 +67,7 @@ public class MoneyBeamForm extends PaymentMethodForm {
         });
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             account.setHolderName(newValue);
@@ -93,7 +93,7 @@ public class MoneyBeamForm extends PaymentMethodForm {
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId()));
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId"), account.getAccountId()).second;
         field.setMouseTransparent(false);
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 account.getHolderName());
         final TradeCurrency singleTradeCurrency = account.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java
index 75b72c96ea..7699995756 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java
@@ -46,7 +46,7 @@ public class PixForm extends PaymentMethodForm {
                                       PaymentAccountPayload paymentAccountPayload) {
         addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.pix.key"),
                 ((PixAccountPayload) paymentAccountPayload).getPixKey(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 paymentAccountPayload.getHolderNameOrPromptIfEmpty());
         return gridRow;
     }
@@ -74,7 +74,7 @@ public class PixForm extends PaymentMethodForm {
         });
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             account.setHolderName(newValue);
@@ -101,7 +101,7 @@ public class PixForm extends PaymentMethodForm {
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.pix.key"),
                 account.getPixKey()).second;
         field.setMouseTransparent(false);
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 account.getHolderName());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), account.getSingleTradeCurrency().getNameAndCode());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.country"), account.getCountry().name);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
index fc5bbedb7d..3878e4f33f 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java
@@ -43,7 +43,7 @@ public class PopmoneyForm extends PaymentMethodForm {
     private final PopmoneyValidator validator;
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 ((PopmoneyAccountPayload) paymentAccountPayload).getHolderName());
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.popmoney.accountId"), ((PopmoneyAccountPayload) paymentAccountPayload).getAccountId());
         return gridRow;
@@ -60,7 +60,7 @@ public class PopmoneyForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             account.setHolderName(newValue.trim());
@@ -91,7 +91,7 @@ public class PopmoneyForm extends PaymentMethodForm {
         gridRowFrom = gridRow;
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 account.getHolderName());
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.popmoney.accountId"), account.getAccountId()).second;
         field.setMouseTransparent(false);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java
index 2e105b6da9..f1d70dc0ca 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java
@@ -41,7 +41,7 @@ public class SatispayForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, 0, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, 0, Res.get("payment.account.owner.fullname"),
                 ((SatispayAccountPayload) paymentAccountPayload).getHolderName());
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.mobile"),
                 ((SatispayAccountPayload) paymentAccountPayload).getMobileNr());
@@ -63,7 +63,7 @@ public class SatispayForm extends PaymentMethodForm {
 
         gridRowFrom = gridRow + 1;
 
-        InputTextField holderNameField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner"));
+        InputTextField holderNameField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"));
         holderNameField.setValidator(inputValidator);
         holderNameField.textProperty().addListener((ov, oldValue, newValue) -> {
             account.setHolderName(newValue.trim());
@@ -94,7 +94,7 @@ public class SatispayForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(account.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), account.getHolderName())
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), account.getHolderName())
                 .second.setMouseTransparent(false);
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mobile"), account.getMobileNr())
                 .second.setMouseTransparent(false);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SbpForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SbpForm.java
index d740665bbe..14ebdee133 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SbpForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SbpForm.java
@@ -43,8 +43,8 @@ public class SbpForm extends PaymentMethodForm {
     private final SbpValidator SbpValidator;
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.sbp"),
-                ((SbpAccountPayload) paymentAccountPayload).getHolderName());
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.name"),
+                paymentAccountPayload.getHolderName());
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.mobile"),
                 ((SbpAccountPayload) paymentAccountPayload).getMobileNumber());
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.bank.name"),
@@ -110,8 +110,7 @@ public class SbpForm extends PaymentMethodForm {
         TextField mobileNrField = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mobile"),
                 SbpAccount.getMobileNumber()).second;
         mobileNrField.setMouseTransparent(false);
-        TextField BankNameField = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.name"),
-                SbpAccount.getBankName()).second;
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.name"), SbpAccount.getBankName());
         final TradeCurrency singleTradeCurrency = SbpAccount.getSingleTradeCurrency();
         final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "";
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java
index aff01b7128..abbc9105e2 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java
@@ -80,7 +80,7 @@ public class SepaForm extends GeneralSepaForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             sepaAccount.setHolderName(newValue);
@@ -156,7 +156,7 @@ public class SepaForm extends GeneralSepaForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(sepaAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), sepaAccount.getHolderName());
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), sepaAccount.getHolderName());
         addCompactTopLabelTextField(gridPane, ++gridRow, IBAN, sepaAccount.getIban()).second.setMouseTransparent(false);
         addCompactTopLabelTextField(gridPane, ++gridRow, BIC, sepaAccount.getBic()).second.setMouseTransparent(false);
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.country"),
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java
index 8718549106..7a828112f0 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java
@@ -80,7 +80,7 @@ public class SepaInstantForm extends GeneralSepaForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             sepaInstantAccount.setHolderName(newValue);
@@ -158,7 +158,7 @@ public class SepaInstantForm extends GeneralSepaForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(sepaInstantAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), sepaInstantAccount.getHolderName());
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), sepaInstantAccount.getHolderName());
         addCompactTopLabelTextField(gridPane, ++gridRow, IBAN, sepaInstantAccount.getIban()).second.setMouseTransparent(false);
         addCompactTopLabelTextField(gridPane, ++gridRow, BIC, sepaInstantAccount.getBic()).second.setMouseTransparent(false);
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.country"),
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java
index 1fbbf274a7..2c3d8bddd5 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java
@@ -106,7 +106,7 @@ public class SwiftForm extends PaymentMethodForm {
             addCompactTopLabelTextField(gridPane, ++gridRow, Res.get(ADDRESS + INTERMEDIARYPOSTFIX), cleanString(formData.getIntermediaryAddress()));
         }
 
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), formData.getBeneficiaryName(), Layout.GROUP_DISTANCE_WITHOUT_SEPARATOR);
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), formData.getBeneficiaryName(), Layout.GROUP_DISTANCE_WITHOUT_SEPARATOR);
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get(SWIFT_ACCOUNT), formData.getBeneficiaryAccountNr());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get(ADDRESS + BENEFICIARYPOSTFIX), cleanString(formData.getBeneficiaryAddress()));
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get(PHONE + BENEFICIARYPOSTFIX), formData.getBeneficiaryPhone());
@@ -233,7 +233,7 @@ public class SwiftForm extends PaymentMethodForm {
     }
 
     private void addFieldsForBeneficiaryEdit() {
-        String label = Res.get("payment.account.owner");
+        String label = Res.get("payment.account.owner.fullname");
         InputTextField beneficiaryNameField = addInputTextField(gridPane, ++gridRow, label);
         beneficiaryNameField.setPromptText(label);
         beneficiaryNameField.setValidator(defaultValidator);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java
index 354f339e47..2ccd4eba46 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java
@@ -59,7 +59,7 @@ public class SwishForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 ((SwishAccountPayload) paymentAccountPayload).getHolderName());
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.mobile"),
                 ((SwishAccountPayload) paymentAccountPayload).getMobileNr());
@@ -71,7 +71,7 @@ public class SwishForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             swishAccount.setHolderName(newValue);
@@ -104,7 +104,7 @@ public class SwishForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(swishAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 swishAccount.getHolderName());
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mobile"),
                 swishAccount.getMobileNr()).second;
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java
index d0a73afb07..9a90865179 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java
@@ -47,7 +47,7 @@ public class TransferwiseForm extends PaymentMethodForm {
                                       PaymentAccountPayload paymentAccountPayload) {
         addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.email"),
                 ((TransferwiseAccountPayload) paymentAccountPayload).getEmail(), Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 paymentAccountPayload.getHolderNameOrPromptIfEmpty());
         return gridRow;
     }
@@ -72,7 +72,7 @@ public class TransferwiseForm extends PaymentMethodForm {
         });
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             account.setHolderName(newValue);
@@ -112,7 +112,7 @@ public class TransferwiseForm extends PaymentMethodForm {
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
                 account.getEmail()).second;
         field.setMouseTransparent(false);
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 account.getHolderName());
         addLimitations(true);
         addCurrenciesGrid(false);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java
index 9bb28e5bb4..5476283499 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java
@@ -46,7 +46,7 @@ public class TransferwiseUsdForm extends PaymentMethodForm {
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
 
-        addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.account.owner"),
+        addTopLabelTextFieldWithCopyIcon(gridPane, gridRow, 1, Res.get("payment.account.owner.fullname"),
                 ((TransferwiseUsdAccountPayload) paymentAccountPayload).getHolderName(),
                 Layout.COMPACT_FIRST_ROW_AND_GROUP_DISTANCE);
 
@@ -86,7 +86,7 @@ public class TransferwiseUsdForm extends PaymentMethodForm {
             updateFromInputs();
         });
 
-        InputTextField holderNameField = addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner"));
+        InputTextField holderNameField = addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"));
         holderNameField.setValidator(inputValidator);
         holderNameField.textProperty().addListener((ov, oldValue, newValue) -> {
             account.setHolderName(newValue.trim());
@@ -119,7 +119,7 @@ public class TransferwiseUsdForm extends PaymentMethodForm {
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(account.getPaymentMethod().getId()));
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"), account.getEmail());
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), account.getHolderName());
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"), account.getHolderName());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.address"), cleanString(account.getBeneficiaryAddress()));
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), account.getSingleTradeCurrency().getNameAndCode());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.country"), account.getCountry().name);
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
index 6cd05ee038..bf0c575972 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
@@ -43,7 +43,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 ((USPostalMoneyOrderAccountPayload) paymentAccountPayload).getHolderName());
         TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second;
         textArea.setMinHeight(70);
@@ -67,7 +67,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             usPostalMoneyOrderAccount.setHolderName(newValue);
@@ -103,7 +103,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(usPostalMoneyOrderAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 usPostalMoneyOrderAccount.getHolderName());
         TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second;
         textArea.setText(usPostalMoneyOrderAccount.getPostalAddress());
diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
index 8c31988d44..beef6568cd 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java
@@ -47,7 +47,7 @@ public class UpholdForm extends PaymentMethodForm {
         if (accountOwner.isEmpty()) {
             accountOwner = Res.get("payment.ask");
         }
-        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 accountOwner);
 
         addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.uphold.accountId"),
@@ -69,7 +69,7 @@ public class UpholdForm extends PaymentMethodForm {
         gridRowFrom = gridRow + 1;
 
         InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow,
-                Res.get("payment.account.owner"));
+                Res.get("payment.account.owner.fullname"));
         holderNameInputTextField.setValidator(inputValidator);
         holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
             upholdAccount.setAccountOwner(newValue);
@@ -113,7 +113,7 @@ public class UpholdForm extends PaymentMethodForm {
         addAccountNameTextFieldWithAutoFillToggleButton();
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(upholdAccount.getPaymentMethod().getId()));
-        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
+        addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner.fullname"),
                 Res.get(upholdAccount.getAccountOwner()));
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.uphold.accountId"),
                 upholdAccount.getAccountId()).second;
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SwiftPaymentDetails.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SwiftPaymentDetails.java
index 9626ace058..7c9239b660 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SwiftPaymentDetails.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SwiftPaymentDetails.java
@@ -92,7 +92,7 @@ public class SwiftPaymentDetails extends Overlay<SwiftPaymentDetails> {
         }
 
         gridPane.add(new Label(""), 0, ++rowIndex);  // spacer
-        addLabelsAndCopy(Res.get("payment.account.owner"), payload.getBeneficiaryName());
+        addLabelsAndCopy(Res.get("payment.account.owner.fullname"), payload.getBeneficiaryName());
         addLabelsAndCopy(Res.get(SWIFT_ACCOUNT), payload.getBeneficiaryAccountNr());
         addLabelsAndCopy(Res.get(ADDRESS + BENEFICIARYPOSTFIX), cleanString(payload.getBeneficiaryAddress()));
         addLabelsAndCopy(Res.get(PHONE + BENEFICIARYPOSTFIX), payload.getBeneficiaryPhone());