diff --git a/include/xrpl/protocol/detail/transactions.m b/include/xrpl/protocol/detail/transactions.m
index 6fb8e30824a..4d37ef42bb3 100644
--- a/include/xrpl/protocol/detail/transactions.m
+++ b/include/xrpl/protocol/detail/transactions.m
@@ -21,6 +21,12 @@
 #error "undefined macro: TRANSACTION"
 #endif
 
+/**
+ * TRANSACTION(tag, value, name, fields)
+ *
+ * You must define a transactor class in the `ripple` namespace named `name`.
+ */
+
 /** This transaction type executes a payment. */
 TRANSACTION(ttPAYMENT, 0, Payment, ({
     {sfDestination, soeREQUIRED},
diff --git a/src/xrpld/app/tx/detail/CancelCheck.h b/src/xrpld/app/tx/detail/CancelCheck.h
index 582d8559e50..d9b70f919c1 100644
--- a/src/xrpld/app/tx/detail/CancelCheck.h
+++ b/src/xrpld/app/tx/detail/CancelCheck.h
@@ -43,6 +43,8 @@ class CancelCheck : public Transactor
     doApply() override;
 };
 
+using CheckCancel = CancelCheck;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/CancelOffer.h b/src/xrpld/app/tx/detail/CancelOffer.h
index 1e3b4a5c983..0942e61282b 100644
--- a/src/xrpld/app/tx/detail/CancelOffer.h
+++ b/src/xrpld/app/tx/detail/CancelOffer.h
@@ -46,6 +46,8 @@ class CancelOffer : public Transactor
     doApply() override;
 };
 
+using OfferCancel = CancelOffer;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/CashCheck.h b/src/xrpld/app/tx/detail/CashCheck.h
index c90cd93a9f8..da7ef22e3c3 100644
--- a/src/xrpld/app/tx/detail/CashCheck.h
+++ b/src/xrpld/app/tx/detail/CashCheck.h
@@ -43,6 +43,8 @@ class CashCheck : public Transactor
     doApply() override;
 };
 
+using CheckCash = CashCheck;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/Change.h b/src/xrpld/app/tx/detail/Change.h
index 7a569bc920e..b0780a75c04 100644
--- a/src/xrpld/app/tx/detail/Change.h
+++ b/src/xrpld/app/tx/detail/Change.h
@@ -69,6 +69,10 @@ class Change : public Transactor
     applyUNLModify();
 };
 
+using EnableAmendment = Change;
+using SetFee = Change;
+using UNLModify = Change;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/CreateCheck.h b/src/xrpld/app/tx/detail/CreateCheck.h
index 86daad07061..0e414ce0123 100644
--- a/src/xrpld/app/tx/detail/CreateCheck.h
+++ b/src/xrpld/app/tx/detail/CreateCheck.h
@@ -43,6 +43,8 @@ class CreateCheck : public Transactor
     doApply() override;
 };
 
+using CheckCreate = CreateCheck;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/CreateOffer.h b/src/xrpld/app/tx/detail/CreateOffer.h
index 47129df5b04..234267804c9 100644
--- a/src/xrpld/app/tx/detail/CreateOffer.h
+++ b/src/xrpld/app/tx/detail/CreateOffer.h
@@ -142,6 +142,8 @@ class CreateOffer : public Transactor
     OfferStream::StepCounter stepCounter_;
 };
 
+using OfferCreate = CreateOffer;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/CreateTicket.h b/src/xrpld/app/tx/detail/CreateTicket.h
index edfcaa787c9..099dcde9347 100644
--- a/src/xrpld/app/tx/detail/CreateTicket.h
+++ b/src/xrpld/app/tx/detail/CreateTicket.h
@@ -84,6 +84,8 @@ class CreateTicket : public Transactor
     doApply() override;
 };
 
+using TicketCreate = CreateTicket;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/DeleteAccount.h b/src/xrpld/app/tx/detail/DeleteAccount.h
index e1da2f45964..5f88a9ba718 100644
--- a/src/xrpld/app/tx/detail/DeleteAccount.h
+++ b/src/xrpld/app/tx/detail/DeleteAccount.h
@@ -48,6 +48,8 @@ class DeleteAccount : public Transactor
     doApply() override;
 };
 
+using AccountDelete = DeleteAccount;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/DeleteOracle.h b/src/xrpld/app/tx/detail/DeleteOracle.h
index 8f1402563a2..bbbfc6f5256 100644
--- a/src/xrpld/app/tx/detail/DeleteOracle.h
+++ b/src/xrpld/app/tx/detail/DeleteOracle.h
@@ -59,6 +59,8 @@ class DeleteOracle : public Transactor
         beast::Journal j);
 };
 
+using OracleDelete = DeleteOracle;
+
 }  // namespace ripple
 
 #endif  // RIPPLE_TX_DELETEORACLE_H_INCLUDED
