diff --git a/core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java b/core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java
index a09a62209c8..d5a79e2caef 100644
--- a/core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java
+++ b/core/src/main/java/bisq/core/payment/AustraliaPayidAccount.java
@@ -19,7 +19,7 @@
 
 import bisq.core.locale.FiatCurrency;
 import bisq.core.locale.TradeCurrency;
-import bisq.core.payment.payload.AustraliaPayidPayload;
+import bisq.core.payment.payload.AustraliaPayidAccountPayload;
 import bisq.core.payment.payload.PaymentAccountPayload;
 import bisq.core.payment.payload.PaymentMethod;
 
@@ -38,7 +38,7 @@ public AustraliaPayidAccount() {
 
     @Override
     protected PaymentAccountPayload createPayload() {
-        return new AustraliaPayidPayload(paymentMethod.getId(), id);
+        return new AustraliaPayidAccountPayload(paymentMethod.getId(), id);
     }
 
     @Override
@@ -47,20 +47,20 @@ protected PaymentAccountPayload createPayload() {
     }
 
     public String getPayid() {
-        return ((AustraliaPayidPayload) paymentAccountPayload).getPayid();
+        return ((AustraliaPayidAccountPayload) paymentAccountPayload).getPayid();
     }
 
     public void setPayid(String payid) {
         if (payid == null) payid = "";
-        ((AustraliaPayidPayload) paymentAccountPayload).setPayid(payid);
+        ((AustraliaPayidAccountPayload) paymentAccountPayload).setPayid(payid);
     }
 
     public String getBankAccountName() {
-        return ((AustraliaPayidPayload) paymentAccountPayload).getBankAccountName();
+        return ((AustraliaPayidAccountPayload) paymentAccountPayload).getBankAccountName();
     }
 
     public void setBankAccountName(String bankAccountName) {
         if (bankAccountName == null) bankAccountName = "";
-        ((AustraliaPayidPayload) paymentAccountPayload).setBankAccountName(bankAccountName);
+        ((AustraliaPayidAccountPayload) paymentAccountPayload).setBankAccountName(bankAccountName);
     }
 }
diff --git a/core/src/main/java/bisq/core/payment/payload/AustraliaPayidPayload.java b/core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java
similarity index 82%
rename from core/src/main/java/bisq/core/payment/payload/AustraliaPayidPayload.java
rename to core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java
index 50539cd4c0a..f8600ab36af 100644
--- a/core/src/main/java/bisq/core/payment/payload/AustraliaPayidPayload.java
+++ b/core/src/main/java/bisq/core/payment/payload/AustraliaPayidAccountPayload.java
@@ -39,11 +39,11 @@
 @Setter
 @Getter
 @Slf4j
-public final class AustraliaPayidPayload extends PaymentAccountPayload {
+public final class AustraliaPayidAccountPayload extends PaymentAccountPayload {
     private String payid = "";
     private String bankAccountName = "";
 
-    public AustraliaPayidPayload(String paymentMethod, String id) {
+    public AustraliaPayidAccountPayload(String paymentMethod, String id) {
         super(paymentMethod, id);
     }
 
@@ -52,12 +52,12 @@ public AustraliaPayidPayload(String paymentMethod, String id) {
     // PROTO BUFFER
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private AustraliaPayidPayload(String paymentMethod,
-                                  String id,
-                                  String payid,
-                                  String bankAccountName,
-                                  long maxTradePeriod,
-                                  Map<String, String> excludeFromJsonDataMap) {
+    private AustraliaPayidAccountPayload(String paymentMethod,
+                                         String id,
+                                         String payid,
+                                         String bankAccountName,
+                                         long maxTradePeriod,
+                                         Map<String, String> excludeFromJsonDataMap) {
         super(paymentMethod,
                 id,
                 maxTradePeriod,
@@ -77,9 +77,9 @@ public Message toProtoMessage() {
                 ).build();
     }
 
-    public static AustraliaPayidPayload fromProto(protobuf.PaymentAccountPayload proto) {
+    public static AustraliaPayidAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
         protobuf.AustraliaPayidPayload AustraliaPayidPayload = proto.getAustraliaPayidPayload();
-        return new AustraliaPayidPayload(proto.getPaymentMethodId(),
+        return new AustraliaPayidAccountPayload(proto.getPaymentMethodId(),
                 proto.getId(),
                 AustraliaPayidPayload.getPayid(),
                 AustraliaPayidPayload.getBankAccountName(),
diff --git a/core/src/main/java/bisq/core/proto/CoreProtoResolver.java b/core/src/main/java/bisq/core/proto/CoreProtoResolver.java
index 1a0e2bd10e6..0ab652e55d0 100644
--- a/core/src/main/java/bisq/core/proto/CoreProtoResolver.java
+++ b/core/src/main/java/bisq/core/proto/CoreProtoResolver.java
@@ -25,7 +25,7 @@
 import bisq.core.payment.payload.AdvancedCashAccountPayload;
 import bisq.core.payment.payload.AliPayAccountPayload;
 import bisq.core.payment.payload.AmazonGiftCardAccountPayload;
-import bisq.core.payment.payload.AustraliaPayidPayload;
+import bisq.core.payment.payload.AustraliaPayidAccountPayload;
 import bisq.core.payment.payload.BizumAccountPayload;
 import bisq.core.payment.payload.BsqSwapAccountPayload;
 import bisq.core.payment.payload.CapitualAccountPayload;
@@ -186,7 +186,7 @@ public PaymentAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
                 case JAPAN_BANK_ACCOUNT_PAYLOAD:
                     return JapanBankAccountPayload.fromProto(proto);
                 case AUSTRALIA_PAYID_PAYLOAD:
-                    return AustraliaPayidPayload.fromProto(proto);
+                    return AustraliaPayidAccountPayload.fromProto(proto);
                 case UPHOLD_ACCOUNT_PAYLOAD:
                     return UpholdAccountPayload.fromProto(proto);
                 case MONEY_BEAM_ACCOUNT_PAYLOAD:
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 62d6e8c3983..03defcc1333 100644
--- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java
+++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java
@@ -26,7 +26,7 @@
 import bisq.core.locale.TradeCurrency;
 import bisq.core.payment.AustraliaPayidAccount;
 import bisq.core.payment.PaymentAccount;
-import bisq.core.payment.payload.AustraliaPayidPayload;
+import bisq.core.payment.payload.AustraliaPayidAccountPayload;
 import bisq.core.payment.payload.PaymentAccountPayload;
 import bisq.core.util.coin.CoinFormatter;
 import bisq.core.util.validation.InputValidator;
@@ -43,9 +43,9 @@ public class AustraliaPayidForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
-                ((AustraliaPayidPayload) paymentAccountPayload).getBankAccountName());
+                ((AustraliaPayidAccountPayload) paymentAccountPayload).getBankAccountName());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"),
-                ((AustraliaPayidPayload) paymentAccountPayload).getPayid());
+                ((AustraliaPayidAccountPayload) paymentAccountPayload).getPayid());
         return gridRow;
     }