diff --git a/src/xrpld/app/tx/detail/PayChan.h b/src/xrpld/app/tx/detail/PayChan.h
index 8bb3a6d9379..5eef7e51c0c 100644
--- a/src/xrpld/app/tx/detail/PayChan.h
+++ b/src/xrpld/app/tx/detail/PayChan.h
@@ -46,6 +46,8 @@ class PayChanCreate : public Transactor
     doApply() override;
 };
 
+using PaymentChannelCreate = PayChanCreate;
+
 //------------------------------------------------------------------------------
 
 class PayChanFund : public Transactor
@@ -67,6 +69,8 @@ class PayChanFund : public Transactor
     doApply() override;
 };
 
+using PaymentChannelFund = PayChanFund;
+
 //------------------------------------------------------------------------------
 
 class PayChanClaim : public Transactor
@@ -85,6 +89,8 @@ class PayChanClaim : public Transactor
     doApply() override;
 };
 
+using PaymentChannelClaim = PayChanClaim;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/SetAccount.h b/src/xrpld/app/tx/detail/SetAccount.h
index 8e9b74d860b..62cae28e51c 100644
--- a/src/xrpld/app/tx/detail/SetAccount.h
+++ b/src/xrpld/app/tx/detail/SetAccount.h
@@ -51,6 +51,8 @@ class SetAccount : public Transactor
     doApply() override;
 };
 
+using AccountSet = SetAccount;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/SetOracle.h b/src/xrpld/app/tx/detail/SetOracle.h
index 13c4d7a0cc9..656b6560192 100644
--- a/src/xrpld/app/tx/detail/SetOracle.h
+++ b/src/xrpld/app/tx/detail/SetOracle.h
@@ -52,6 +52,8 @@ class SetOracle : public Transactor
     doApply() override;
 };
 
+using OracleSet = SetOracle;
+
 }  // namespace ripple
 
 #endif  // RIPPLE_TX_SETORACLE_H_INCLUDED
diff --git a/src/xrpld/app/tx/detail/SetSignerList.h b/src/xrpld/app/tx/detail/SetSignerList.h
index c2006945eca..35951645c21 100644
--- a/src/xrpld/app/tx/detail/SetSignerList.h
+++ b/src/xrpld/app/tx/detail/SetSignerList.h
@@ -97,6 +97,8 @@ class SetSignerList : public Transactor
         const;
 };
 
+using SignerListSet = SetSignerList;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/SetTrust.h b/src/xrpld/app/tx/detail/SetTrust.h
index a86c8498d48..6e5a72b3062 100644
--- a/src/xrpld/app/tx/detail/SetTrust.h
+++ b/src/xrpld/app/tx/detail/SetTrust.h
@@ -47,6 +47,8 @@ class SetTrust : public Transactor
     doApply() override;
 };
 
+using TrustSet = SetTrust;
+
 }  // namespace ripple
 
 #endif
diff --git a/src/xrpld/app/tx/detail/XChainBridge.h b/src/xrpld/app/tx/detail/XChainBridge.h
index 822f687729a..2e5e927d120 100644
--- a/src/xrpld/app/tx/detail/XChainBridge.h
+++ b/src/xrpld/app/tx/detail/XChainBridge.h
@@ -67,6 +67,9 @@ class BridgeModify : public Transactor
     TER
     doApply() override;
 };
+
+using XChainModifyBridge = BridgeModify;
+
 //------------------------------------------------------------------------------
 
 // Claim funds from a `XChainCommit` transaction. This is normally not needed,
@@ -248,6 +251,8 @@ class XChainCreateAccountCommit : public Transactor
     doApply() override;
 };
 
+using XChainAccountCreateCommit = XChainCreateAccountCommit;
+
 //------------------------------------------------------------------------------
 
 }  // namespace ripple
diff --git a/src/xrpld/app/tx/detail/applySteps.cpp b/src/xrpld/app/tx/detail/applySteps.cpp
index e33d673e022..b27583cc4a7 100644
--- a/src/xrpld/app/tx/detail/applySteps.cpp
+++ b/src/xrpld/app/tx/detail/applySteps.cpp
@@ -55,6 +55,7 @@
 #include <xrpld/app/tx/detail/SetRegularKey.h>
 #include <xrpld/app/tx/detail/SetSignerList.h>
 #include <xrpld/app/tx/detail/SetTrust.h>
+#include <xrpld/app/tx/detail/VaultSet.h>
 #include <xrpld/app/tx/detail/XChainBridge.h>
 #include <xrpl/protocol/TxFormats.h>
 
@@ -80,106 +81,18 @@ with_txn_type(TxType txnType, F&& f)
 {
     switch (txnType)
     {
-        case ttACCOUNT_DELETE:
-            return f.template operator()<DeleteAccount>();
-        case ttACCOUNT_SET:
-            return f.template operator()<SetAccount>();
-        case ttCHECK_CANCEL:
-            return f.template operator()<CancelCheck>();
-        case ttCHECK_CASH:
-            return f.template operator()<CashCheck>();
-        case ttCHECK_CREATE:
-            return f.template operator()<CreateCheck>();
-        case ttDEPOSIT_PREAUTH:
-            return f.template operator()<DepositPreauth>();
-        case ttOFFER_CANCEL:
-            return f.template operator()<CancelOffer>();
-        case ttOFFER_CREATE:
-            return f.template operator()<CreateOffer>();
-        case ttESCROW_CREATE:
-            return f.template operator()<EscrowCreate>();
-        case ttESCROW_FINISH:
-            return f.template operator()<EscrowFinish>();
-        case ttESCROW_CANCEL:
-            return f.template operator()<EscrowCancel>();
-        case ttLEDGER_STATE_FIX:
-            return f.template operator()<LedgerStateFix>();
-        case ttPAYCHAN_CLAIM:
-            return f.template operator()<PayChanClaim>();
-        case ttPAYCHAN_CREATE:
-            return f.template operator()<PayChanCreate>();
-        case ttPAYCHAN_FUND:
-            return f.template operator()<PayChanFund>();
-        case ttPAYMENT:
-            return f.template operator()<Payment>();
-        case ttREGULAR_KEY_SET:
-            return f.template operator()<SetRegularKey>();
-        case ttSIGNER_LIST_SET:
-            return f.template operator()<SetSignerList>();
-        case ttTICKET_CREATE:
-            return f.template operator()<CreateTicket>();
-        case ttTRUST_SET:
-            return f.template operator()<SetTrust>();
-        case ttAMENDMENT:
-        case ttFEE:
-        case ttUNL_MODIFY:
-            return f.template operator()<Change>();
-        case ttNFTOKEN_MINT:
-            return f.template operator()<NFTokenMint>();
-        case ttNFTOKEN_BURN:
-            return f.template operator()<NFTokenBurn>();
-        case ttNFTOKEN_CREATE_OFFER:
-            return f.template operator()<NFTokenCreateOffer>();
-        case ttNFTOKEN_CANCEL_OFFER:
-            return f.template operator()<NFTokenCancelOffer>();
-        case ttNFTOKEN_ACCEPT_OFFER:
-            return f.template operator()<NFTokenAcceptOffer>();
-        case ttCLAWBACK:
-            return f.template operator()<Clawback>();
-        case ttAMM_CREATE:
-            return f.template operator()<AMMCreate>();
-        case ttAMM_DEPOSIT:
-            return f.template operator()<AMMDeposit>();
-        case ttAMM_WITHDRAW:
-            return f.template operator()<AMMWithdraw>();
-        case ttAMM_VOTE:
-            return f.template operator()<AMMVote>();
-        case ttAMM_BID:
-            return f.template operator()<AMMBid>();
-        case ttAMM_DELETE:
-            return f.template operator()<AMMDelete>();
-        case ttXCHAIN_CREATE_BRIDGE:
-            return f.template operator()<XChainCreateBridge>();
-        case ttXCHAIN_MODIFY_BRIDGE:
-            return f.template operator()<BridgeModify>();
-        case ttXCHAIN_CREATE_CLAIM_ID:
-            return f.template operator()<XChainCreateClaimID>();
-        case ttXCHAIN_COMMIT:
-            return f.template operator()<XChainCommit>();
-        case ttXCHAIN_CLAIM:
-            return f.template operator()<XChainClaim>();
-        case ttXCHAIN_ADD_CLAIM_ATTESTATION:
-            return f.template operator()<XChainAddClaimAttestation>();
-        case ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION:
-            return f.template operator()<XChainAddAccountCreateAttestation>();
-        case ttXCHAIN_ACCOUNT_CREATE_COMMIT:
-            return f.template operator()<XChainCreateAccountCommit>();
-        case ttDID_SET:
-            return f.template operator()<DIDSet>();
-        case ttDID_DELETE:
-            return f.template operator()<DIDDelete>();
-        case ttORACLE_SET:
-            return f.template operator()<SetOracle>();
-        case ttORACLE_DELETE:
-            return f.template operator()<DeleteOracle>();
-        case ttMPTOKEN_ISSUANCE_CREATE:
-            return f.template operator()<MPTokenIssuanceCreate>();
-        case ttMPTOKEN_ISSUANCE_DESTROY:
-            return f.template operator()<MPTokenIssuanceDestroy>();
-        case ttMPTOKEN_AUTHORIZE:
-            return f.template operator()<MPTokenAuthorize>();
-        case ttMPTOKEN_ISSUANCE_SET:
-            return f.template operator()<MPTokenIssuanceSet>();
+
+#pragma push_macro("TRANSACTION")
+#undef TRANSACTION
+
+#define TRANSACTION(tag, value, name, fields) \
+        case tag: return f.template operator()<name>();
+
+#include <xrpl/protocol/detail/transactions.m>
+
+#undef TRANSACTION
+#pragma pop_macro("TRANSACTION")
+
         default:
             throw UnknownTxnType(txnType);
     }