From 15b3ed1ae76737689e6a970dc7655a50e7e41c5a Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Fri, 15 May 2026 12:21:29 +0100
Subject: [PATCH 01/12] ci: Update XRPLF/actions (#7281)

---
 .github/workflows/check-pr-title.yml      | 2 +-
 .github/workflows/reusable-clang-tidy.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
index 6d7bdefa08..5631950df6 100644
--- a/.github/workflows/check-pr-title.yml
+++ b/.github/workflows/check-pr-title.yml
@@ -11,4 +11,4 @@ on:
 jobs:
   check_title:
     if: ${{ github.event.pull_request.draft != true }}
-    uses: XRPLF/actions/.github/workflows/check-pr-title.yml@a5d8dd35be543365e90a11358447130c8763871d
+    uses: XRPLF/actions/.github/workflows/check-pr-title.yml@291206777251b4d493641b5afbdf7c23009d2988
diff --git a/.github/workflows/reusable-clang-tidy.yml b/.github/workflows/reusable-clang-tidy.yml
index e979e7179a..e01a50cf6d 100644
--- a/.github/workflows/reusable-clang-tidy.yml
+++ b/.github/workflows/reusable-clang-tidy.yml
@@ -176,7 +176,7 @@ jobs:
 
       - name: Create issue
         if: ${{ steps.run_clang_tidy.outcome != 'success' && inputs.create_issue_on_failure }}
-        uses: XRPLF/actions/create-issue@fbcc16eb7f20dc3199eaf1aed0d3523a5ba9008c
+        uses: XRPLF/actions/create-issue@36d450d12d301e8410c1b7936e5de70c291cbe36
         with:
           title: "Clang-tidy check failed"
           body_file: ${{ env.ISSUE_FILE }}

From 028f0cb5da67175cb7ae9cf632502fe27d94525e Mon Sep 17 00:00:00 2001
From: Mayukha Vadari <mvadari@ripple.com>
Date: Fri, 15 May 2026 10:00:13 -0400
Subject: [PATCH 02/12] refactor: Use `isFlag` where possible instead of
 bitwise math (#7278)

---
 include/xrpl/ledger/helpers/EscrowHelpers.h   | 30 ++++-----
 include/xrpl/tx/paths/detail/StepChecks.h     |  4 +-
 .../ledger/helpers/CredentialHelpers.cpp      | 10 +--
 src/libxrpl/ledger/helpers/MPTokenHelpers.cpp |  2 +-
 src/libxrpl/ledger/helpers/NFTokenHelpers.cpp |  8 +--
 .../ledger/helpers/RippleStateHelpers.cpp     | 29 ++++----
 src/libxrpl/ledger/helpers/TokenHelpers.cpp   | 30 +++++----
 src/libxrpl/tx/invariants/AMMInvariant.cpp    |  2 +-
 src/libxrpl/tx/invariants/InvariantCheck.cpp  |  9 ++-
 src/libxrpl/tx/paths/BookStep.cpp             |  3 +-
 src/libxrpl/tx/paths/DirectStep.cpp           |  8 +--
 .../tx/transactors/account/AccountDelete.cpp  |  4 +-
 .../tx/transactors/account/AccountSet.cpp     | 67 +++++++------------
 .../tx/transactors/account/SetRegularKey.cpp  |  2 +-
 .../tx/transactors/account/SignerListSet.cpp  |  2 +-
 .../tx/transactors/bridge/XChainBridge.cpp    | 12 ++--
 .../tx/transactors/check/CheckCash.cpp        | 35 +++++-----
 .../tx/transactors/check/CheckCreate.cpp      |  6 +-
 .../credentials/CredentialAccept.cpp          |  2 +-
 .../tx/transactors/dex/AMMClawback.cpp        | 15 ++---
 src/libxrpl/tx/transactors/dex/AMMCreate.cpp  |  2 +-
 src/libxrpl/tx/transactors/dex/AMMDeposit.cpp | 16 ++---
 .../tx/transactors/dex/AMMWithdraw.cpp        | 14 ++--
 .../tx/transactors/dex/OfferCreate.cpp        | 36 +++++-----
 .../tx/transactors/escrow/EscrowCreate.cpp    |  2 +-
 .../tx/transactors/nft/NFTokenAcceptOffer.cpp |  4 +-
 .../tx/transactors/nft/NFTokenCreateOffer.cpp |  3 +-
 .../tx/transactors/payment/Payment.cpp        | 24 +++----
 .../payment_channel/PaymentChannelClaim.cpp   |  8 +--
 .../payment_channel/PaymentChannelCreate.cpp  |  6 +-
 src/libxrpl/tx/transactors/system/Batch.cpp   |  2 +-
 src/libxrpl/tx/transactors/system/Change.cpp  |  6 +-
 src/libxrpl/tx/transactors/token/Clawback.cpp |  8 +--
 .../tx/transactors/token/MPTokenAuthorize.cpp |  6 +-
 .../token/MPTokenIssuanceCreate.cpp           |  2 +-
 .../transactors/token/MPTokenIssuanceSet.cpp  | 21 +++---
 src/libxrpl/tx/transactors/token/TrustSet.cpp | 54 +++++++--------
 .../tx/transactors/vault/VaultClawback.cpp    |  8 +--
 .../tx/transactors/vault/VaultCreate.cpp      | 11 ++-
 src/libxrpl/tx/transactors/vault/VaultSet.cpp |  2 +-
 src/test/app/Credentials_test.cpp             |  8 +--
 src/test/app/DepositAuth_test.cpp             |  2 +-
 src/test/app/SetRegularKey_test.cpp           | 10 +--
 src/test/jtx/impl/flags.cpp                   |  2 +-
 src/xrpld/rpc/detail/PathRequest.cpp          |  2 +-
 src/xrpld/rpc/detail/Pathfinder.cpp           |  4 +-
 .../rpc/handlers/account/AccountLines.cpp     |  4 +-
 .../rpc/handlers/account/NoRippleCheck.cpp    |  5 +-
 .../handlers/orderbook/DepositAuthorized.cpp  |  4 +-
 49 files changed, 242 insertions(+), 314 deletions(-)

diff --git a/include/xrpl/ledger/helpers/EscrowHelpers.h b/include/xrpl/ledger/helpers/EscrowHelpers.h
index 5aa5214b1f..305834a6bc 100644
--- a/include/xrpl/ledger/helpers/EscrowHelpers.h
+++ b/include/xrpl/ledger/helpers/EscrowHelpers.h
@@ -70,21 +70,21 @@ escrowUnlockApplyHelper<Issue>(
         initialBalance.get<Issue>().account = noAccount();
 
         if (TER const ter = trustCreate(
-                view,                                           // payment sandbox
-                recvLow,                                        // is dest low?
-                issuer,                                         // source
-                receiver,                                       // destination
-                trustLineKey.key,                               // ledger index
-                sleDest,                                        // Account to add to
-                false,                                          // authorize account
-                (sleDest->getFlags() & lsfDefaultRipple) == 0,  //
-                false,                                          // freeze trust line
-                false,                                          // deep freeze trust line
-                initialBalance,                                 // zero initial balance
-                Issue(currency, receiver),                      // limit of zero
-                0,                                              // quality in
-                0,                                              // quality out
-                journal);                                       // journal
+                view,                                // payment sandbox
+                recvLow,                             // is dest low?
+                issuer,                              // source
+                receiver,                            // destination
+                trustLineKey.key,                    // ledger index
+                sleDest,                             // Account to add to
+                false,                               // authorize account
+                !sleDest->isFlag(lsfDefaultRipple),  //
+                false,                               // freeze trust line
+                false,                               // deep freeze trust line
+                initialBalance,                      // zero initial balance
+                Issue(currency, receiver),           // limit of zero
+                0,                                   // quality in
+                0,                                   // quality out
+                journal);                            // journal
             !isTesSuccess(ter))
         {
             return ter;  // LCOV_EXCL_LINE
diff --git a/include/xrpl/tx/paths/detail/StepChecks.h b/include/xrpl/tx/paths/detail/StepChecks.h
index a1e6490781..fea9f90a31 100644
--- a/include/xrpl/tx/paths/detail/StepChecks.h
+++ b/include/xrpl/tx/paths/detail/StepChecks.h
@@ -77,8 +77,8 @@ checkNoRipple(
     if (!sleIn || !sleOut)
         return terNO_LINE;
 
-    if ((((*sleIn)[sfFlags] & ((cur > prev) ? lsfHighNoRipple : lsfLowNoRipple)) != 0u) &&
-        (((*sleOut)[sfFlags] & ((cur > next) ? lsfHighNoRipple : lsfLowNoRipple)) != 0u))
+    if (sleIn->isFlag((cur > prev) ? lsfHighNoRipple : lsfLowNoRipple) &&
+        sleOut->isFlag((cur > next) ? lsfHighNoRipple : lsfLowNoRipple))
     {
         JLOG(j.info()) << "Path violates noRipple constraint between " << prev << ", " << cur
                        << " and " << next;
diff --git a/src/libxrpl/ledger/helpers/CredentialHelpers.cpp b/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
index cb0cbf6322..8954f3fd5e 100644
--- a/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
@@ -105,7 +105,7 @@ deleteSLE(ApplyView& view, std::shared_ptr<SLE> const& sleCredential, beast::Jou
 
     auto const issuer = sleCredential->getAccountID(sfIssuer);
     auto const subject = sleCredential->getAccountID(sfSubject);
-    bool const accepted = (sleCredential->getFlags() & lsfAccepted) != 0u;
+    bool const accepted = sleCredential->isFlag(lsfAccepted);
 
     auto err = delSLE(issuer, sfIssuerNode, !accepted || (subject == issuer));
     if (!isTesSuccess(err))
@@ -174,7 +174,7 @@ valid(STTx const& tx, ReadView const& view, AccountID const& src, beast::Journal
             return tecBAD_CREDENTIALS;
         }
 
-        if ((sleCred->getFlags() & lsfAccepted) == 0u)
+        if (!sleCred->isFlag(lsfAccepted))
         {
             JLOG(j.trace()) << "Credential isn't accepted. Cred: " << h;
             return tecBAD_CREDENTIALS;
@@ -215,7 +215,7 @@ validDomain(ReadView const& view, uint256 domainID, AccountID const& subject)
                 foundExpired = true;
                 continue;
             }
-            if ((sleCredential->getFlags() & lsfAccepted) != 0u)
+            if (sleCredential->isFlag(lsfAccepted))
             {
                 return tesSUCCESS;
             }
@@ -339,7 +339,7 @@ verifyValidDomain(ApplyView& view, AccountID const& account, uint256 domainID, b
         if (!sleCredential)
             continue;  // expired, i.e. deleted in credentials::removeExpired
 
-        if ((sleCredential->getFlags() & lsfAccepted) != 0u)
+        if (sleCredential->isFlag(lsfAccepted))
             return tesSUCCESS;
     }
 
@@ -373,7 +373,7 @@ verifyDepositPreauth(
             return tecEXPIRED;
     }
 
-    if (sleDst && ((sleDst->getFlags() & lsfDepositAuth) != 0u))
+    if (sleDst && sleDst->isFlag(lsfDepositAuth))
     {
         if (src != dst)
         {
diff --git a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
index 252921c499..54a988ff5a 100644
--- a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
@@ -358,7 +358,7 @@ requireAuth(
     if (maybeDomainID)
     {
         XRPL_ASSERT(
-            sleIssuance->getFieldU32(sfFlags) & lsfMPTRequireAuth,
+            sleIssuance->isFlag(lsfMPTRequireAuth),
             "xrpl::requireAuth : issuance requires authorization");
         // ter = tefINTERNAL | tecOBJECT_NOT_FOUND | tecNO_AUTH | tecEXPIRED
         auto const ter = credentials::validDomain(view, *maybeDomainID, account);
diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
index eb69ec93d0..c1fdd403d6 100644
--- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
@@ -636,8 +636,8 @@ deleteTokenOffer(ApplyView& view, std::shared_ptr<SLE> const& offer)
     auto const nftokenID = (*offer)[sfNFTokenID];
 
     if (!view.dirRemove(
-            (((*offer)[sfFlags] & lsfSellNFToken) != 0u) ? keylet::nftSells(nftokenID)
-                                                         : keylet::nftBuys(nftokenID),
+            offer->isFlag(lsfSellNFToken) ? keylet::nftSells(nftokenID)
+                                          : keylet::nftBuys(nftokenID),
             (*offer)[sfNFTokenOfferNode],
             offer->key(),
             false))
@@ -888,7 +888,7 @@ tokenOfferCreatePreclaim(
             return tecNO_DST;
 
         // check if the destination has disallowed incoming offers
-        if ((sleDst->getFlags() & lsfDisallowIncomingNFTokenOffer) != 0u)
+        if (sleDst->isFlag(lsfDisallowIncomingNFTokenOffer))
             return tecNO_PERMISSION;
     }
 
@@ -901,7 +901,7 @@ tokenOfferCreatePreclaim(
         if (!sleOwner)
             return tecNO_TARGET;
 
-        if ((sleOwner->getFlags() & lsfDisallowIncomingNFTokenOffer) != 0u)
+        if (sleOwner->isFlag(lsfDisallowIncomingNFTokenOffer))
             return tecNO_PERMISSION;
     }
 
diff --git a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
index 58f44534cf..e31309a9dd 100644
--- a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
@@ -274,7 +274,7 @@ trustCreate(
         uFlags |= (bSetHigh ? lsfHighDeepFreeze : lsfLowDeepFreeze);
     }
 
-    if ((slePeer->getFlags() & lsfDefaultRipple) == 0)
+    if (!slePeer->isFlag(lsfDefaultRipple))
     {
         // The other side's default is no rippling
         uFlags |= (bSetHigh ? lsfLowNoRipple : lsfHighNoRipple);
@@ -341,22 +341,25 @@ updateTrustLine(
 {
     if (!state)
         return false;
-    std::uint32_t const flags(state->getFieldU32(sfFlags));
 
     auto sle = view.peek(keylet::account(sender));
     if (!sle)
         return false;
 
+    auto const senderReserveFlag = bSenderHigh ? lsfHighReserve : lsfLowReserve;
+    auto const senderNoRippleFlag = bSenderHigh ? lsfHighNoRipple : lsfLowNoRipple;
+    auto const senderFreezeFlag = bSenderHigh ? lsfHighFreeze : lsfLowFreeze;
+    auto const receiverReserveFlag = bSenderHigh ? lsfLowReserve : lsfHighReserve;
+
     // YYY Could skip this if rippling in reverse.
     if (before > beast::kZERO
         // Sender balance was positive.
         && after <= beast::kZERO
         // Sender is zero or negative.
-        && ((flags & (!bSenderHigh ? lsfLowReserve : lsfHighReserve)) != 0u)
+        && state->isFlag(senderReserveFlag)
         // Sender reserve is set.
-        && static_cast<bool>(flags & (!bSenderHigh ? lsfLowNoRipple : lsfHighNoRipple)) !=
-            static_cast<bool>(sle->getFlags() & lsfDefaultRipple) &&
-        ((flags & (!bSenderHigh ? lsfLowFreeze : lsfHighFreeze)) == 0u) &&
+        && state->isFlag(senderNoRippleFlag) != sle->isFlag(lsfDefaultRipple) &&
+        !state->isFlag(senderFreezeFlag) &&
         !state->getFieldAmount(!bSenderHigh ? sfLowLimit : sfHighLimit)
         // Sender trust limit is 0.
         && (state->getFieldU32(!bSenderHigh ? sfLowQualityIn : sfHighQualityIn) == 0u)
@@ -369,11 +372,10 @@ updateTrustLine(
         adjustOwnerCount(view, sle, -1, j);
 
         // Clear reserve flag.
-        state->setFieldU32(sfFlags, flags & (!bSenderHigh ? ~lsfLowReserve : ~lsfHighReserve));
+        state->clearFlag(senderReserveFlag);
 
         // Balance is zero, receiver reserve is clear.
-        if (!after  // Balance is zero.
-            && ((flags & (bSenderHigh ? lsfLowReserve : lsfHighReserve)) == 0u))
+        if (!after && !state->isFlag(receiverReserveFlag))
             return true;
     }
     return false;
@@ -453,7 +455,7 @@ issueIOU(
     if (!receiverAccount)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
-    bool const noRipple = (receiverAccount->getFlags() & lsfDefaultRipple) == 0;
+    bool const noRipple = !receiverAccount->isFlag(lsfDefaultRipple);
 
     return trustCreate(
         view,
@@ -564,12 +566,11 @@ requireAuth(ReadView const& view, Issue const& issue, AccountID const& account,
     // If this is a weak or legacy check, or if the account has a line, fail if
     // auth is required and not set on the line
     if (auto const issuerAccount = view.read(keylet::account(issue.account));
-        issuerAccount && (((*issuerAccount)[sfFlags] & lsfRequireAuth) != 0u))
+        issuerAccount && issuerAccount->isFlag(lsfRequireAuth))
     {
         if (trustLine)
         {
-            return (((*trustLine)[sfFlags] &
-                     ((account > issue.account) ? lsfLowAuth : lsfHighAuth)) != 0u)
+            return trustLine->isFlag((account > issue.account) ? lsfLowAuth : lsfHighAuth)
                 ? tesSUCCESS
                 : TER{tecNO_AUTH};
         }
@@ -774,7 +775,7 @@ deleteAMMTrustLine(
     }
 
     auto const uFlags = !ammLow ? lsfLowReserve : lsfHighReserve;
-    if ((sleState->getFlags() & uFlags) == 0u)
+    if (!sleState->isFlag(uFlags))
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
     adjustOwnerCount(view, !ammLow ? sleLow : sleHigh, -1, j);
diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
index 0894fdba38..e57a4c85bb 100644
--- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
@@ -569,39 +569,41 @@ directSendNoFeeIOU(
                         << " amount=" << saAmount.getFullText()
                         << " after=" << saBalance.getFullText();
 
-        std::uint32_t const uFlags(sleRippleState->getFieldU32(sfFlags));
         bool bDelete = false;
 
+        auto const senderReserveFlag = bSenderHigh ? lsfHighReserve : lsfLowReserve;
+        auto const senderNoRippleFlag = bSenderHigh ? lsfHighNoRipple : lsfLowNoRipple;
+        auto const senderFreezeFlag = bSenderHigh ? lsfHighFreeze : lsfLowFreeze;
+        auto const receiverReserveFlag = bSenderHigh ? lsfLowReserve : lsfHighReserve;
+
         // FIXME This NEEDS to be cleaned up and simplified. It's impossible
         //       for anyone to understand.
         if (saBefore > beast::kZERO
             // Sender balance was positive.
             && saBalance <= beast::kZERO
             // Sender is zero or negative.
-            && ((uFlags & (!bSenderHigh ? lsfLowReserve : lsfHighReserve)) != 0u)
+            && sleRippleState->isFlag(senderReserveFlag)
             // Sender reserve is set.
-            && static_cast<bool>(uFlags & (!bSenderHigh ? lsfLowNoRipple : lsfHighNoRipple)) !=
-                static_cast<bool>(
-                    view.read(keylet::account(uSenderID))->getFlags() & lsfDefaultRipple) &&
-            ((uFlags & (!bSenderHigh ? lsfLowFreeze : lsfHighFreeze)) == 0u) &&
-            !sleRippleState->getFieldAmount(!bSenderHigh ? sfLowLimit : sfHighLimit)
+            && sleRippleState->isFlag(senderNoRippleFlag) !=
+                view.read(keylet::account(uSenderID))->isFlag(lsfDefaultRipple) &&
+            !sleRippleState->isFlag(senderFreezeFlag) &&
+            !sleRippleState->getFieldAmount(bSenderHigh ? sfHighLimit : sfLowLimit)
             // Sender trust limit is 0.
-            && (sleRippleState->getFieldU32(!bSenderHigh ? sfLowQualityIn : sfHighQualityIn) == 0u)
+            && (sleRippleState->getFieldU32(bSenderHigh ? sfHighQualityIn : sfLowQualityIn) == 0u)
             // Sender quality in is 0.
             &&
-            (sleRippleState->getFieldU32(!bSenderHigh ? sfLowQualityOut : sfHighQualityOut) == 0u))
+            (sleRippleState->getFieldU32(bSenderHigh ? sfHighQualityOut : sfLowQualityOut) == 0u))
         // Sender quality out is 0.
         {
             // Clear the reserve of the sender, possibly delete the line!
             adjustOwnerCount(view, view.peek(keylet::account(uSenderID)), -1, j);
 
             // Clear reserve flag.
-            sleRippleState->setFieldU32(
-                sfFlags, uFlags & (!bSenderHigh ? ~lsfLowReserve : ~lsfHighReserve));
+            sleRippleState->clearFlag(senderReserveFlag);
 
             // Balance is zero, receiver reserve is clear.
             bDelete = !saBalance  // Balance is zero.
-                && ((uFlags & (bSenderHigh ? lsfLowReserve : lsfHighReserve)) == 0u);
+                && !sleRippleState->isFlag(receiverReserveFlag);
             // Receiver reserve is clear.
         }
 
@@ -618,7 +620,7 @@ directSendNoFeeIOU(
                 view,
                 sleRippleState,
                 bSenderHigh ? uReceiverID : uSenderID,
-                !bSenderHigh ? uReceiverID : uSenderID,
+                bSenderHigh ? uSenderID : uReceiverID,
                 j);
         }
 
@@ -640,7 +642,7 @@ directSendNoFeeIOU(
     if (!sleAccount)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
-    bool const noRipple = (sleAccount->getFlags() & lsfDefaultRipple) == 0;
+    bool const noRipple = !sleAccount->isFlag(lsfDefaultRipple);
 
     return trustCreate(
         view,
diff --git a/src/libxrpl/tx/invariants/AMMInvariant.cpp b/src/libxrpl/tx/invariants/AMMInvariant.cpp
index 6469799eb6..18c37b9eaf 100644
--- a/src/libxrpl/tx/invariants/AMMInvariant.cpp
+++ b/src/libxrpl/tx/invariants/AMMInvariant.cpp
@@ -44,7 +44,7 @@ ValidAMM::visitEntry(
         }
         // AMM pool changed
         else if (
-            (type == ltRIPPLE_STATE && ((after->getFlags() & lsfAMMNode) != 0u)) ||
+            (type == ltRIPPLE_STATE && after->isFlag(lsfAMMNode)) ||
             (type == ltACCOUNT_ROOT && after->isFieldPresent(sfAMMID)))
         {
             ammPoolChanged_ = true;
diff --git a/src/libxrpl/tx/invariants/InvariantCheck.cpp b/src/libxrpl/tx/invariants/InvariantCheck.cpp
index 59887ad18c..a945b0f117 100644
--- a/src/libxrpl/tx/invariants/InvariantCheck.cpp
+++ b/src/libxrpl/tx/invariants/InvariantCheck.cpp
@@ -675,12 +675,11 @@ NoDeepFreezeTrustLinesWithoutFreeze::visitEntry(
     {
         bool const overwriteFixEnabled = isFeatureEnabled(fixCleanup3_1_3, true);
 
-        std::uint32_t const uFlags = after->getFieldU32(sfFlags);
-        bool const lowFreeze = (uFlags & lsfLowFreeze) != 0u;
-        bool const lowDeepFreeze = (uFlags & lsfLowDeepFreeze) != 0u;
+        bool const lowFreeze = after->isFlag(lsfLowFreeze);
+        bool const lowDeepFreeze = after->isFlag(lsfLowDeepFreeze);
 
-        bool const highFreeze = (uFlags & lsfHighFreeze) != 0u;
-        bool const highDeepFreeze = (uFlags & lsfHighDeepFreeze) != 0u;
+        bool const highFreeze = after->isFlag(lsfHighFreeze);
+        bool const highDeepFreeze = after->isFlag(lsfHighDeepFreeze);
 
         bool const bad = (lowDeepFreeze && !lowFreeze) || (highDeepFreeze && !highFreeze);
         if (overwriteFixEnabled)
diff --git a/src/libxrpl/tx/paths/BookStep.cpp b/src/libxrpl/tx/paths/BookStep.cpp
index 113155e530..4fde4fe58e 100644
--- a/src/libxrpl/tx/paths/BookStep.cpp
+++ b/src/libxrpl/tx/paths/BookStep.cpp
@@ -1357,8 +1357,7 @@ BookStep<TIn, TOut, TDerived>::check(StrandContext const& ctx) const
                     auto sle = view.read(keylet::line(*prev, cur, issue.currency));
                     if (!sle)
                         return terNO_LINE;
-                    if (((*sle)[sfFlags] & ((cur > *prev) ? lsfHighNoRipple : lsfLowNoRipple)) !=
-                        0u)
+                    if (sle->isFlag((cur > *prev) ? lsfHighNoRipple : lsfLowNoRipple))
                         return terNO_RIPPLE;
                     return std::nullopt;
                 },
diff --git a/src/libxrpl/tx/paths/DirectStep.cpp b/src/libxrpl/tx/paths/DirectStep.cpp
index 7373f8a341..0564e22947 100644
--- a/src/libxrpl/tx/paths/DirectStep.cpp
+++ b/src/libxrpl/tx/paths/DirectStep.cpp
@@ -429,8 +429,8 @@ DirectIPaymentStep::check(StrandContext const& ctx, std::shared_ptr<const SLE> c
 
         auto const authField = (src_ > dst_) ? lsfHighAuth : lsfLowAuth;
 
-        if ((((*sleSrc)[sfFlags] & lsfRequireAuth) != 0u) &&
-            (((*sleLine)[sfFlags] & authField) == 0u) && (*sleLine)[sfBalance] == beast::kZERO)
+        if (sleSrc->isFlag(lsfRequireAuth) && !sleLine->isFlag(authField) &&
+            (*sleLine)[sfBalance] == beast::kZERO)
         {
             JLOG(j_.debug()) << "DirectStepI: can't receive IOUs from issuer without auth."
                              << " src: " << src_;
@@ -441,9 +441,7 @@ DirectIPaymentStep::check(StrandContext const& ctx, std::shared_ptr<const SLE> c
         {
             if (ctx.prevStep->bookStepBook())
             {
-                auto const noRippleSrcToDst =
-                    ((*sleLine)[sfFlags] & ((src_ > dst_) ? lsfHighNoRipple : lsfLowNoRipple));
-                if (noRippleSrcToDst != 0u)
+                if (sleLine->isFlag((src_ > dst_) ? lsfHighNoRipple : lsfLowNoRipple))
                     return terNO_RIPPLE;
             }
         }
diff --git a/src/libxrpl/tx/transactors/account/AccountDelete.cpp b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
index b6fb3be683..7b72817aaa 100644
--- a/src/libxrpl/tx/transactors/account/AccountDelete.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
@@ -231,7 +231,7 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
     if (!sleDst)
         return tecNO_DST;
 
-    if ((((*sleDst)[sfFlags] & lsfRequireDestTag) != 0u) && !ctx.tx[~sfDestinationTag])
+    if (sleDst->isFlag(lsfRequireDestTag) && !ctx.tx[~sfDestinationTag])
         return tecDST_TAG_NEEDED;
 
     // If credentials are provided - check them anyway
@@ -243,7 +243,7 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
     if (!ctx.tx.isFieldPresent(sfCredentialIDs))
     {
         // Check whether the destination account requires deposit authorization.
-        if ((sleDst->getFlags() & lsfDepositAuth) != 0u)
+        if (sleDst->isFlag(lsfDepositAuth))
         {
             if (!ctx.view.exists(keylet::depositPreauth(dst, account)))
                 return tecNO_PERMISSION;
diff --git a/src/libxrpl/tx/transactors/account/AccountSet.cpp b/src/libxrpl/tx/transactors/account/AccountSet.cpp
index 2ab87c78c4..c3cb8a72b8 100644
--- a/src/libxrpl/tx/transactors/account/AccountSet.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountSet.cpp
@@ -69,8 +69,6 @@ AccountSet::preflight(PreflightContext const& ctx)
     auto& tx = ctx.tx;
     auto& j = ctx.j;
 
-    std::uint32_t const uTxFlags = tx.getFlags();
-
     std::uint32_t const uSetFlag = tx.getFieldU32(sfSetFlag);
     std::uint32_t const uClearFlag = tx.getFieldU32(sfClearFlag);
 
@@ -83,9 +81,8 @@ AccountSet::preflight(PreflightContext const& ctx)
     //
     // RequireAuth
     //
-    bool const bSetRequireAuth = ((uTxFlags & tfRequireAuth) != 0u) || (uSetFlag == asfRequireAuth);
-    bool const bClearRequireAuth =
-        ((uTxFlags & tfOptionalAuth) != 0u) || (uClearFlag == asfRequireAuth);
+    bool const bSetRequireAuth = tx.isFlag(tfRequireAuth) || (uSetFlag == asfRequireAuth);
+    bool const bClearRequireAuth = tx.isFlag(tfOptionalAuth) || (uClearFlag == asfRequireAuth);
 
     if (bSetRequireAuth && bClearRequireAuth)
     {
@@ -96,10 +93,8 @@ AccountSet::preflight(PreflightContext const& ctx)
     //
     // RequireDestTag
     //
-    bool const bSetRequireDest =
-        ((uTxFlags & tfRequireDestTag) != 0u) || (uSetFlag == asfRequireDest);
-    bool const bClearRequireDest =
-        ((uTxFlags & tfOptionalDestTag) != 0u) || (uClearFlag == asfRequireDest);
+    bool const bSetRequireDest = tx.isFlag(tfRequireDestTag) || (uSetFlag == asfRequireDest);
+    bool const bClearRequireDest = tx.isFlag(tfOptionalDestTag) || (uClearFlag == asfRequireDest);
 
     if (bSetRequireDest && bClearRequireDest)
     {
@@ -110,9 +105,8 @@ AccountSet::preflight(PreflightContext const& ctx)
     //
     // DisallowXRP
     //
-    bool const bSetDisallowXRP = ((uTxFlags & tfDisallowXRP) != 0u) || (uSetFlag == asfDisallowXRP);
-    bool const bClearDisallowXRP =
-        ((uTxFlags & tfAllowXRP) != 0u) || (uClearFlag == asfDisallowXRP);
+    bool const bSetDisallowXRP = tx.isFlag(tfDisallowXRP) || (uSetFlag == asfDisallowXRP);
+    bool const bClearDisallowXRP = tx.isFlag(tfAllowXRP) || (uClearFlag == asfDisallowXRP);
 
     if (bSetDisallowXRP && bClearDisallowXRP)
     {
@@ -195,12 +189,11 @@ AccountSet::checkPermission(ReadView const& view, STTx const& tx)
 
     auto const uSetFlag = tx.getFieldU32(sfSetFlag);
     auto const uClearFlag = tx.getFieldU32(sfClearFlag);
-    auto const uTxFlags = tx.getFlags();
     // We don't support any flag based granular permission under
     // AccountSet transaction. If any delegated account is trying to
     // update the flag on behalf of another account, it is not
     // authorized.
-    if (uSetFlag != 0 || uClearFlag != 0 || ((uTxFlags & tfUniversalMask) != 0u))
+    if (uSetFlag != 0 || uClearFlag != 0 || ((tx.getFlags() & tfUniversalMask) != 0u))
         return terNO_DELEGATE_PERMISSION;
 
     if (tx.isFieldPresent(sfEmailHash) && !granularPermissions.contains(AccountEmailHashSet))
@@ -229,23 +222,19 @@ AccountSet::preclaim(PreclaimContext const& ctx)
 {
     auto const id = ctx.tx[sfAccount];
 
-    std::uint32_t const uTxFlags = ctx.tx.getFlags();
-
     auto const sle = ctx.view.read(keylet::account(id));
     if (!sle)
         return terNO_ACCOUNT;
 
-    std::uint32_t const uFlagsIn = sle->getFieldU32(sfFlags);
-
     std::uint32_t const uSetFlag = ctx.tx.getFieldU32(sfSetFlag);
 
     // legacy AccountSet flags
-    bool const bSetRequireAuth = ((uTxFlags & tfRequireAuth) != 0u) || (uSetFlag == asfRequireAuth);
+    bool const bSetRequireAuth = ctx.tx.isFlag(tfRequireAuth) || (uSetFlag == asfRequireAuth);
 
     //
     // RequireAuth
     //
-    if (bSetRequireAuth && ((uFlagsIn & lsfRequireAuth) == 0u))
+    if (bSetRequireAuth && !sle->isFlag(lsfRequireAuth))
     {
         if (!dirIsEmpty(ctx.view, keylet::ownerDir(id)))
         {
@@ -261,7 +250,7 @@ AccountSet::preclaim(PreclaimContext const& ctx)
     {
         if (uSetFlag == asfAllowTrustLineClawback)
         {
-            if ((uFlagsIn & lsfNoFreeze) != 0u)
+            if (sle->isFlag(lsfNoFreeze))
             {
                 JLOG(ctx.j.trace()) << "Can't set Clawback if NoFreeze is set";
                 return tecNO_PERMISSION;
@@ -276,7 +265,7 @@ AccountSet::preclaim(PreclaimContext const& ctx)
         else if (uSetFlag == asfNoFreeze)
         {
             // Cannot set NoFreeze if clawback is enabled
-            if ((uFlagsIn & lsfAllowTrustLineClawback) != 0u)
+            if (sle->isFlag(lsfAllowTrustLineClawback))
             {
                 JLOG(ctx.j.trace()) << "Can't set NoFreeze if clawback is enabled";
                 return tecNO_PERMISSION;
@@ -302,16 +291,12 @@ AccountSet::doApply()
     std::uint32_t const uClearFlag{tx.getFieldU32(sfClearFlag)};
 
     // legacy AccountSet flags
-    std::uint32_t const uTxFlags{tx.getFlags()};
-    bool const bSetRequireDest{
-        ((uTxFlags & tfRequireDestTag) != 0u) || (uSetFlag == asfRequireDest)};
-    bool const bClearRequireDest{
-        ((uTxFlags & tfOptionalDestTag) != 0u) || (uClearFlag == asfRequireDest)};
-    bool const bSetRequireAuth{((uTxFlags & tfRequireAuth) != 0u) || (uSetFlag == asfRequireAuth)};
-    bool const bClearRequireAuth{
-        ((uTxFlags & tfOptionalAuth) != 0u) || (uClearFlag == asfRequireAuth)};
-    bool const bSetDisallowXRP{((uTxFlags & tfDisallowXRP) != 0u) || (uSetFlag == asfDisallowXRP)};
-    bool const bClearDisallowXRP{((uTxFlags & tfAllowXRP) != 0u) || (uClearFlag == asfDisallowXRP)};
+    bool const bSetRequireDest{tx.isFlag(tfRequireDestTag) || (uSetFlag == asfRequireDest)};
+    bool const bClearRequireDest{tx.isFlag(tfOptionalDestTag) || (uClearFlag == asfRequireDest)};
+    bool const bSetRequireAuth{tx.isFlag(tfRequireAuth) || (uSetFlag == asfRequireAuth)};
+    bool const bClearRequireAuth{tx.isFlag(tfOptionalAuth) || (uClearFlag == asfRequireAuth)};
+    bool const bSetDisallowXRP{tx.isFlag(tfDisallowXRP) || (uSetFlag == asfDisallowXRP)};
+    bool const bClearDisallowXRP{tx.isFlag(tfAllowXRP) || (uClearFlag == asfDisallowXRP)};
 
     bool const sigWithMaster{[&tx, &acct = account_]() {
         auto const spk = tx.getSigningPubKey();
@@ -329,13 +314,13 @@ AccountSet::doApply()
     //
     // RequireAuth
     //
-    if (bSetRequireAuth && ((uFlagsIn & lsfRequireAuth) == 0u))
+    if (bSetRequireAuth && !sle->isFlag(lsfRequireAuth))
     {
         JLOG(j_.trace()) << "Set RequireAuth.";
         uFlagsOut |= lsfRequireAuth;
     }
 
-    if (bClearRequireAuth && ((uFlagsIn & lsfRequireAuth) != 0u))
+    if (bClearRequireAuth && sle->isFlag(lsfRequireAuth))
     {
         JLOG(j_.trace()) << "Clear RequireAuth.";
         uFlagsOut &= ~lsfRequireAuth;
@@ -344,13 +329,13 @@ AccountSet::doApply()
     //
     // RequireDestTag
     //
-    if (bSetRequireDest && ((uFlagsIn & lsfRequireDestTag) == 0u))
+    if (bSetRequireDest && !sle->isFlag(lsfRequireDestTag))
     {
         JLOG(j_.trace()) << "Set lsfRequireDestTag.";
         uFlagsOut |= lsfRequireDestTag;
     }
 
-    if (bClearRequireDest && ((uFlagsIn & lsfRequireDestTag) != 0u))
+    if (bClearRequireDest && sle->isFlag(lsfRequireDestTag))
     {
         JLOG(j_.trace()) << "Clear lsfRequireDestTag.";
         uFlagsOut &= ~lsfRequireDestTag;
@@ -359,13 +344,13 @@ AccountSet::doApply()
     //
     // DisallowXRP
     //
-    if (bSetDisallowXRP && ((uFlagsIn & lsfDisallowXRP) == 0u))
+    if (bSetDisallowXRP && !sle->isFlag(lsfDisallowXRP))
     {
         JLOG(j_.trace()) << "Set lsfDisallowXRP.";
         uFlagsOut |= lsfDisallowXRP;
     }
 
-    if (bClearDisallowXRP && ((uFlagsIn & lsfDisallowXRP) != 0u))
+    if (bClearDisallowXRP && sle->isFlag(lsfDisallowXRP))
     {
         JLOG(j_.trace()) << "Clear lsfDisallowXRP.";
         uFlagsOut &= ~lsfDisallowXRP;
@@ -374,7 +359,7 @@ AccountSet::doApply()
     //
     // DisableMaster
     //
-    if ((uSetFlag == asfDisableMaster) && ((uFlagsIn & lsfDisableMaster) == 0u))
+    if ((uSetFlag == asfDisableMaster) && !sle->isFlag(lsfDisableMaster))
     {
         if (!sigWithMaster)
         {
@@ -392,7 +377,7 @@ AccountSet::doApply()
         uFlagsOut |= lsfDisableMaster;
     }
 
-    if ((uClearFlag == asfDisableMaster) && ((uFlagsIn & lsfDisableMaster) != 0u))
+    if ((uClearFlag == asfDisableMaster) && sle->isFlag(lsfDisableMaster))
     {
         JLOG(j_.trace()) << "Clear lsfDisableMaster.";
         uFlagsOut &= ~lsfDisableMaster;
@@ -417,7 +402,7 @@ AccountSet::doApply()
     //
     if (uSetFlag == asfNoFreeze)
     {
-        if (!sigWithMaster && ((uFlagsIn & lsfDisableMaster) == 0u))
+        if (!sigWithMaster && !sle->isFlag(lsfDisableMaster))
         {
             JLOG(j_.trace()) << "Must use master key to set NoFreeze.";
             return tecNEED_MASTER_KEY;
diff --git a/src/libxrpl/tx/transactors/account/SetRegularKey.cpp b/src/libxrpl/tx/transactors/account/SetRegularKey.cpp
index 65e6840aa0..f74407b433 100644
--- a/src/libxrpl/tx/transactors/account/SetRegularKey.cpp
+++ b/src/libxrpl/tx/transactors/account/SetRegularKey.cpp
@@ -29,7 +29,7 @@ SetRegularKey::calculateBaseFee(ReadView const& view, STTx const& tx)
         {
             auto const sle = view.read(keylet::account(id));
 
-            if (sle && ((sle->getFlags() & lsfPasswordSpent) == 0u))
+            if (sle && !sle->isFlag(lsfPasswordSpent))
             {
                 // flag is armed and they signed with the right account
                 return XRPAmount{0};
diff --git a/src/libxrpl/tx/transactors/account/SignerListSet.cpp b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
index ccc04c8155..92b6d18d40 100644
--- a/src/libxrpl/tx/transactors/account/SignerListSet.cpp
+++ b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
@@ -197,7 +197,7 @@ removeSignersFromLedger(
     // If the lsfOneOwnerCount bit is set then remove just one owner count.
     // Otherwise use the pre-MultiSignReserve amendment calculation.
     int removeFromOwnerCount = -1;
-    if ((signers->getFlags() & lsfOneOwnerCount) == 0)
+    if (!signers->isFlag(lsfOneOwnerCount))
     {
         STArray const& actualList = signers->getFieldArray(sfSignerEntries);
         removeFromOwnerCount =
diff --git a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
index 33da5c417a..75d6b30315 100644
--- a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
+++ b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
@@ -130,7 +130,7 @@ checkAttestationPublicKey(
         if (accountFromPK == attestationSignerAccount)
         {
             // master key
-            if ((sleAttestationSigningAccount->getFieldU32(sfFlags) & lsfDisableMaster) != 0u)
+            if (sleAttestationSigningAccount->isFlag(lsfDisableMaster))
             {
                 JLOG(j.trace()) << "Attempt to add an attestation with "
                                    "disabled master key.";
@@ -408,7 +408,7 @@ transferHelper(
     {
         // Check dst tag and deposit auth
 
-        if (((sleDst->getFlags() & lsfRequireDestTag) != 0u) && !dstTag)
+        if (sleDst->isFlag(lsfRequireDestTag) && !dstTag)
             return tecDST_TAG_NEEDED;
 
         // If the destination is the claim owner, and this is a claim
@@ -417,7 +417,7 @@ transferHelper(
         bool const canBypassDepositAuth =
             dst == claimOwner && depositAuthPolicy == DepositAuthPolicy::DstCanBypass;
 
-        if (!canBypassDepositAuth && ((sleDst->getFlags() & lsfDepositAuth) != 0u) &&
+        if (!canBypassDepositAuth && sleDst->isFlag(lsfDepositAuth) &&
             !psb.exists(keylet::depositPreauth(dst, src)))
         {
             return tecNO_PERMISSION;
@@ -1425,7 +1425,7 @@ XChainCreateBridge::preclaim(PreclaimContext const& ctx)
 
         // Allowing clawing back funds would break the bridge's invariant that
         // wrapped funds are always backed by locked funds
-        if ((sleIssuer->getFlags() & lsfAllowTrustLineClawback) != 0u)
+        if (sleIssuer->isFlag(lsfAllowTrustLineClawback))
             return tecNO_PERMISSION;
     }
 
@@ -1504,7 +1504,7 @@ BridgeModify::preflight(PreflightContext const& ctx)
     auto const reward = ctx.tx[~sfSignatureReward];
     auto const minAccountCreate = ctx.tx[~sfMinAccountCreateAmount];
     auto const bridgeSpec = ctx.tx[sfXChainBridge];
-    bool const clearAccountCreate = (ctx.tx.getFlags() & tfClearAccountCreateAmount) != 0u;
+    bool const clearAccountCreate = ctx.tx.isFlag(tfClearAccountCreateAmount);
 
     if (!reward && !minAccountCreate && !clearAccountCreate)
     {
@@ -1562,7 +1562,7 @@ BridgeModify::doApply()
     auto const bridgeSpec = ctx_.tx[sfXChainBridge];
     auto const reward = ctx_.tx[~sfSignatureReward];
     auto const minAccountCreate = ctx_.tx[~sfMinAccountCreateAmount];
-    bool const clearAccountCreate = (ctx_.tx.getFlags() & tfClearAccountCreateAmount) != 0u;
+    bool const clearAccountCreate = ctx_.tx.isFlag(tfClearAccountCreateAmount);
 
     auto const sleAcct = ctx_.view().peek(keylet::account(account));
     if (!sleAcct)
diff --git a/src/libxrpl/tx/transactors/check/CheckCash.cpp b/src/libxrpl/tx/transactors/check/CheckCash.cpp
index bef04510f8..a5cd224f1e 100644
--- a/src/libxrpl/tx/transactors/check/CheckCash.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCash.cpp
@@ -115,8 +115,7 @@ CheckCash::preclaim(PreclaimContext const& ctx)
             return tecNO_ENTRY;
         }
 
-        if (((sleDst->getFlags() & lsfRequireDestTag) != 0u) &&
-            !sleCheck->isFieldPresent(sfDestinationTag))
+        if (sleDst->isFlag(lsfRequireDestTag) && !sleCheck->isFieldPresent(sfDestinationTag))
         {
             // The tag is basically account-specific information we don't
             // understand, but we can require someone to fill it in.
@@ -200,7 +199,7 @@ CheckCash::preclaim(PreclaimContext const& ctx)
                         return tecNO_ISSUER;
                     }
 
-                    if ((sleIssuer->at(sfFlags) & lsfRequireAuth) != 0u)
+                    if (sleIssuer->isFlag(lsfRequireAuth))
                     {
                         if (!sleTrustLine)
                         {
@@ -433,21 +432,21 @@ CheckCash::doApply()
                         initialBalance.get<Issue>().account = noAccount();
 
                         if (TER const ter = trustCreate(
-                                psb,                                           // payment sandbox
-                                destLow,                                       // is dest low?
-                                deliverIssuer,                                 // source
-                                account_,                                      // destination
-                                trustLineKey->key,                             // ledger index
-                                sleDst,                                        // Account to add to
-                                false,                                         // authorize account
-                                (sleDst->getFlags() & lsfDefaultRipple) == 0,  //
-                                false,                                         // freeze trust line
-                                false,                      // deep freeze trust line
-                                initialBalance,             // zero initial balance
-                                Issue(currency, account_),  // limit of zero
-                                0,                          // quality in
-                                0,                          // quality out
-                                viewJ);                     // journal
+                                psb,                                // payment sandbox
+                                destLow,                            // is dest low?
+                                deliverIssuer,                      // source
+                                account_,                           // destination
+                                trustLineKey->key,                  // ledger index
+                                sleDst,                             // Account to add to
+                                false,                              // authorize account
+                                !sleDst->isFlag(lsfDefaultRipple),  //
+                                false,                              // freeze trust line
+                                false,                              // deep freeze trust line
+                                initialBalance,                     // zero initial balance
+                                Issue(currency, account_),          // limit of zero
+                                0,                                  // quality in
+                                0,                                  // quality out
+                                viewJ);                             // journal
                             !isTesSuccess(ter))
                         {
                             return ter;
diff --git a/src/libxrpl/tx/transactors/check/CheckCreate.cpp b/src/libxrpl/tx/transactors/check/CheckCreate.cpp
index 4c0f1858b6..b94a44c65f 100644
--- a/src/libxrpl/tx/transactors/check/CheckCreate.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCreate.cpp
@@ -86,10 +86,8 @@ CheckCreate::preclaim(PreclaimContext const& ctx)
         return tecNO_DST;
     }
 
-    auto const flags = sleDst->getFlags();
-
     // Check if the destination has disallowed incoming checks
-    if ((flags & lsfDisallowIncomingCheck) != 0u)
+    if (sleDst->isFlag(lsfDisallowIncomingCheck))
         return tecNO_PERMISSION;
 
     // Pseudo-accounts cannot cash checks. Note, this is not amendment-gated
@@ -99,7 +97,7 @@ CheckCreate::preclaim(PreclaimContext const& ctx)
     if (isPseudoAccount(sleDst))
         return tecNO_PERMISSION;
 
-    if (((flags & lsfRequireDestTag) != 0u) && !ctx.tx.isFieldPresent(sfDestinationTag))
+    if (sleDst->isFlag(lsfRequireDestTag) && !ctx.tx.isFieldPresent(sfDestinationTag))
     {
         // The tag is basically account-specific information we don't
         // understand, but we can require someone to fill it in.
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
index 22e0df5df5..10c5334504 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
@@ -73,7 +73,7 @@ CredentialAccept::preclaim(PreclaimContext const& ctx)
         return tecNO_ENTRY;
     }
 
-    if ((sleCred->getFieldU32(sfFlags) & lsfAccepted) != 0u)
+    if (sleCred->isFlag(lsfAccepted))
     {
         JLOG(ctx.j.warn()) << "Credential already accepted: " << to_string(subject) << ", "
                            << to_string(issuer) << ", " << credType;
diff --git a/src/libxrpl/tx/transactors/dex/AMMClawback.cpp b/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
index 438b0c5c59..f034180cd6 100644
--- a/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
@@ -71,9 +71,7 @@ AMMClawback::preflight(PreflightContext const& ctx)
     if (isXRP(asset))
         return temMALFORMED;
 
-    auto const flags = ctx.tx.getFlags();
-
-    if (((flags & tfClawTwoAssets) != 0u) && asset.getIssuer() != asset2.getIssuer())
+    if (ctx.tx.isFlag(tfClawTwoAssets) && asset.getIssuer() != asset2.getIssuer())
     {
         JLOG(ctx.j.trace()) << "AMMClawback: tfClawTwoAssets can only be enabled when two "
                                "assets in the AMM pool are both issued by the issuer";
@@ -119,13 +117,11 @@ AMMClawback::preclaim(PreclaimContext const& ctx)
         return terNO_AMM;
     }
 
-    std::uint32_t const issuerFlagsIn = sleIssuer->getFieldU32(sfFlags);
     if (!ctx.view.rules().enabled(featureMPTokensV2))
     {
         // If AllowTrustLineClawback is not set or NoFreeze is set, return no
         // permission
-        if (((issuerFlagsIn & lsfAllowTrustLineClawback) == 0u) ||
-            ((issuerFlagsIn & lsfNoFreeze) != 0u))
+        if (!sleIssuer->isFlag(lsfAllowTrustLineClawback) || sleIssuer->isFlag(lsfNoFreeze))
         {
             return tecNO_PERMISSION;
         }
@@ -137,8 +133,8 @@ AMMClawback::preclaim(PreclaimContext const& ctx)
                 if (issue.native())
                     return false;  // LCOV_EXCL_LINE
 
-                return ((issuerFlagsIn & lsfAllowTrustLineClawback) != 0u) &&
-                    ((issuerFlagsIn & lsfNoFreeze) == 0u);
+                return sleIssuer->isFlag(lsfAllowTrustLineClawback) &&
+                    !sleIssuer->isFlag(lsfNoFreeze);
             },
             [&](MPTIssue const& issue) {
                 auto const sleIssuance = ctx.view.read(keylet::mptIssuance(issue.getMptID()));
@@ -288,8 +284,7 @@ AMMClawback::applyGuts(Sandbox& sb)
     if (!amount2Withdraw)
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
-    auto const flags = ctx_.tx.getFlags();
-    if ((flags & tfClawTwoAssets) != 0u)
+    if (ctx_.tx.isFlag(tfClawTwoAssets))
         return sendAmount(*amount2Withdraw);
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
index a2557b9abb..c6d7515542 100644
--- a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
@@ -132,7 +132,7 @@ AMMCreate::preclaim(PreclaimContext const& ctx)
             return false;
 
         if (auto const issuerAccount = view.read(keylet::account(asset.getIssuer())))
-            return (issuerAccount->getFlags() & lsfDefaultRipple) == 0;
+            return !issuerAccount->isFlag(lsfDefaultRipple);
 
         return false;
     };
diff --git a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
index 087065d51a..f8cdf1b29b 100644
--- a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
@@ -75,35 +75,35 @@ AMMDeposit::preflight(PreflightContext const& ctx)
         JLOG(ctx.j.debug()) << "AMM Deposit: invalid flags.";
         return temMALFORMED;
     }
-    if ((flags & tfLPToken) != 0u)
+    if (ctx.tx.isFlag(tfLPToken))
     {
         // if included then both amount and amount2 are deposit min
         if (!lpTokens || ePrice || (amount && !amount2) || (!amount && amount2) || tradingFee)
             return temMALFORMED;
     }
-    else if ((flags & tfSingleAsset) != 0u)
+    else if (ctx.tx.isFlag(tfSingleAsset))
     {
         // if included then lpTokens is deposit min
         if (!amount || amount2 || ePrice || tradingFee)
             return temMALFORMED;
     }
-    else if ((flags & tfTwoAsset) != 0u)
+    else if (ctx.tx.isFlag(tfTwoAsset))
     {
         // if included then lpTokens is deposit min
         if (!amount || !amount2 || ePrice || tradingFee)
             return temMALFORMED;
     }
-    else if ((flags & tfOneAssetLPToken) != 0u)
+    else if (ctx.tx.isFlag(tfOneAssetLPToken))
     {
         if (!amount || !lpTokens || amount2 || ePrice || tradingFee)
             return temMALFORMED;
     }
-    else if ((flags & tfLimitLPToken) != 0u)
+    else if (ctx.tx.isFlag(tfLimitLPToken))
     {
         if (!amount || !ePrice || lpTokens || amount2 || tradingFee)
             return temMALFORMED;
     }
-    else if ((flags & tfTwoAssetIfEmpty) != 0u)
+    else if (ctx.tx.isFlag(tfTwoAssetIfEmpty))
     {
         if (!amount || !amount2 || ePrice || lpTokens)
             return temMALFORMED;
@@ -198,7 +198,7 @@ AMMDeposit::preclaim(PreclaimContext const& ctx)
     if (!expected)
         return expected.error();  // LCOV_EXCL_LINE
     auto const [amountBalance, amount2Balance, lptAMMBalance] = *expected;
-    if ((ctx.tx.getFlags() & tfTwoAssetIfEmpty) != 0u)
+    if (ctx.tx.isFlag(tfTwoAssetIfEmpty))
     {
         if (lptAMMBalance != beast::kZERO)
             return tecAMM_NOT_EMPTY;
@@ -331,7 +331,7 @@ AMMDeposit::preclaim(PreclaimContext const& ctx)
     };
 
     // amount and amount2 are deposit min in case of tfLPToken
-    if ((ctx.tx.getFlags() & tfLPToken) == 0u)
+    if (!ctx.tx.isFlag(tfLPToken))
     {
         if (auto const ter = checkAmount(amount, true))
             return ter;
diff --git a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
index 0ecd6a4fa2..b13297df33 100644
--- a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
@@ -83,37 +83,37 @@ AMMWithdraw::preflight(PreflightContext const& ctx)
         JLOG(ctx.j.debug()) << "AMM Withdraw: invalid flags.";
         return temMALFORMED;
     }
-    if ((flags & tfLPToken) != 0u)
+    if (ctx.tx.isFlag(tfLPToken))
     {
         if (!lpTokens || amount || amount2 || ePrice)
             return temMALFORMED;
     }
-    else if ((flags & tfWithdrawAll) != 0u)
+    else if (ctx.tx.isFlag(tfWithdrawAll))
     {
         if (lpTokens || amount || amount2 || ePrice)
             return temMALFORMED;
     }
-    else if ((flags & tfOneAssetWithdrawAll) != 0u)
+    else if (ctx.tx.isFlag(tfOneAssetWithdrawAll))
     {
         if (!amount || lpTokens || amount2 || ePrice)
             return temMALFORMED;
     }
-    else if ((flags & tfSingleAsset) != 0u)
+    else if (ctx.tx.isFlag(tfSingleAsset))
     {
         if (!amount || lpTokens || amount2 || ePrice)
             return temMALFORMED;
     }
-    else if ((flags & tfTwoAsset) != 0u)
+    else if (ctx.tx.isFlag(tfTwoAsset))
     {
         if (!amount || !amount2 || lpTokens || ePrice)
             return temMALFORMED;
     }
-    else if ((flags & tfOneAssetLPToken) != 0u)
+    else if (ctx.tx.isFlag(tfOneAssetLPToken))
     {
         if (!amount || !lpTokens || amount2 || ePrice)
             return temMALFORMED;
     }
-    else if ((flags & tfLimitLPToken) != 0u)
+    else if (ctx.tx.isFlag(tfLimitLPToken))
     {
         if (!amount || !ePrice || lpTokens || amount2)
             return temMALFORMED;
diff --git a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
index f5bcdcf2ce..d6a83beb51 100644
--- a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
@@ -91,13 +91,11 @@ OfferCreate::preflight(PreflightContext const& ctx)
     auto& tx = ctx.tx;
     auto& j = ctx.j;
 
-    std::uint32_t const uTxFlags = tx.getFlags();
-
     if (tx.isFlag(tfHybrid) && !tx.isFieldPresent(sfDomainID))
         return temINVALID_FLAG;
 
-    bool const bImmediateOrCancel((uTxFlags & tfImmediateOrCancel) != 0u);
-    bool const bFillOrKill((uTxFlags & tfFillOrKill) != 0u);
+    bool const bImmediateOrCancel(tx.isFlag(tfImmediateOrCancel));
+    bool const bFillOrKill(tx.isFlag(tfFillOrKill));
 
     if (bImmediateOrCancel && bFillOrKill)
     {
@@ -274,7 +272,7 @@ OfferCreate::checkAcceptAsset(
     return asset.visit(
         [&](Issue const& issue) -> TER {
             auto const& issuer = issue.getIssuer();
-            if (((*issuerAccount)[sfFlags] & lsfRequireAuth) != 0u)
+            if (issuerAccount->isFlag(lsfRequireAuth))
             {
                 auto const trustLine = view.read(keylet::line(id, issuer, issue.currency));
 
@@ -289,8 +287,7 @@ OfferCreate::checkAcceptAsset(
                 // access.
                 bool const canonicalGt(id > issuer);
 
-                bool const isAuthorized(
-                    ((*trustLine)[sfFlags] & (canonicalGt ? lsfLowAuth : lsfHighAuth)) != 0u);
+                bool const isAuthorized(trustLine->isFlag(canonicalGt ? lsfLowAuth : lsfHighAuth));
 
                 if (!isAuthorized)
                 {
@@ -380,8 +377,7 @@ OfferCreate::flowCross(
 
         // If we're creating a passive offer adjust the threshold so we only
         // cross offers that have a better quality than this one.
-        std::uint32_t const txFlags = ctx_.tx.getFlags();
-        if ((txFlags & tfPassive) != 0u)
+        if (ctx_.tx.isFlag(tfPassive))
             ++threshold;
 
         // Don't send more than our balance.
@@ -403,7 +399,7 @@ OfferCreate::flowCross(
         STAmount deliver = takerAmount.out;
         auto const& deliverAsset = deliver.asset();
         OfferCrossing offerCrossing = OfferCrossing::Yes;
-        if ((txFlags & tfSell) != 0u)
+        if (ctx_.tx.isFlag(tfSell))
         {
             offerCrossing = OfferCrossing::Sell;
             // We are selling, so we will accept *more* than the offer
@@ -437,9 +433,9 @@ OfferCreate::flowCross(
             account_,
             account_,
             paths,
-            true,                            // default path
-            (txFlags & tfFillOrKill) == 0u,  // partial payment
-            true,                            // owner pays transfer fee
+            true,                           // default path
+            !ctx_.tx.isFlag(tfFillOrKill),  // partial payment
+            true,                           // owner pays transfer fee
             offerCrossing,
             threshold,
             sendMax,
@@ -478,7 +474,7 @@ OfferCreate::flowCross(
             {
                 STAmount const rate{Quality{takerAmount.out, takerAmount.in}.rate()};
 
-                if ((txFlags & tfSell) != 0u)
+                if (ctx_.tx.isFlag(tfSell))
                 {
                     // If selling then scale the new out amount based on how
                     // much we sold during crossing.  This preserves the offer
@@ -597,13 +593,11 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
 {
     using beast::kZERO;
 
-    std::uint32_t const uTxFlags = ctx_.tx.getFlags();
-
-    bool const bPassive((uTxFlags & tfPassive) != 0u);
-    bool const bImmediateOrCancel((uTxFlags & tfImmediateOrCancel) != 0u);
-    bool const bFillOrKill((uTxFlags & tfFillOrKill) != 0u);
-    bool const bSell((uTxFlags & tfSell) != 0u);
-    bool const bHybrid((uTxFlags & tfHybrid) != 0u);
+    bool const bPassive(ctx_.tx.isFlag(tfPassive));
+    bool const bImmediateOrCancel(ctx_.tx.isFlag(tfImmediateOrCancel));
+    bool const bFillOrKill(ctx_.tx.isFlag(tfFillOrKill));
+    bool const bSell(ctx_.tx.isFlag(tfSell));
+    bool const bHybrid(ctx_.tx.isFlag(tfHybrid));
 
     auto saTakerPays = ctx_.tx[sfTakerPays];
     auto saTakerGets = ctx_.tx[sfTakerGets];
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
index dd9c1b84b4..e9c7857072 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
@@ -442,7 +442,7 @@ EscrowCreate::doApply()
         auto const sled = ctx_.view().read(keylet::account(ctx_.tx[sfDestination]));
         if (!sled)
             return tecNO_DST;  // LCOV_EXCL_LINE
-        if ((((*sled)[sfFlags] & lsfRequireDestTag) != 0u) && !ctx_.tx[~sfDestinationTag])
+        if (sled->isFlag(lsfRequireDestTag) && !ctx_.tx[~sfDestinationTag])
             return tecDST_TAG_NEEDED;
     }
 
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
index c46930ba08..0888066aef 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
@@ -159,7 +159,7 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx)
 
     if (bo)
     {
-        if (((*bo)[sfFlags] & lsfSellNFToken) == lsfSellNFToken)
+        if (bo->isFlag(lsfSellNFToken))
             return tecNFTOKEN_OFFER_TYPE_MISMATCH;
 
         // An account can't accept an offer it placed:
@@ -218,7 +218,7 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx)
 
     if (so)
     {
-        if (((*so)[sfFlags] & lsfSellNFToken) != lsfSellNFToken)
+        if (!so->isFlag(lsfSellNFToken))
             return tecNFTOKEN_OFFER_TYPE_MISMATCH;
 
         // An account can't accept an offer it placed:
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenCreateOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenCreateOffer.cpp
index 727290a80c..9c7fe7d5ef 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenCreateOffer.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenCreateOffer.cpp
@@ -55,9 +55,8 @@ NFTokenCreateOffer::preclaim(PreclaimContext const& ctx)
 
     uint256 const nftokenID = ctx.tx[sfNFTokenID];
     std::uint32_t const txFlags = ctx.tx.getFlags();
-
     if (!nft::findToken(
-            ctx.view, ctx.tx[((txFlags & tfSellNFToken) != 0u) ? sfAccount : sfOwner], nftokenID))
+            ctx.view, ctx.tx[ctx.tx.isFlag(tfSellNFToken) ? sfAccount : sfOwner], nftokenID))
         return tecNO_ENTRY;
 
     // Use implementation shared with NFTokenMint
diff --git a/src/libxrpl/tx/transactors/payment/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp
index d7a1a63ef1..fc7bf753b1 100644
--- a/src/libxrpl/tx/transactors/payment/Payment.cpp
+++ b/src/libxrpl/tx/transactors/payment/Payment.cpp
@@ -122,14 +122,12 @@ Payment::preflight(PreflightContext const& ctx)
     if (!ctx.rules.enabled(featureMPTokensV1) && isDstMPT)
         return temDISABLED;
 
-    std::uint32_t const txFlags = tx.getFlags();
-
     if (!mpTokensV2 && isDstMPT && ctx.tx.isFieldPresent(sfPaths))
         return temMALFORMED;
 
-    bool const partialPaymentAllowed = (txFlags & tfPartialPayment) != 0u;
-    bool const limitQuality = (txFlags & tfLimitQuality) != 0u;
-    bool const defaultPathsAllowed = (txFlags & tfNoRippleDirect) == 0u;
+    bool const partialPaymentAllowed = tx.isFlag(tfPartialPayment);
+    bool const limitQuality = tx.isFlag(tfLimitQuality);
+    bool const defaultPathsAllowed = !tx.isFlag(tfNoRippleDirect);
     bool const hasPaths = tx.isFieldPresent(sfPaths);
     bool const hasMax = tx.isFieldPresent(sfSendMax);
 
@@ -311,8 +309,7 @@ TER
 Payment::preclaim(PreclaimContext const& ctx)
 {
     // Ripple if source or destination is non-native or if there are paths.
-    std::uint32_t const txFlags = ctx.tx.getFlags();
-    bool const partialPaymentAllowed = (txFlags & tfPartialPayment) != 0u;
+    bool const partialPaymentAllowed = ctx.tx.isFlag(tfPartialPayment);
     auto const hasPaths = ctx.tx.isFieldPresent(sfPaths);
     auto const sendMax = ctx.tx[~sfSendMax];
 
@@ -357,9 +354,7 @@ Payment::preclaim(PreclaimContext const& ctx)
             return tecNO_DST_INSUF_XRP;
         }
     }
-    else if (
-        ((sleDst->getFlags() & lsfRequireDestTag) != 0u) &&
-        !ctx.tx.isFieldPresent(sfDestinationTag))
+    else if (sleDst->isFlag(lsfRequireDestTag) && !ctx.tx.isFieldPresent(sfDestinationTag))
     {
         // The tag is basically account-specific information we don't
         // understand, but we can require someone to fill it in.
@@ -406,10 +401,9 @@ Payment::doApply()
     auto const deliverMin = ctx_.tx[~sfDeliverMin];
 
     // Ripple if source or destination is non-native or if there are paths.
-    std::uint32_t const txFlags = ctx_.tx.getFlags();
-    bool const partialPaymentAllowed = (txFlags & tfPartialPayment) != 0u;
-    bool const limitQuality = (txFlags & tfLimitQuality) != 0u;
-    bool const defaultPathsAllowed = (txFlags & tfNoRippleDirect) == 0u;
+    bool const partialPaymentAllowed = ctx_.tx.isFlag(tfPartialPayment);
+    bool const limitQuality = ctx_.tx.isFlag(tfLimitQuality);
+    bool const defaultPathsAllowed = !ctx_.tx.isFlag(tfNoRippleDirect);
     auto const hasPaths = ctx_.tx.isFieldPresent(sfPaths);
     auto const sendMax = ctx_.tx[~sfSendMax];
 
@@ -672,7 +666,7 @@ Payment::doApply()
     sleDst->setFieldAmount(sfBalance, sleDst->getFieldAmount(sfBalance) + dstAmount);
 
     // Re-arm the password change fee if we can and need to.
-    if ((sleDst->getFlags() & lsfPasswordSpent) != 0u)
+    if (sleDst->isFlag(lsfPasswordSpent))
         sleDst->clearFlag(lsfPasswordSpent);
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp
index 13c6a9b235..272100d792 100644
--- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp
+++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp
@@ -55,9 +55,7 @@ PaymentChannelClaim::preflight(PreflightContext const& ctx)
         return temBAD_AMOUNT;
 
     {
-        auto const flags = ctx.tx.getFlags();
-
-        if (((flags & tfClose) != 0u) && ((flags & tfRenew) != 0u))
+        if (ctx.tx.isFlag(tfClose) && ctx.tx.isFlag(tfRenew))
             return temMALFORMED;
     }
 
@@ -173,7 +171,7 @@ PaymentChannelClaim::doApply()
         ctx_.view().update(slep);
     }
 
-    if ((ctx_.tx.getFlags() & tfRenew) != 0u)
+    if (ctx_.tx.isFlag(tfRenew))
     {
         if (src != txAccount)
             return tecNO_PERMISSION;
@@ -181,7 +179,7 @@ PaymentChannelClaim::doApply()
         ctx_.view().update(slep);
     }
 
-    if ((ctx_.tx.getFlags() & tfClose) != 0u)
+    if (ctx_.tx.isFlag(tfClose))
     {
         // Channel will close immediately if dry or the receiver closes
         if (dst == txAccount || (*slep)[sfBalance] == (*slep)[sfAmount])
diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
index bbc8d9f13a..13670b7f80 100644
--- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
+++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
@@ -96,13 +96,11 @@ PaymentChannelCreate::preclaim(PreclaimContext const& ctx)
         if (!sled)
             return tecNO_DST;
 
-        auto const flags = sled->getFlags();
-
         // Check if they have disallowed incoming payment channels
-        if ((flags & lsfDisallowIncomingPayChan) != 0u)
+        if (sled->isFlag(lsfDisallowIncomingPayChan))
             return tecNO_PERMISSION;
 
-        if (((flags & lsfRequireDestTag) != 0u) && !ctx.tx[~sfDestinationTag])
+        if (sled->isFlag(lsfRequireDestTag) && !ctx.tx[~sfDestinationTag])
             return tecDST_TAG_NEEDED;
 
         // Pseudo-accounts cannot receive payment channels, other than native
diff --git a/src/libxrpl/tx/transactors/system/Batch.cpp b/src/libxrpl/tx/transactors/system/Batch.cpp
index a7c9ef52a0..a278b838b9 100644
--- a/src/libxrpl/tx/transactors/system/Batch.cpp
+++ b/src/libxrpl/tx/transactors/system/Batch.cpp
@@ -287,7 +287,7 @@ Batch::preflight(PreflightContext const& ctx)
             return temINVALID_INNER_BATCH;
         }
 
-        if ((stx.getFlags() & tfInnerBatchTxn) == 0u)
+        if (!stx.isFlag(tfInnerBatchTxn))
         {
             JLOG(ctx.j.debug()) << "BatchTrace[" << parentBatchId << "]: "
                                 << "inner txn must have the tfInnerBatchTxn flag. "
diff --git a/src/libxrpl/tx/transactors/system/Change.cpp b/src/libxrpl/tx/transactors/system/Change.cpp
index 13c09e8187..151e7f7256 100644
--- a/src/libxrpl/tx/transactors/system/Change.cpp
+++ b/src/libxrpl/tx/transactors/system/Change.cpp
@@ -177,10 +177,8 @@ Change::applyAmendment()
     if (std::ranges::find(amendments, amendment) != amendments.end())
         return tefALREADY;
 
-    auto flags = ctx_.tx.getFlags();
-
-    bool const gotMajority = (flags & tfGotMajority) != 0;
-    bool const lostMajority = (flags & tfLostMajority) != 0;
+    bool const gotMajority = ctx_.tx.isFlag(tfGotMajority);
+    bool const lostMajority = ctx_.tx.isFlag(tfLostMajority);
 
     if (gotMajority && lostMajority)
         return temINVALID_FLAG;
diff --git a/src/libxrpl/tx/transactors/token/Clawback.cpp b/src/libxrpl/tx/transactors/token/Clawback.cpp
index 0a524ac6d0..99c933d1c4 100644
--- a/src/libxrpl/tx/transactors/token/Clawback.cpp
+++ b/src/libxrpl/tx/transactors/token/Clawback.cpp
@@ -23,7 +23,6 @@
 #include <xrpl/tx/Transactor.h>
 
 #include <algorithm>
-#include <cstdint>
 #include <memory>
 #include <variant>
 
@@ -105,12 +104,9 @@ preclaimHelper<Issue>(
     AccountID const& holder,
     STAmount const& clawAmount)
 {
-    std::uint32_t const issuerFlagsIn = sleIssuer.getFieldU32(sfFlags);
-
     // If AllowTrustLineClawback is not set or NoFreeze is set, return no
     // permission
-    if (((issuerFlagsIn & lsfAllowTrustLineClawback) == 0u) ||
-        ((issuerFlagsIn & lsfNoFreeze) != 0u))
+    if (!sleIssuer.isFlag(lsfAllowTrustLineClawback) || sleIssuer.isFlag(lsfNoFreeze))
         return tecNO_PERMISSION;
 
     auto const sleRippleState =
@@ -163,7 +159,7 @@ preclaimHelper<MPTIssue>(
     if (!sleIssuance)
         return tecOBJECT_NOT_FOUND;
 
-    if (((*sleIssuance)[sfFlags] & lsfMPTCanClawback) == 0u)
+    if (!sleIssuance->isFlag(lsfMPTCanClawback))
         return tecNO_PERMISSION;
 
     if (sleIssuance->getAccountID(sfIssuer) != issuer)
diff --git a/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp b/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp
index dea65bd5a0..eb1cb04fc7 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp
@@ -58,7 +58,7 @@ MPTokenAuthorize::preclaim(PreclaimContext const& ctx)
         // before fetching the MPTIssuance object.
 
         // if holder wants to delete/unauthorize a mpt
-        if ((ctx.tx.getFlags() & tfMPTUnauthorize) != 0u)
+        if (ctx.tx.isFlag(tfMPTUnauthorize))
         {
             if (!sleMpt)
                 return tecOBJECT_NOT_FOUND;
@@ -112,8 +112,6 @@ MPTokenAuthorize::preclaim(PreclaimContext const& ctx)
     if (!sleMptIssuance)
         return tecOBJECT_NOT_FOUND;
 
-    std::uint32_t const mptIssuanceFlags = sleMptIssuance->getFieldU32(sfFlags);
-
     // If tx is submitted by issuer, they would either try to do the following
     // for allowlisting:
     // 1. authorize an account
@@ -126,7 +124,7 @@ MPTokenAuthorize::preclaim(PreclaimContext const& ctx)
 
     // If tx is submitted by issuer, it only applies for MPT with
     // lsfMPTRequireAuth set
-    if ((mptIssuanceFlags & lsfMPTRequireAuth) == 0u)
+    if (!sleMptIssuance->isFlag(lsfMPTRequireAuth))
         return tecNO_AUTH;
 
     // The holder must create the MPT before the issuer can authorize it.
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
index 567f5c3480..430d513670 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
@@ -72,7 +72,7 @@ MPTokenIssuanceCreate::preflight(PreflightContext const& ctx)
             return temMALFORMED;
 
         // Domain present implies that MPTokenIssuance is not public
-        if ((ctx.tx.getFlags() & tfMPTRequireAuth) == 0)
+        if (!ctx.tx.isFlag(tfMPTRequireAuth))
             return temMALFORMED;
     }
 
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp
index 05089621c6..438d7614c5 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp
@@ -86,10 +86,8 @@ MPTokenIssuanceSet::preflight(PreflightContext const& ctx)
     if (ctx.tx.isFieldPresent(sfDomainID) && ctx.tx.isFieldPresent(sfHolder))
         return temMALFORMED;
 
-    auto const txFlags = ctx.tx.getFlags();
-
     // fails if both flags are set
-    if (((txFlags & tfMPTLock) != 0u) && ((txFlags & tfMPTUnlock) != 0u))
+    if (ctx.tx.isFlag(tfMPTLock) && ctx.tx.isFlag(tfMPTUnlock))
         return temINVALID_FLAG;
 
     auto const accountID = ctx.tx[sfAccount];
@@ -100,7 +98,7 @@ MPTokenIssuanceSet::preflight(PreflightContext const& ctx)
     if (ctx.rules.enabled(featureSingleAssetVault) || ctx.rules.enabled(featureDynamicMPT))
     {
         // Is this transaction actually changing anything ?
-        if (txFlags == 0 && !ctx.tx.isFieldPresent(sfDomainID) && !isMutate)
+        if (ctx.tx.getFlags() == 0 && !ctx.tx.isFieldPresent(sfDomainID) && !isMutate)
             return temMALFORMED;
     }
 
@@ -111,7 +109,7 @@ MPTokenIssuanceSet::preflight(PreflightContext const& ctx)
             return temMALFORMED;
 
         // Can not set flags when mutating MPTokenIssuance
-        if (isMutate && ((txFlags & tfUniversalMask) != 0u))
+        if (isMutate && ((ctx.tx.getFlags() & tfUniversalMask) != 0u))
             return temMALFORMED;
 
         if (transferFee && *transferFee > kMAX_TRANSFER_FEE)
@@ -157,20 +155,18 @@ MPTokenIssuanceSet::checkPermission(ReadView const& view, STTx const& tx)
     if (isTesSuccess(checkTxPermission(sle, tx)))
         return tesSUCCESS;
 
-    auto const txFlags = tx.getFlags();
-
     // this is added in case more flags will be added for MPTokenIssuanceSet
     // in the future. Currently unreachable.
-    if ((txFlags & tfMPTokenIssuanceSetMask) != 0u)
+    if ((tx.getFlags() & tfMPTokenIssuanceSetMask) != 0u)
         return terNO_DELEGATE_PERMISSION;  // LCOV_EXCL_LINE
 
     std::unordered_set<GranularPermissionType> granularPermissions;
     loadGranularPermission(sle, ttMPTOKEN_ISSUANCE_SET, granularPermissions);
 
-    if (((txFlags & tfMPTLock) != 0u) && !granularPermissions.contains(MPTokenIssuanceLock))
+    if (tx.isFlag(tfMPTLock) && !granularPermissions.contains(MPTokenIssuanceLock))
         return terNO_DELEGATE_PERMISSION;
 
-    if (((txFlags & tfMPTUnlock) != 0u) && !granularPermissions.contains(MPTokenIssuanceUnlock))
+    if (tx.isFlag(tfMPTUnlock) && !granularPermissions.contains(MPTokenIssuanceUnlock))
         return terNO_DELEGATE_PERMISSION;
 
     return tesSUCCESS;
@@ -273,7 +269,6 @@ TER
 MPTokenIssuanceSet::doApply()
 {
     auto const mptIssuanceID = ctx_.tx[sfMPTokenIssuanceID];
-    auto const txFlags = ctx_.tx.getFlags();
     auto const holderID = ctx_.tx[~sfHolder];
     auto const domainID = ctx_.tx[~sfDomainID];
     std::shared_ptr<SLE> sle;
@@ -293,11 +288,11 @@ MPTokenIssuanceSet::doApply()
     std::uint32_t const flagsIn = sle->getFieldU32(sfFlags);
     std::uint32_t flagsOut = flagsIn;
 
-    if ((txFlags & tfMPTLock) != 0u)
+    if (ctx_.tx.isFlag(tfMPTLock))
     {
         flagsOut |= lsfMPTLocked;
     }
-    else if ((txFlags & tfMPTUnlock) != 0u)
+    else if (ctx_.tx.isFlag(tfMPTUnlock))
     {
         flagsOut &= ~lsfMPTLocked;
     }
diff --git a/src/libxrpl/tx/transactors/token/TrustSet.cpp b/src/libxrpl/tx/transactors/token/TrustSet.cpp
index 3c0d9ed7ae..d260281304 100644
--- a/src/libxrpl/tx/transactors/token/TrustSet.cpp
+++ b/src/libxrpl/tx/transactors/token/TrustSet.cpp
@@ -78,13 +78,11 @@ TrustSet::preflight(PreflightContext const& ctx)
     auto& tx = ctx.tx;
     auto& j = ctx.j;
 
-    std::uint32_t const uTxFlags = tx.getFlags();
-
     if (!ctx.rules.enabled(featureDeepFreeze))
     {
         // Even though the deep freeze flags are included in the
         // `tfTrustSetMask`, they are not valid if the amendment is not enabled.
-        if ((uTxFlags & (tfSetDeepFreeze | tfClearDeepFreeze)) != 0u)
+        if ((tx.getFlags() & (tfSetDeepFreeze | tfClearDeepFreeze)) != 0u)
         {
             return temINVALID_FLAG;
         }
@@ -142,12 +140,10 @@ TrustSet::checkPermission(ReadView const& view, STTx const& tx)
     if (isTesSuccess(checkTxPermission(sle, tx)))
         return tesSUCCESS;
 
-    std::uint32_t const txFlags = tx.getFlags();
-
     // Currently we only support TrustlineAuthorize, TrustlineFreeze and
     // TrustlineUnfreeze granular permission. Setting other flags returns
     // error.
-    if ((txFlags & tfTrustSetPermissionMask) != 0u)
+    if ((tx.getFlags() & tfTrustSetPermissionMask) != 0u)
         return terNO_DELEGATE_PERMISSION;
 
     if (tx.isFieldPresent(sfQualityIn) || tx.isFieldPresent(sfQualityOut))
@@ -166,11 +162,11 @@ TrustSet::checkPermission(ReadView const& view, STTx const& tx)
     std::unordered_set<GranularPermissionType> granularPermissions;
     loadGranularPermission(sle, ttTRUST_SET, granularPermissions);
 
-    if (((txFlags & tfSetfAuth) != 0u) && !granularPermissions.contains(TrustlineAuthorize))
+    if (tx.isFlag(tfSetfAuth) && !granularPermissions.contains(TrustlineAuthorize))
         return terNO_DELEGATE_PERMISSION;
-    if (((txFlags & tfSetFreeze) != 0u) && !granularPermissions.contains(TrustlineFreeze))
+    if (tx.isFlag(tfSetFreeze) && !granularPermissions.contains(TrustlineFreeze))
         return terNO_DELEGATE_PERMISSION;
-    if (((txFlags & tfClearFreeze) != 0u) && !granularPermissions.contains(TrustlineUnfreeze))
+    if (tx.isFlag(tfClearFreeze) && !granularPermissions.contains(TrustlineUnfreeze))
         return terNO_DELEGATE_PERMISSION;
 
     // updating LimitAmount is not allowed only with granular permissions,
@@ -197,11 +193,9 @@ TrustSet::preclaim(PreclaimContext const& ctx)
     if (!sle)
         return terNO_ACCOUNT;
 
-    std::uint32_t const uTxFlags = ctx.tx.getFlags();
+    bool const bSetAuth = ctx.tx.isFlag(tfSetfAuth);
 
-    bool const bSetAuth = (uTxFlags & tfSetfAuth) != 0u;
-
-    if (bSetAuth && ((sle->getFieldU32(sfFlags) & lsfRequireAuth) == 0u))
+    if (bSetAuth && !sle->isFlag(lsfRequireAuth))
     {
         JLOG(ctx.j.trace()) << "Retry: Auth not required.";
         return tefNO_AUTH_REQUIRED;
@@ -223,7 +217,7 @@ TrustSet::preclaim(PreclaimContext const& ctx)
 
     // If the destination has opted to disallow incoming trustlines
     // then honour that flag
-    if ((sleDst->getFlags() & lsfDisallowIncomingTrustline) != 0u)
+    if (sleDst->isFlag(lsfDisallowIncomingTrustline))
     {
         // The original implementation of featureDisallowIncoming was
         // too restrictive. If
@@ -288,8 +282,8 @@ TrustSet::preclaim(PreclaimContext const& ctx)
     if (ctx.view.rules().enabled(featureDeepFreeze))
     {
         bool const bNoFreeze = sle->isFlag(lsfNoFreeze);
-        bool const bSetFreeze = (uTxFlags & tfSetFreeze) != 0u;
-        bool const bSetDeepFreeze = (uTxFlags & tfSetDeepFreeze) != 0u;
+        bool const bSetFreeze = ctx.tx.isFlag(tfSetFreeze);
+        bool const bSetDeepFreeze = ctx.tx.isFlag(tfSetDeepFreeze);
 
         if (bNoFreeze && (bSetFreeze || bSetDeepFreeze))
         {
@@ -297,8 +291,8 @@ TrustSet::preclaim(PreclaimContext const& ctx)
             return tecNO_PERMISSION;
         }
 
-        bool const bClearFreeze = (uTxFlags & tfClearFreeze) != 0u;
-        bool const bClearDeepFreeze = (uTxFlags & tfClearDeepFreeze) != 0u;
+        bool const bClearFreeze = ctx.tx.isFlag(tfClearFreeze);
+        bool const bClearDeepFreeze = ctx.tx.isFlag(tfClearDeepFreeze);
         if ((bSetFreeze || bSetDeepFreeze) && (bClearFreeze || bClearDeepFreeze))
         {
             // Freezing and unfreezing in the same transaction should be
@@ -378,15 +372,13 @@ TrustSet::doApply()
     if (bQualityOut && QUALITY_ONE == uQualityOut)
         uQualityOut = 0;
 
-    std::uint32_t const uTxFlags = ctx_.tx.getFlags();
-
-    bool const bSetAuth = (uTxFlags & tfSetfAuth) != 0u;
-    bool const bSetNoRipple = (uTxFlags & tfSetNoRipple) != 0u;
-    bool const bClearNoRipple = (uTxFlags & tfClearNoRipple) != 0u;
-    bool const bSetFreeze = (uTxFlags & tfSetFreeze) != 0u;
-    bool const bClearFreeze = (uTxFlags & tfClearFreeze) != 0u;
-    bool const bSetDeepFreeze = (uTxFlags & tfSetDeepFreeze) != 0u;
-    bool const bClearDeepFreeze = (uTxFlags & tfClearDeepFreeze) != 0u;
+    bool const bSetAuth = ctx_.tx.isFlag(tfSetfAuth);
+    bool const bSetNoRipple = ctx_.tx.isFlag(tfSetNoRipple);
+    bool const bClearNoRipple = ctx_.tx.isFlag(tfClearNoRipple);
+    bool const bSetFreeze = ctx_.tx.isFlag(tfSetFreeze);
+    bool const bClearFreeze = ctx_.tx.isFlag(tfClearFreeze);
+    bool const bSetDeepFreeze = ctx_.tx.isFlag(tfSetDeepFreeze);
+    bool const bClearDeepFreeze = ctx_.tx.isFlag(tfClearDeepFreeze);
 
     auto viewJ = ctx_.registry.get().getJournal("View");
 
@@ -538,8 +530,8 @@ TrustSet::doApply()
         if (QUALITY_ONE == uHighQualityOut)
             uHighQualityOut = 0;
 
-        bool const bLowDefRipple = (sleLowAccount->getFlags() & lsfDefaultRipple) != 0u;
-        bool const bHighDefRipple = (sleHighAccount->getFlags() & lsfDefaultRipple) != 0u;
+        bool const bLowDefRipple = sleLowAccount->isFlag(lsfDefaultRipple);
+        bool const bHighDefRipple = sleHighAccount->isFlag(lsfDefaultRipple);
 
         bool const bLowReserveSet = (uLowQualityIn != 0u) || (uLowQualityOut != 0u) ||
             ((uFlagsOut & lsfLowNoRipple) == 0) != bLowDefRipple ||
@@ -553,8 +545,8 @@ TrustSet::doApply()
 
         bool const bDefault = bLowReserveClear && bHighReserveClear;
 
-        bool const bLowReserved = (uFlagsIn & lsfLowReserve) != 0u;
-        bool const bHighReserved = (uFlagsIn & lsfHighReserve) != 0u;
+        bool const bLowReserved = sleRippleState->isFlag(lsfLowReserve);
+        bool const bHighReserved = sleRippleState->isFlag(lsfHighReserve);
 
         bool bReserveIncrease = false;
 
diff --git a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
index 33f4dbf4fa..8bd8e6112e 100644
--- a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
@@ -26,7 +26,6 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/Transactor.h>
 
-#include <cstdint>
 #include <memory>
 #include <optional>
 #include <stdexcept>
@@ -186,8 +185,7 @@ VaultClawback::preclaim(PreclaimContext const& ctx)
                 if (mptIssue == nullptr)
                     return tecOBJECT_NOT_FOUND;
 
-                std::uint32_t const issueFlags = mptIssue->getFieldU32(sfFlags);
-                if ((issueFlags & lsfMPTCanClawback) == 0u)
+                if (!mptIssue->isFlag(lsfMPTCanClawback))
                 {
                     JLOG(ctx.j.debug()) << "VaultClawback: cannot clawback "
                                            "MPT vault asset.";
@@ -206,9 +204,7 @@ VaultClawback::preclaim(PreclaimContext const& ctx)
                     // LCOV_EXCL_STOP
                 }
 
-                std::uint32_t const issuerFlags = issuerSle->getFieldU32(sfFlags);
-                if (((issuerFlags & lsfAllowTrustLineClawback) == 0u) ||
-                    ((issuerFlags & lsfNoFreeze) != 0u))
+                if (!issuerSle->isFlag(lsfAllowTrustLineClawback) || issuerSle->isFlag(lsfNoFreeze))
                 {
                     JLOG(ctx.j.debug()) << "VaultClawback: cannot clawback "
                                            "IOU vault asset.";
diff --git a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
index f5831e46aa..ca7d0cc5fa 100644
--- a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
@@ -68,7 +68,7 @@ VaultCreate::preflight(PreflightContext const& ctx)
         {
             return temMALFORMED;
         }
-        if ((ctx.tx.getFlags() & tfVaultPrivate) == 0)
+        if (!ctx.tx.isFlag(tfVaultPrivate))
         {
             return temMALFORMED;  // DomainID only allowed on private vaults
         }
@@ -173,11 +173,10 @@ VaultCreate::doApply()
         ? 0
         : ctx_.tx[~sfScale].value_or(kVAULT_DEFAULT_IOU_SCALE);
 
-    auto txFlags = tx.getFlags();
     std::uint32_t mptFlags = 0;
-    if ((txFlags & tfVaultShareNonTransferable) == 0)
+    if (!tx.isFlag(tfVaultShareNonTransferable))
         mptFlags |= (lsfMPTCanEscrow | lsfMPTCanTrade | lsfMPTCanTransfer);
-    if ((txFlags & tfVaultPrivate) != 0u)
+    if (tx.isFlag(tfVaultPrivate))
         mptFlags |= lsfMPTRequireAuth;
 
     // Note, here we are **not** creating an MPToken for the assets held in
@@ -203,7 +202,7 @@ VaultCreate::doApply()
     auto const& mptIssuanceID = *maybeShare;
 
     vault->setFieldIssue(sfAsset, STIssue{sfAsset, asset});
-    vault->at(sfFlags) = txFlags & tfVaultPrivate;
+    vault->at(sfFlags) = tx.getFlags() & tfVaultPrivate;
     vault->at(sfSequence) = sequence;
     vault->at(sfOwner) = account_;
     vault->at(sfAccount) = pseudoId;
@@ -236,7 +235,7 @@ VaultCreate::doApply()
         return err;
 
     // If the vault is private, set the authorized flag for the vault owner
-    if ((txFlags & tfVaultPrivate) != 0u)
+    if (tx.isFlag(tfVaultPrivate))
     {
         if (auto const err = authorizeMPToken(
                 view(), preFeeBalance_, mptIssuanceID, pseudoId, ctx_.journal, {}, account_);
diff --git a/src/libxrpl/tx/transactors/vault/VaultSet.cpp b/src/libxrpl/tx/transactors/vault/VaultSet.cpp
index 78627f22b7..684413399d 100644
--- a/src/libxrpl/tx/transactors/vault/VaultSet.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultSet.cpp
@@ -103,7 +103,7 @@ VaultSet::preclaim(PreclaimContext const& ctx)
         }
 
         // Sanity check only, this should be enforced by VaultCreate
-        if ((sleIssuance->getFlags() & lsfMPTRequireAuth) == 0)
+        if (!sleIssuance->isFlag(lsfMPTRequireAuth))
         {
             // LCOV_EXCL_START
             JLOG(ctx.j.error()) << "VaultSet: issuance of vault shares is not private.";
diff --git a/src/test/app/Credentials_test.cpp b/src/test/app/Credentials_test.cpp
index 1d3f3b3ea8..ec0ea0beae 100644
--- a/src/test/app/Credentials_test.cpp
+++ b/src/test/app/Credentials_test.cpp
@@ -142,7 +142,7 @@ struct Credentials_test : public beast::unit_test::Suite
 
                 BEAST_EXPECT(sleCred->getAccountID(sfSubject) == issuer.id());
                 BEAST_EXPECT(sleCred->getAccountID(sfIssuer) == issuer.id());
-                BEAST_EXPECT((sleCred->getFieldU32(sfFlags) & lsfAccepted));
+                BEAST_EXPECT(sleCred->isFlag(lsfAccepted));
                 BEAST_EXPECT(
                     sleCred->getFieldU64(sfIssuerNode) == sleCred->getFieldU64(sfSubjectNode));
                 BEAST_EXPECT(ownerCount(env, issuer) == 1);
@@ -1074,7 +1074,7 @@ struct Credentials_test : public beast::unit_test::Suite
         // Verify credential exists and is accepted
         {
             auto const sleCred = env.current()->read(credKeylet);
-            BEAST_EXPECT(sleCred && sleCred->getFlags() & lsfAccepted);
+            BEAST_EXPECT(sleCred && sleCred->isFlag(lsfAccepted));
         }
 
         // Create DepositPreauth
@@ -1127,11 +1127,11 @@ struct Credentials_test : public beast::unit_test::Suite
 
         auto const dpTer = xrpl::verifyDepositPreauth(*stx, av, subject, becky, {}, j);
         auto sleCredAfter = av.read(credKeylet);
-        BEAST_EXPECT(sleCredAfter && (sleCredAfter->getFlags() & lsfAccepted));
+        BEAST_EXPECT(sleCredAfter && sleCredAfter->isFlag(lsfAccepted));
 
         auto const domTer = xrpl::verifyValidDomain(av, subject.id(), domain, j);
         sleCredAfter = av.read(credKeylet);
-        BEAST_EXPECT(sleCredAfter && (sleCredAfter->getFlags() & lsfAccepted));
+        BEAST_EXPECT(sleCredAfter && sleCredAfter->isFlag(lsfAccepted));
 
         if (fixEnabled)
         {
diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp
index 5452f02175..7b371b3c06 100644
--- a/src/test/app/DepositAuth_test.cpp
+++ b/src/test/app/DepositAuth_test.cpp
@@ -58,7 +58,7 @@ reserve(jtx::Env& env, std::uint32_t count)
 static bool
 hasDepositAuth(jtx::Env const& env, jtx::Account const& acct)
 {
-    return ((*env.le(acct))[sfFlags] & lsfDepositAuth) == lsfDepositAuth;
+    return env.le(acct)->isFlag(lsfDepositAuth);
 }
 
 struct DepositAuth_test : public beast::unit_test::Suite
diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp
index 00b1fe3f84..b9cba43011 100644
--- a/src/test/app/SetRegularKey_test.cpp
+++ b/src/test/app/SetRegularKey_test.cpp
@@ -84,15 +84,12 @@ public:
         env.fund(XRP(10000), alice, bob);
 
         auto ar = env.le(alice);
-        BEAST_EXPECT(
-            ar->isFieldPresent(sfFlags) && ((ar->getFieldU32(sfFlags) & lsfPasswordSpent) == 0));
+        BEAST_EXPECT(ar->isFieldPresent(sfFlags) && !ar->isFlag(lsfPasswordSpent));
 
         env(regkey(alice, bob), Sig(alice), Fee(0));
 
         ar = env.le(alice);
-        BEAST_EXPECT(
-            ar->isFieldPresent(sfFlags) &&
-            ((ar->getFieldU32(sfFlags) & lsfPasswordSpent) == lsfPasswordSpent));
+        BEAST_EXPECT(ar->isFieldPresent(sfFlags) && ar->isFlag(lsfPasswordSpent));
 
         // The second SetRegularKey transaction with Fee=0 should fail.
         env(regkey(alice, bob), Sig(alice), Fee(0), Ter(telINSUF_FEE_P));
@@ -100,8 +97,7 @@ public:
         env.trust(bob["USD"](1), alice);
         env(pay(bob, alice, bob["USD"](1)));
         ar = env.le(alice);
-        BEAST_EXPECT(
-            ar->isFieldPresent(sfFlags) && ((ar->getFieldU32(sfFlags) & lsfPasswordSpent) == 0));
+        BEAST_EXPECT(ar->isFieldPresent(sfFlags) && !ar->isFlag(lsfPasswordSpent));
     }
 
     void
diff --git a/src/test/jtx/impl/flags.cpp b/src/test/jtx/impl/flags.cpp
index 7733335668..ad49f559f3 100644
--- a/src/test/jtx/impl/flags.cpp
+++ b/src/test/jtx/impl/flags.cpp
@@ -34,7 +34,7 @@ Flags::operator()(Env& env) const
     }
     else if (sle->isFieldPresent(sfFlags))
     {
-        env.test.expect((sle->getFieldU32(sfFlags) & mask_) == mask_);
+        env.test.expect(sle->isFlag(mask_));
     }
     else
     {
diff --git a/src/xrpld/rpc/detail/PathRequest.cpp b/src/xrpld/rpc/detail/PathRequest.cpp
index 0b2d3b96c3..7aaf45c50f 100644
--- a/src/xrpld/rpc/detail/PathRequest.cpp
+++ b/src/xrpld/rpc/detail/PathRequest.cpp
@@ -219,7 +219,7 @@ PathRequest::isValid(std::shared_ptr<AssetCache> const& crCache)
     }
     else
     {
-        bool const disallowXRP((sleDest->getFlags() & lsfDisallowXRP) != 0u);
+        bool const disallowXRP(sleDest->isFlag(lsfDisallowXRP));
 
         auto const destAssets = accountDestAssets(*raDstAccount_, crCache, !disallowXRP);
 
diff --git a/src/xrpld/rpc/detail/Pathfinder.cpp b/src/xrpld/rpc/detail/Pathfinder.cpp
index 4ccb262477..21f232614b 100644
--- a/src/xrpld/rpc/detail/Pathfinder.cpp
+++ b/src/xrpld/rpc/detail/Pathfinder.cpp
@@ -952,7 +952,7 @@ Pathfinder::isNoRipple(
 
     auto const flag((toAccount > fromAccount) ? lsfHighNoRipple : lsfLowNoRipple);
 
-    return sleRipple && ((sleRipple->getFieldU32(sfFlags) & flag) != 0u);
+    return sleRipple && sleRipple->isFlag(flag);
 }
 
 // Does this path end on an account-to-account link whose last account has
@@ -1032,7 +1032,7 @@ Pathfinder::addLink(
 
             if (sleEnd)
             {
-                bool const bRequireAuth((sleEnd->getFieldU32(sfFlags) & lsfRequireAuth) != 0u);
+                bool const bRequireAuth(sleEnd->isFlag(lsfRequireAuth));
                 bool const bIsEndAsset(uEndPathAsset == dstAmount_.asset());
                 bool const bIsNoRippleOut(isNoRippleOut(currentPath));
                 bool const bDestOnly((addFlags & kAF_AC_LAST) != 0u);
diff --git a/src/xrpld/rpc/handlers/account/AccountLines.cpp b/src/xrpld/rpc/handlers/account/AccountLines.cpp
index 967f5151b7..d8f067a3be 100644
--- a/src/xrpld/rpc/handlers/account/AccountLines.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountLines.cpp
@@ -219,11 +219,11 @@ doAccountLines(RPC::JsonContext& context)
                     {
                         if (sleCur->getFieldAmount(sfLowLimit).getIssuer() == visitData.accountID)
                         {
-                            ignore = !(sleCur->getFieldU32(sfFlags) & lsfLowReserve);
+                            ignore = !sleCur->isFlag(lsfLowReserve);
                         }
                         else
                         {
-                            ignore = !(sleCur->getFieldU32(sfFlags) & lsfHighReserve);
+                            ignore = !sleCur->isFlag(lsfHighReserve);
                         }
                     }
 
diff --git a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
index df2d865b85..b8a2055069 100644
--- a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
+++ b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
@@ -116,7 +116,7 @@ doNoRippleCheck(RPC::JsonContext& context)
 
     json::Value& problems = (result["problems"] = json::ValueType::Array);
 
-    bool const bDefaultRipple = (sle->getFieldU32(sfFlags) & lsfDefaultRipple) != 0u;
+    bool const bDefaultRipple = sle->isFlag(lsfDefaultRipple);
 
     if (bDefaultRipple && !roleGateway)
     {
@@ -143,8 +143,7 @@ doNoRippleCheck(RPC::JsonContext& context)
             {
                 bool const bLow = accountID == ownedItem->getFieldAmount(sfLowLimit).getIssuer();
 
-                bool const bNoRipple =
-                    ownedItem->getFieldU32(sfFlags) & (bLow ? lsfLowNoRipple : lsfHighNoRipple);
+                bool const bNoRipple = ownedItem->isFlag(bLow ? lsfLowNoRipple : lsfHighNoRipple);
 
                 std::string problem;
                 bool needFix = false;
diff --git a/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp b/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
index 399df7c6ca..4963663b39 100644
--- a/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
@@ -86,7 +86,7 @@ doDepositAuthorized(RPC::JsonContext& context)
         return result;
     }
 
-    bool const reqAuth = ((sleDest->getFlags() & lsfDepositAuth) != 0u) && (srcAcct != dstAcct);
+    bool const reqAuth = sleDest->isFlag(lsfDepositAuth) && (srcAcct != dstAcct);
     bool const credentialsPresent = params.isMember(jss::credentials);
 
     std::set<std::pair<AccountID, Slice>> sorted;
@@ -135,7 +135,7 @@ doDepositAuthorized(RPC::JsonContext& context)
                 return result;
             }
 
-            if ((sleCred->getFlags() & lsfAccepted) == 0u)
+            if (!sleCred->isFlag(lsfAccepted))
             {
                 RPC::injectError(RpcBadCredentials, "credentials aren't accepted", result);
                 return result;

From 5b6e8b6f93b19c1e3f6a3467a25639031d9d9a53 Mon Sep 17 00:00:00 2001
From: Alex Kremer <akremer@ripple.com>
Date: Fri, 15 May 2026 16:32:19 +0100
Subject: [PATCH 03/12] refactor: Rename static constants (#7120)

Co-authored-by: Bart <bthomee@users.noreply.github.com>
---
 .clang-tidy                                   |  12 +-
 .github/scripts/rename/config.sh              |   2 +-
 .github/scripts/rename/docs.sh                |   2 +-
 include/xrpl/basics/IntrusivePointer.h        |   4 +-
 include/xrpl/basics/IntrusivePointer.ipp      |   8 +-
 include/xrpl/basics/IntrusiveRefCounts.h      |  94 ++-
 include/xrpl/basics/LocalValue.h              |   4 +-
 include/xrpl/basics/Log.h                     |   2 +-
 include/xrpl/basics/Number.h                  |  74 +--
 .../xrpl/basics/SharedWeakCachePointer.ipp    |   4 +-
 include/xrpl/basics/StringUtilities.h         |   4 +-
 include/xrpl/basics/UptimeClock.h             |   4 +-
 include/xrpl/basics/base_uint.h               |  52 +-
 include/xrpl/basics/chrono.h                  |   8 +-
 include/xrpl/basics/hardened_hash.h           |   6 +-
 include/xrpl/basics/mulDiv.h                  |   2 +-
 include/xrpl/basics/random.h                  |   8 +-
 include/xrpl/basics/safe_cast.h               |   4 +-
 include/xrpl/beast/clock/abstract_clock.h     |   4 +-
 include/xrpl/beast/core/CurrentThreadName.h   |   4 +-
 include/xrpl/beast/hash/hash_append.h         |   4 +-
 include/xrpl/beast/hash/xxhasher.h            |   6 +-
 include/xrpl/beast/unit_test/reporter.h       |   6 +-
 include/xrpl/beast/unit_test/suite.h          |   4 +-
 include/xrpl/beast/utility/Zero.h             |  14 +-
 include/xrpl/beast/utility/rngfill.h          |  12 +-
 include/xrpl/beast/xor_shift_engine.h         |   6 +-
 include/xrpl/conditions/Condition.h           |   2 +-
 include/xrpl/conditions/Fulfillment.h         |   2 +-
 .../xrpl/conditions/detail/PreimageSha256.h   |   4 +-
 include/xrpl/core/Coro.ipp                    |   4 +-
 include/xrpl/core/JobTypes.h                  |   4 +-
 include/xrpl/json/json_reader.h               |   2 +-
 include/xrpl/json/json_value.h                |  16 +-
 include/xrpl/ledger/Ledger.h                  |   2 +-
 include/xrpl/ledger/LedgerTiming.h            |  28 +-
 include/xrpl/ledger/OpenView.h                |   8 +-
 include/xrpl/ledger/detail/RawStateTable.h    |   6 +-
 include/xrpl/ledger/helpers/AMMHelpers.h      |   8 +-
 include/xrpl/ledger/helpers/EscrowHelpers.h   |   4 +-
 include/xrpl/ledger/helpers/LendingHelpers.h  |  16 +-
 include/xrpl/net/HTTPClient.h                 |   2 +-
 include/xrpl/nodestore/NodeObject.h           |   2 +-
 include/xrpl/nodestore/Types.h                |   4 +-
 include/xrpl/nodestore/detail/codec.h         |  12 +-
 include/xrpl/nodestore/detail/varint.h        |   2 +-
 include/xrpl/protocol/AMMCore.h               |  24 +-
 include/xrpl/protocol/AccountID.h             |   2 +-
 include/xrpl/protocol/AmountConversions.h     |  32 +-
 include/xrpl/protocol/ApiVersion.h            |  80 +--
 include/xrpl/protocol/Asset.h                 |   6 +-
 include/xrpl/protocol/Feature.h               |  16 +-
 include/xrpl/protocol/Fees.h                  |   2 +-
 include/xrpl/protocol/IOUAmount.h             |   2 +-
 include/xrpl/protocol/Indexes.h               |   8 +-
 include/xrpl/protocol/Issue.h                 |   8 +-
 include/xrpl/protocol/LedgerHeader.h          |  14 +-
 include/xrpl/protocol/MPTAmount.h             |   2 +-
 include/xrpl/protocol/MultiApiJson.h          |  42 +-
 include/xrpl/protocol/PathAsset.h             |   4 +-
 include/xrpl/protocol/Protocol.h              | 128 ++--
 include/xrpl/protocol/PublicKey.h             |  12 +-
 include/xrpl/protocol/Quality.h               |  26 +-
 include/xrpl/protocol/QualityFunction.h       |   2 +-
 include/xrpl/protocol/Rate.h                  |   2 +-
 include/xrpl/protocol/SField.h                |  38 +-
 include/xrpl/protocol/STAmount.h              |  38 +-
 include/xrpl/protocol/STBase.h                |   2 +-
 include/xrpl/protocol/STBitString.h           |   2 +-
 include/xrpl/protocol/STBlob.h                |   2 +-
 include/xrpl/protocol/STParsedJSON.h          |   4 +-
 include/xrpl/protocol/STTx.h                  |   4 +-
 include/xrpl/protocol/STValidation.h          |   6 +-
 include/xrpl/protocol/SecretKey.h             |   6 +-
 include/xrpl/protocol/Serializer.h            |   6 +-
 include/xrpl/protocol/SystemParameters.h      |  28 +-
 include/xrpl/protocol/UintTypes.h             |   2 +-
 include/xrpl/protocol/Units.h                 |  18 +-
 include/xrpl/protocol/XChainAttestations.h    |   2 +-
 include/xrpl/protocol/XRPAmount.h             |  16 +-
 include/xrpl/protocol/detail/STVar.h          |  10 +-
 include/xrpl/protocol/detail/b58_utils.h      |  10 +-
 include/xrpl/protocol/detail/sfields.macro    |  56 +-
 include/xrpl/protocol/digest.h                |  10 +-
 include/xrpl/protocol/nft.h                   |  10 +-
 include/xrpl/protocol/nftPageMask.h           |   2 +-
 include/xrpl/rdb/DBInit.h                     |  20 +-
 include/xrpl/resource/Fees.h                  |  31 +-
 include/xrpl/resource/detail/Entry.h          |   2 +-
 include/xrpl/resource/detail/Logic.h          |  44 +-
 include/xrpl/resource/detail/Tuning.h         |  12 +-
 include/xrpl/server/LoadFeeTrack.h            |  22 +-
 include/xrpl/server/detail/BaseHTTPPeer.h     |  15 +-
 include/xrpl/server/detail/BaseWSPeer.h       |   6 +-
 include/xrpl/server/detail/Door.h             |  22 +-
 include/xrpl/server/detail/ServerImpl.h       |   2 +-
 include/xrpl/server/detail/Spawn.h            |   8 +-
 include/xrpl/shamap/FullBelowCache.h          |   4 +-
 include/xrpl/shamap/SHAMap.h                  |   6 +-
 .../xrpl/shamap/SHAMapAccountStateLeafNode.h  |   2 +-
 include/xrpl/shamap/SHAMapInnerNode.h         |   2 +-
 include/xrpl/shamap/SHAMapTreeNode.h          |  12 +-
 include/xrpl/shamap/SHAMapTxLeafNode.h        |   2 +-
 .../xrpl/shamap/SHAMapTxPlusMetaLeafNode.h    |   2 +-
 include/xrpl/shamap/detail/TaggedPointer.h    |   6 +-
 include/xrpl/shamap/detail/TaggedPointer.ipp  | 124 ++--
 include/xrpl/tx/invariants/VaultInvariant.h   |   8 +-
 include/xrpl/tx/paths/AMMLiquidity.h          |   2 +-
 include/xrpl/tx/paths/Offer.h                 |   4 +-
 include/xrpl/tx/paths/detail/Steps.h          |   2 +-
 include/xrpl/tx/paths/detail/StrandFlow.h     |  24 +-
 .../tx/transactors/account/AccountDelete.h    |   2 +-
 .../xrpl/tx/transactors/account/AccountSet.h  |   2 +-
 .../tx/transactors/account/SetRegularKey.h    |   2 +-
 .../tx/transactors/account/SignerListSet.h    |   2 +-
 .../xrpl/tx/transactors/bridge/XChainBridge.h |  18 +-
 .../xrpl/tx/transactors/check/CheckCancel.h   |   2 +-
 include/xrpl/tx/transactors/check/CheckCash.h |   2 +-
 .../xrpl/tx/transactors/check/CheckCreate.h   |   2 +-
 .../credentials/CredentialAccept.h            |   2 +-
 .../credentials/CredentialCreate.h            |   2 +-
 .../credentials/CredentialDelete.h            |   2 +-
 .../tx/transactors/delegate/DelegateSet.h     |   2 +-
 include/xrpl/tx/transactors/dex/AMMBid.h      |   2 +-
 include/xrpl/tx/transactors/dex/AMMClawback.h |   2 +-
 include/xrpl/tx/transactors/dex/AMMContext.h  |   4 +-
 include/xrpl/tx/transactors/dex/AMMCreate.h   |   2 +-
 include/xrpl/tx/transactors/dex/AMMDelete.h   |   2 +-
 include/xrpl/tx/transactors/dex/AMMDeposit.h  |   2 +-
 include/xrpl/tx/transactors/dex/AMMVote.h     |   2 +-
 include/xrpl/tx/transactors/dex/AMMWithdraw.h |   2 +-
 include/xrpl/tx/transactors/dex/OfferCancel.h |   2 +-
 include/xrpl/tx/transactors/dex/OfferCreate.h |   2 +-
 include/xrpl/tx/transactors/did/DIDDelete.h   |   2 +-
 include/xrpl/tx/transactors/did/DIDSet.h      |   2 +-
 .../xrpl/tx/transactors/escrow/EscrowCancel.h |   2 +-
 .../xrpl/tx/transactors/escrow/EscrowCreate.h |   2 +-
 .../xrpl/tx/transactors/escrow/EscrowFinish.h |   2 +-
 .../lending/LoanBrokerCoverClawback.h         |   2 +-
 .../lending/LoanBrokerCoverDeposit.h          |   2 +-
 .../lending/LoanBrokerCoverWithdraw.h         |   2 +-
 .../tx/transactors/lending/LoanBrokerDelete.h |   2 +-
 .../tx/transactors/lending/LoanBrokerSet.h    |   2 +-
 .../xrpl/tx/transactors/lending/LoanDelete.h  |   2 +-
 .../xrpl/tx/transactors/lending/LoanManage.h  |   2 +-
 include/xrpl/tx/transactors/lending/LoanPay.h |   2 +-
 include/xrpl/tx/transactors/lending/LoanSet.h |  18 +-
 .../tx/transactors/nft/NFTokenAcceptOffer.h   |   2 +-
 include/xrpl/tx/transactors/nft/NFTokenBurn.h |   2 +-
 .../tx/transactors/nft/NFTokenCancelOffer.h   |   2 +-
 .../tx/transactors/nft/NFTokenCreateOffer.h   |   2 +-
 include/xrpl/tx/transactors/nft/NFTokenMint.h |   2 +-
 .../xrpl/tx/transactors/nft/NFTokenModify.h   |   2 +-
 .../xrpl/tx/transactors/oracle/OracleDelete.h |   2 +-
 .../xrpl/tx/transactors/oracle/OracleSet.h    |   2 +-
 .../tx/transactors/payment/DepositPreauth.h   |   2 +-
 include/xrpl/tx/transactors/payment/Payment.h |   6 +-
 .../payment_channel/PaymentChannelClaim.h     |   2 +-
 .../payment_channel/PaymentChannelCreate.h    |   2 +-
 .../payment_channel/PaymentChannelFund.h      |   2 +-
 .../PermissionedDomainDelete.h                |   2 +-
 .../PermissionedDomainSet.h                   |   2 +-
 include/xrpl/tx/transactors/system/Batch.h    |   4 +-
 include/xrpl/tx/transactors/system/Change.h   |   2 +-
 .../tx/transactors/system/LedgerStateFix.h    |   2 +-
 .../xrpl/tx/transactors/system/TicketCreate.h |   8 +-
 include/xrpl/tx/transactors/token/Clawback.h  |   2 +-
 .../tx/transactors/token/MPTokenAuthorize.h   |   2 +-
 .../transactors/token/MPTokenIssuanceCreate.h |   2 +-
 .../token/MPTokenIssuanceDestroy.h            |   2 +-
 .../tx/transactors/token/MPTokenIssuanceSet.h |   2 +-
 include/xrpl/tx/transactors/token/TrustSet.h  |   2 +-
 .../xrpl/tx/transactors/vault/VaultClawback.h |   2 +-
 .../xrpl/tx/transactors/vault/VaultCreate.h   |   2 +-
 .../xrpl/tx/transactors/vault/VaultDelete.h   |   2 +-
 .../xrpl/tx/transactors/vault/VaultDeposit.h  |   2 +-
 include/xrpl/tx/transactors/vault/VaultSet.h  |   2 +-
 .../xrpl/tx/transactors/vault/VaultWithdraw.h |   2 +-
 src/libxrpl/basics/BasicConfig.cpp            |   8 +-
 src/libxrpl/basics/CountedObject.cpp          |   4 +-
 src/libxrpl/basics/Log.cpp                    |   8 +-
 src/libxrpl/basics/MallocTrim.cpp             |   8 +-
 src/libxrpl/basics/Number.cpp                 | 142 ++--
 src/libxrpl/basics/StringUtilities.cpp        |   4 +-
 src/libxrpl/basics/UptimeClock.cpp            |  16 +-
 src/libxrpl/basics/base64.cpp                 |  14 +-
 src/libxrpl/basics/make_SSLContext.cpp        |  26 +-
 src/libxrpl/basics/mulDiv.cpp                 |   2 +-
 .../beast/clock/basic_seconds_clock.cpp       |   4 +-
 src/libxrpl/beast/core/CurrentThreadName.cpp  |   9 +-
 src/libxrpl/beast/insight/StatsDCollector.cpp |   4 +-
 src/libxrpl/beast/net/IPAddressV4.cpp         |   4 +-
 src/libxrpl/beast/utility/beast_Journal.cpp   |   4 +-
 src/libxrpl/conditions/Condition.cpp          |   8 +-
 src/libxrpl/conditions/Fulfillment.cpp        |   2 +-
 src/libxrpl/conditions/error.cpp              |   4 +-
 src/libxrpl/core/detail/Workers.cpp           |   4 +-
 src/libxrpl/crypto/csprng.cpp                 |   4 +-
 src/libxrpl/git/Git.cpp                       |  12 +-
 src/libxrpl/json/Writer.cpp                   |  34 +-
 src/libxrpl/json/json_reader.cpp              |  18 +-
 src/libxrpl/json/json_value.cpp               |  54 +-
 src/libxrpl/ledger/ApplyStateTable.cpp        |  10 +-
 src/libxrpl/ledger/ApplyView.cpp              |  36 +-
 src/libxrpl/ledger/BookDirs.cpp               |  22 +-
 src/libxrpl/ledger/CachedView.cpp             |  12 +-
 src/libxrpl/ledger/CanonicalTXSet.cpp         |   4 +-
 src/libxrpl/ledger/Dir.cpp                    |  10 +-
 src/libxrpl/ledger/Ledger.cpp                 |  14 +-
 src/libxrpl/ledger/OpenView.cpp               |   6 +-
 src/libxrpl/ledger/PaymentSandbox.cpp         |   2 +-
 src/libxrpl/ledger/View.cpp                   |   6 +-
 src/libxrpl/ledger/helpers/AMMHelpers.cpp     |  12 +-
 .../ledger/helpers/AccountRootHelpers.cpp     |  18 +-
 .../ledger/helpers/CredentialHelpers.cpp      |   4 +-
 src/libxrpl/ledger/helpers/LendingHelpers.cpp | 106 +--
 src/libxrpl/ledger/helpers/MPTokenHelpers.cpp |  10 +-
 src/libxrpl/ledger/helpers/NFTokenHelpers.cpp |  28 +-
 .../ledger/helpers/RippleStateHelpers.cpp     |   6 +-
 src/libxrpl/ledger/helpers/TokenHelpers.cpp   |  32 +-
 src/libxrpl/net/HTTPClient.cpp                |  14 +-
 src/libxrpl/nodestore/BatchWriter.cpp         |   6 +-
 src/libxrpl/nodestore/Database.cpp            |   6 +-
 src/libxrpl/nodestore/ManagerImp.cpp          |   6 +-
 .../nodestore/backend/MemoryFactory.cpp       |   4 +-
 src/libxrpl/nodestore/backend/NuDBFactory.cpp |   8 +-
 src/libxrpl/nodestore/backend/NullFactory.cpp |   2 +-
 .../nodestore/backend/RocksDBFactory.cpp      |   2 +-
 src/libxrpl/protocol/AMMCore.cpp              |  19 +-
 src/libxrpl/protocol/AccountID.cpp            |  12 +-
 src/libxrpl/protocol/BuildInfo.cpp            |  21 +-
 src/libxrpl/protocol/ErrorCodes.cpp           |  10 +-
 src/libxrpl/protocol/Feature.cpp              |   6 +-
 src/libxrpl/protocol/IOUAmount.cpp            |  74 +--
 src/libxrpl/protocol/Indexes.cpp              |  24 +-
 src/libxrpl/protocol/InnerObjectFormats.cpp   |   4 +-
 src/libxrpl/protocol/LedgerFormats.cpp        |   8 +-
 src/libxrpl/protocol/Permissions.cpp          |   4 +-
 src/libxrpl/protocol/Protocol.cpp             |   4 +-
 src/libxrpl/protocol/PublicKey.cpp            |  16 +-
 src/libxrpl/protocol/Quality.cpp              |  10 +-
 src/libxrpl/protocol/QualityFunction.cpp      |   4 +-
 src/libxrpl/protocol/Rate2.cpp                |  14 +-
 src/libxrpl/protocol/SField.cpp               |  16 +-
 src/libxrpl/protocol/STAccount.cpp            |  10 +-
 src/libxrpl/protocol/STAmount.cpp             | 155 +++--
 src/libxrpl/protocol/STBase.cpp               |   2 +-
 src/libxrpl/protocol/STInteger.cpp            |   2 +-
 src/libxrpl/protocol/STLedgerEntry.cpp        |   5 +-
 src/libxrpl/protocol/STNumber.cpp             |   8 +-
 src/libxrpl/protocol/STObject.cpp             |  24 +-
 src/libxrpl/protocol/STParsedJSON.cpp         |  40 +-
 src/libxrpl/protocol/STTakesAsset.cpp         |   2 +-
 src/libxrpl/protocol/STTx.cpp                 |  22 +-
 src/libxrpl/protocol/STValidation.cpp         |   8 +-
 src/libxrpl/protocol/STVar.cpp                |  12 +-
 src/libxrpl/protocol/STXChainBridge.cpp       |   4 +-
 src/libxrpl/protocol/TER.cpp                  |  10 +-
 src/libxrpl/protocol/TxFormats.cpp            |   8 +-
 src/libxrpl/protocol/UintTypes.cpp            |  40 +-
 src/libxrpl/protocol/XChainAttestations.cpp   |   8 +-
 src/libxrpl/protocol/tokens.cpp               |  32 +-
 src/libxrpl/resource/Fees.cpp                 |  30 +-
 src/libxrpl/server/LoadFeeTrack.cpp           |   8 +-
 src/libxrpl/server/Manifest.cpp               |  14 +-
 src/libxrpl/server/Vacuum.cpp                 |   6 +-
 src/libxrpl/server/Wallet.cpp                 |   4 +-
 src/libxrpl/shamap/SHAMap.cpp                 |  32 +-
 src/libxrpl/shamap/SHAMapInnerNode.cpp        |  36 +-
 src/libxrpl/shamap/SHAMapLeafNode.cpp         |   4 +-
 src/libxrpl/shamap/SHAMapNodeID.cpp           |  24 +-
 src/libxrpl/shamap/SHAMapSync.cpp             |   4 +-
 src/libxrpl/shamap/SHAMapTreeNode.cpp         |  42 +-
 src/libxrpl/tx/SignerEntries.cpp              |   2 +-
 src/libxrpl/tx/Transactor.cpp                 |  38 +-
 src/libxrpl/tx/apply.cpp                      |  36 +-
 src/libxrpl/tx/applySteps.cpp                 |  18 +-
 src/libxrpl/tx/invariants/AMMInvariant.cpp    |  10 +-
 src/libxrpl/tx/invariants/InvariantCheck.cpp  |  92 ++-
 src/libxrpl/tx/invariants/LoanInvariant.cpp   |  12 +-
 src/libxrpl/tx/invariants/MPTInvariant.cpp    |  21 +-
 src/libxrpl/tx/invariants/NFTInvariant.cpp    |  26 +-
 .../PermissionedDomainInvariant.cpp           |   2 +-
 src/libxrpl/tx/invariants/VaultInvariant.cpp  |  52 +-
 src/libxrpl/tx/paths/AMMLiquidity.cpp         |  20 +-
 src/libxrpl/tx/paths/BookStep.cpp             |  50 +-
 src/libxrpl/tx/paths/DirectStep.cpp           |  16 +-
 src/libxrpl/tx/paths/MPTEndpointStep.cpp      |  24 +-
 src/libxrpl/tx/paths/OfferStream.cpp          |  10 +-
 src/libxrpl/tx/paths/PaySteps.cpp             |   4 +-
 src/libxrpl/tx/paths/RippleCalc.cpp           |   4 +-
 src/libxrpl/tx/paths/XRPEndpointStep.cpp      |   8 +-
 .../tx/transactors/account/AccountDelete.cpp  |  10 +-
 .../tx/transactors/account/AccountSet.cpp     |   6 +-
 .../tx/transactors/account/SignerListSet.cpp  |  16 +-
 .../tx/transactors/bridge/XChainBridge.cpp    |   8 +-
 .../tx/transactors/check/CheckCash.cpp        |   8 +-
 .../credentials/CredentialAccept.cpp          |   2 +-
 .../credentials/CredentialCreate.cpp          |   4 +-
 .../credentials/CredentialDelete.cpp          |   2 +-
 .../tx/transactors/delegate/DelegateSet.cpp   |   2 +-
 src/libxrpl/tx/transactors/dex/AMMBid.cpp     |  18 +-
 .../tx/transactors/dex/AMMClawback.cpp        |   8 +-
 src/libxrpl/tx/transactors/dex/AMMCreate.cpp  |   8 +-
 src/libxrpl/tx/transactors/dex/AMMDelete.cpp  |   2 +-
 src/libxrpl/tx/transactors/dex/AMMDeposit.cpp |  50 +-
 src/libxrpl/tx/transactors/dex/AMMVote.cpp    |  17 +-
 .../tx/transactors/dex/AMMWithdraw.cpp        |  42 +-
 .../tx/transactors/dex/OfferCreate.cpp        |  42 +-
 src/libxrpl/tx/transactors/did/DIDSet.cpp     |   5 +-
 .../tx/transactors/escrow/EscrowCancel.cpp    |   2 +-
 .../tx/transactors/escrow/EscrowCreate.cpp    |  18 +-
 .../tx/transactors/escrow/EscrowFinish.cpp    |  20 +-
 .../lending/LoanBrokerCoverClawback.cpp       |  10 +-
 .../lending/LoanBrokerCoverDeposit.cpp        |   4 +-
 .../lending/LoanBrokerCoverWithdraw.cpp       |   6 +-
 .../transactors/lending/LoanBrokerDelete.cpp  |   8 +-
 .../tx/transactors/lending/LoanBrokerSet.cpp  |  18 +-
 .../tx/transactors/lending/LoanDelete.cpp     |   6 +-
 .../tx/transactors/lending/LoanManage.cpp     |   2 +-
 .../tx/transactors/lending/LoanPay.cpp        |  42 +-
 .../tx/transactors/lending/LoanSet.cpp        |  46 +-
 .../tx/transactors/nft/NFTokenAcceptOffer.cpp |  16 +-
 .../tx/transactors/nft/NFTokenBurn.cpp        |   8 +-
 .../tx/transactors/nft/NFTokenCancelOffer.cpp |   2 +-
 .../tx/transactors/nft/NFTokenMint.cpp        |   4 +-
 .../tx/transactors/nft/NFTokenModify.cpp      |   4 +-
 .../tx/transactors/oracle/OracleSet.cpp       |  21 +-
 .../tx/transactors/payment/DepositPreauth.cpp |   2 +-
 .../tx/transactors/payment/Payment.cpp        |  20 +-
 .../payment_channel/PaymentChannelClaim.cpp   |   6 +-
 .../payment_channel/PaymentChannelCreate.cpp  |   2 +-
 .../payment_channel/PaymentChannelFund.cpp    |   2 +-
 .../PermissionedDomainDelete.cpp              |   2 +-
 .../PermissionedDomainSet.cpp                 |   4 +-
 src/libxrpl/tx/transactors/system/Batch.cpp   |  28 +-
 src/libxrpl/tx/transactors/system/Change.cpp  |   6 +-
 .../tx/transactors/system/TicketCreate.cpp    |   6 +-
 src/libxrpl/tx/transactors/token/Clawback.cpp |  12 +-
 .../token/MPTokenIssuanceCreate.cpp           |   8 +-
 .../transactors/token/MPTokenIssuanceSet.cpp  |  23 +-
 src/libxrpl/tx/transactors/token/TrustSet.cpp |  12 +-
 .../tx/transactors/vault/VaultClawback.cpp    |  16 +-
 .../tx/transactors/vault/VaultCreate.cpp      |  18 +-
 .../tx/transactors/vault/VaultDelete.cpp      |   2 +-
 .../tx/transactors/vault/VaultDeposit.cpp     |   8 +-
 src/libxrpl/tx/transactors/vault/VaultSet.cpp |  10 +-
 .../tx/transactors/vault/VaultWithdraw.cpp    |  10 +-
 src/test/app/AMMClawbackMPT_test.cpp          |  64 +-
 src/test/app/AMMExtendedMPT_test.cpp          | 228 ++++---
 src/test/app/AMMExtended_test.cpp             |  18 +-
 src/test/app/AMMMPT_test.cpp                  | 215 ++++---
 src/test/app/AMM_test.cpp                     |  33 +-
 src/test/app/AccountDelete_test.cpp           |  32 +-
 src/test/app/AccountSet_test.cpp              |   2 +-
 src/test/app/AmendmentTable_test.cpp          |   6 +-
 src/test/app/Batch_test.cpp                   |  52 +-
 src/test/app/CheckMPT_test.cpp                |  10 +-
 src/test/app/Credentials_test.cpp             |  12 +-
 src/test/app/CrossingLimitsMPT_test.cpp       |  10 +-
 src/test/app/CrossingLimits_test.cpp          |   2 +-
 src/test/app/Delegate_test.cpp                |   8 +-
 src/test/app/DepositAuth_test.cpp             |   2 +-
 src/test/app/EscrowToken_test.cpp             | 606 +++++++++---------
 src/test/app/Escrow_test.cpp                  | 466 +++++++-------
 src/test/app/FeeVote_test.cpp                 |  24 +-
 src/test/app/FlowMPT_test.cpp                 |  10 +-
 src/test/app/GRPCServerTLS_test.cpp           |  64 +-
 src/test/app/Invariants_test.cpp              | 132 ++--
 src/test/app/LedgerHistory_test.cpp           |   2 +-
 src/test/app/LedgerReplay_test.cpp            |  19 +-
 src/test/app/LoadFeeTrack_test.cpp            |  12 +-
 src/test/app/LoanBroker_test.cpp              | 294 +++++----
 src/test/app/Loan_test.cpp                    | 601 +++++++++--------
 src/test/app/MPToken_test.cpp                 | 108 ++--
 src/test/app/Manifest_test.cpp                |  18 +-
 src/test/app/MultiSign_test.cpp               |  18 +-
 src/test/app/NFTokenAuth_test.cpp             |   6 +-
 src/test/app/NFTokenBurn_test.cpp             |  22 +-
 src/test/app/NFTokenDir_test.cpp              |  48 +-
 src/test/app/NFToken_test.cpp                 |  55 +-
 src/test/app/OfferMPT_test.cpp                |  38 +-
 src/test/app/Offer_test.cpp                   |  68 +-
 src/test/app/Oracle_test.cpp                  |   8 +-
 src/test/app/PathMPT_test.cpp                 |  12 +-
 src/test/app/Path_test.cpp                    |  20 +-
 src/test/app/PayChan_test.cpp                 |   6 +-
 src/test/app/PayStrandMPT_test.cpp            |   4 +-
 src/test/app/PayStrand_test.cpp               |  12 +-
 src/test/app/PermissionedDEX_test.cpp         |   2 +-
 src/test/app/PermissionedDomains_test.cpp     |  22 +-
 src/test/app/RCLValidations_test.cpp          |   4 +-
 src/test/app/ReducedOffer_test.cpp            |  12 +-
 src/test/app/Regression_test.cpp              |   8 +-
 src/test/app/SHAMapStore_test.cpp             |  56 +-
 src/test/app/SetRegularKey_test.cpp           |   4 +-
 src/test/app/TheoreticalQuality_test.cpp      |  36 +-
 src/test/app/Ticket_test.cpp                  |  12 +-
 src/test/app/Transaction_ordering_test.cpp    |  12 +-
 src/test/app/TxQ_test.cpp                     | 121 ++--
 src/test/app/ValidatorList_test.cpp           |  86 +--
 src/test/app/ValidatorSite_test.cpp           |  50 +-
 src/test/app/Vault_test.cpp                   | 197 +++---
 src/test/app/XChain_test.cpp                  | 412 ++++++------
 src/test/basics/FileUtilities_test.cpp        |   9 +-
 src/test/basics/IOUAmount_test.cpp            |  96 +--
 src/test/basics/IntrusiveShared_test.cpp      |  86 +--
 src/test/basics/Number_test.cpp               |  54 +-
 src/test/basics/Units_test.cpp                |  12 +-
 src/test/basics/XRPAmount_test.cpp            |  82 +--
 src/test/basics/base58_test.cpp               |  22 +-
 src/test/basics/base_uint_test.cpp            |  45 +-
 src/test/basics/hardened_hash_test.cpp        |  14 +-
 src/test/basics/join_test.cpp                 |   4 +-
 src/test/beast/IPEndpoint_test.cpp            |   6 +-
 .../beast/beast_CurrentThreadName_test.cpp    |   2 +-
 src/test/beast/beast_Zero_test.cpp            |  28 +-
 src/test/conditions/PreimageSha256_test.cpp   |   2 +-
 src/test/consensus/Consensus_test.cpp         |   2 +-
 src/test/consensus/LedgerTiming_test.cpp      |   2 +-
 src/test/consensus/NegativeUNL_test.cpp       |  74 +--
 src/test/consensus/Validations_test.cpp       |  10 +-
 src/test/core/ClosureCounter_test.cpp         |   2 +-
 src/test/core/Config_test.cpp                 |  37 +-
 src/test/csf/Peer.h                           |   7 +-
 src/test/csf/impl/ledgers.cpp                 |   4 +-
 src/test/csf/ledgers.h                        |   6 +-
 src/test/jtx/AMM.h                            |   2 +-
 src/test/jtx/Account.h                        |   2 +-
 src/test/jtx/Env.h                            |  10 +-
 src/test/jtx/Env_test.cpp                     |  46 +-
 src/test/jtx/Oracle.h                         |   9 +-
 src/test/jtx/PathSet.h                        |   6 +-
 src/test/jtx/TestHelpers.h                    |  56 +-
 src/test/jtx/TrustedPublisherServer.h         |  26 +-
 src/test/jtx/amount.h                         |  13 +-
 src/test/jtx/directory.h                      |   2 +-
 src/test/jtx/escrow.h                         |  26 +-
 src/test/jtx/impl/AMM.cpp                     |   2 +-
 src/test/jtx/impl/Account.cpp                 |   2 +-
 src/test/jtx/impl/Env.cpp                     |  30 +-
 src/test/jtx/impl/Oracle.cpp                  |  10 +-
 src/test/jtx/impl/TestHelpers.cpp             |  12 +-
 src/test/jtx/impl/amount.cpp                  |   6 +-
 src/test/jtx/impl/balance.cpp                 |  10 +-
 src/test/jtx/impl/envconfig.cpp               |   4 +-
 src/test/jtx/impl/xchain_bridge.cpp           |  33 +-
 src/test/jtx/mpt.h                            |   6 +-
 src/test/jtx/multisign.h                      |   6 +-
 src/test/jtx/sig.h                            |   4 +-
 src/test/jtx/tags.h                           |   8 +-
 src/test/jtx/xchain_bridge.h                  |  12 +-
 src/test/ledger/Directory_test.cpp            |  56 +-
 src/test/ledger/PaymentSandbox_test.cpp       |   8 +-
 src/test/ledger/SkipList_test.cpp             |   2 +-
 src/test/ledger/View_test.cpp                 |  10 +-
 src/test/nodestore/Basics_test.cpp            |   8 +-
 src/test/nodestore/Database_test.cpp          |   6 +-
 src/test/nodestore/TestBase.h                 |   8 +-
 src/test/nodestore/Timing_test.cpp            |  14 +-
 src/test/nodestore/import_test.cpp            |   4 +-
 src/test/nodestore/varint_test.cpp            |   2 +-
 src/test/overlay/TMGetObjectByHash_test.cpp   |   2 +-
 src/test/overlay/compression_test.cpp         |  12 +-
 src/test/overlay/reduce_relay_test.cpp        |  83 ++-
 src/test/peerfinder/Livecache_test.cpp        |  12 +-
 src/test/protocol/ApiVersion_test.cpp         |  25 +-
 src/test/protocol/Hooks_test.cpp              |   6 +-
 src/test/protocol/InnerObjectFormats_test.cpp |   4 +-
 src/test/protocol/MultiApiJson_test.cpp       | 129 ++--
 src/test/protocol/PublicKey_test.cpp          |   6 +-
 src/test/protocol/Quality_test.cpp            |   2 +-
 src/test/protocol/STAmount_test.cpp           |  56 +-
 src/test/protocol/STNumber_test.cpp           |  26 +-
 src/test/protocol/STObject_test.cpp           |  32 +-
 src/test/protocol/STTx_test.cpp               |  18 +-
 src/test/protocol/STValidation_test.cpp       |  34 +-
 src/test/protocol/SecretKey_test.cpp          |   8 +-
 src/test/protocol/SeqProxy_test.cpp           | 266 ++++----
 src/test/protocol/TER_test.cpp                |  12 +-
 src/test/resource/Logic_test.cpp              |   4 +-
 src/test/rpc/AccountInfo_test.cpp             |  28 +-
 src/test/rpc/AccountLines_test.cpp            |  16 +-
 src/test/rpc/AccountObjects_test.cpp          |  14 +-
 src/test/rpc/AccountTx_test.cpp               |  26 +-
 src/test/rpc/Book_test.cpp                    |  10 +-
 src/test/rpc/DeliveredAmount_test.cpp         |   2 +-
 src/test/rpc/DepositAuthorized_test.cpp       |   8 +-
 src/test/rpc/Feature_test.cpp                 |  48 +-
 src/test/rpc/GatewayBalances_test.cpp         |   4 +-
 src/test/rpc/GetAggregatePrice_test.cpp       |  23 +-
 src/test/rpc/JSONRPC_test.cpp                 |  14 +-
 src/test/rpc/KeyGeneration_test.cpp           |  22 +-
 src/test/rpc/LedgerEntry_test.cpp             |  96 ++-
 src/test/rpc/LedgerRequest_test.cpp           |  48 +-
 src/test/rpc/NoRippleCheck_test.cpp           |  14 +-
 src/test/rpc/RPCCall_test.cpp                 |  18 +-
 src/test/rpc/ServerInfo_test.cpp              |   9 +-
 src/test/rpc/Simulate_test.cpp                |  34 +-
 src/test/rpc/Subscribe_test.cpp               |   8 +-
 src/test/rpc/Version_test.cpp                 |  58 +-
 src/test/shamap/FetchPack_test.cpp            |   4 +-
 src/test/shamap/SHAMap_test.cpp               |  26 +-
 src/test/unit_test/FileDirGuard.h             |   4 +-
 src/test/unit_test/SuiteJournal.h             |   4 +-
 src/test/unit_test/multi_runner.cpp           |  30 +-
 src/test/unit_test/multi_runner.h             |   8 +-
 src/test/unit_test/utils.h                    |   4 +-
 src/tests/libxrpl/basics/Slice.cpp            |  34 +-
 src/tests/libxrpl/helpers/TestSink.cpp        |   4 +-
 src/tests/libxrpl/helpers/TxTest.cpp          |  10 +-
 src/tests/libxrpl/helpers/TxTest.h            |   6 +-
 src/tests/libxrpl/json/Value.cpp              |  64 +-
 .../libxrpl/protocol_autogen/TestHelpers.h    |   2 +-
 src/tests/libxrpl/tx/AccountSet.cpp           |  10 +-
 src/xrpld/app/consensus/RCLConsensus.cpp      |  16 +-
 src/xrpld/app/consensus/RCLConsensus.h        |   2 +-
 src/xrpld/app/ledger/LedgerReplayer.h         |  24 +-
 src/xrpld/app/ledger/LocalTxs.h               |   2 +-
 src/xrpld/app/ledger/detail/BuildLedger.cpp   |   4 +-
 src/xrpld/app/ledger/detail/InboundLedger.cpp |  52 +-
 .../app/ledger/detail/InboundLedgers.cpp      |   6 +-
 .../app/ledger/detail/InboundTransactions.cpp |  18 +-
 src/xrpld/app/ledger/detail/LedgerCleaner.cpp |   2 +-
 .../app/ledger/detail/LedgerDeltaAcquire.cpp  |  10 +-
 src/xrpld/app/ledger/detail/LedgerMaster.cpp  |  42 +-
 .../app/ledger/detail/LedgerPersistence.cpp   |   2 +-
 .../app/ledger/detail/LedgerReplayTask.cpp    |   8 +-
 .../app/ledger/detail/LedgerReplayer.cpp      |   4 +-
 src/xrpld/app/ledger/detail/LedgerToJson.cpp  |   2 +-
 src/xrpld/app/ledger/detail/LocalTxs.cpp      |   4 +-
 src/xrpld/app/ledger/detail/OpenLedger.cpp    |   2 +-
 .../app/ledger/detail/SkipListAcquire.cpp     |  10 +-
 .../app/ledger/detail/TransactionAcquire.cpp  |  14 +-
 .../app/ledger/detail/TransactionMaster.cpp   |   2 +-
 src/xrpld/app/main/Application.cpp            |  19 +-
 src/xrpld/app/main/GRPCServer.cpp             |  10 +-
 src/xrpld/app/main/GRPCServer.h               |   2 +-
 src/xrpld/app/main/LoadManager.cpp            |  14 +-
 src/xrpld/app/main/Tuning.h                   |   6 +-
 src/xrpld/app/misc/FeeVoteImpl.cpp            |   2 +-
 src/xrpld/app/misc/NegativeUNLVote.cpp        |  33 +-
 src/xrpld/app/misc/NegativeUNLVote.h          |  10 +-
 src/xrpld/app/misc/NetworkOPs.cpp             |  94 +--
 src/xrpld/app/misc/SHAMapStoreImp.cpp         |   8 +-
 src/xrpld/app/misc/SHAMapStoreImp.h           |   6 +-
 src/xrpld/app/misc/TxQ.h                      |  14 +-
 src/xrpld/app/misc/ValidatorList.h            |   8 +-
 src/xrpld/app/misc/detail/AmendmentTable.cpp  |  12 +-
 src/xrpld/app/misc/detail/TxQ.cpp             |  42 +-
 src/xrpld/app/misc/detail/ValidatorList.cpp   |  18 +-
 src/xrpld/app/misc/detail/ValidatorSite.cpp   |  12 +-
 src/xrpld/app/rdb/backend/detail/Node.cpp     |  51 +-
 src/xrpld/app/rdb/backend/detail/Node.h       |   2 +-
 .../app/rdb/backend/detail/SQLiteDatabase.cpp |  22 +-
 src/xrpld/consensus/Consensus.h               |  16 +-
 src/xrpld/consensus/ConsensusProposal.h       |  16 +-
 src/xrpld/consensus/Validations.h             |   6 +-
 src/xrpld/core/Config.h                       |  18 +-
 src/xrpld/core/TimeKeeper.h                   |   2 +-
 src/xrpld/core/detail/Config.cpp              |  47 +-
 src/xrpld/overlay/Compression.h               |   4 +-
 src/xrpld/overlay/Message.h                   |   2 +-
 src/xrpld/overlay/ReduceRelayCommon.h         |  24 +-
 src/xrpld/overlay/Slot.h                      |  44 +-
 src/xrpld/overlay/Squelch.h                   |   2 +-
 src/xrpld/overlay/detail/ConnectAttempt.cpp   |  12 +-
 src/xrpld/overlay/detail/ConnectAttempt.h     |  12 +-
 src/xrpld/overlay/detail/Handshake.cpp        |  30 +-
 src/xrpld/overlay/detail/Handshake.h          |  12 +-
 src/xrpld/overlay/detail/Message.cpp          |  18 +-
 src/xrpld/overlay/detail/OverlayImpl.cpp      |  34 +-
 src/xrpld/overlay/detail/PeerImp.cpp          | 227 ++++---
 src/xrpld/overlay/detail/PeerImp.h            |  12 +-
 src/xrpld/overlay/detail/PeerSet.cpp          |   4 +-
 src/xrpld/overlay/detail/ProtocolMessage.h    |   8 +-
 src/xrpld/overlay/detail/ProtocolVersion.cpp  |  16 +-
 src/xrpld/overlay/detail/TrafficCount.cpp     |   4 +-
 src/xrpld/overlay/detail/TrafficCount.h       |   4 +-
 src/xrpld/overlay/detail/Tuning.h             |  22 +-
 src/xrpld/peerfinder/PeerfinderManager.h      |   2 +-
 src/xrpld/peerfinder/detail/Bootcache.cpp     |  12 +-
 src/xrpld/peerfinder/detail/Bootcache.h       |   2 +-
 src/xrpld/peerfinder/detail/Counts.h          |   4 +-
 src/xrpld/peerfinder/detail/Endpoint.cpp      |   2 +-
 src/xrpld/peerfinder/detail/Fixed.h           |   4 +-
 src/xrpld/peerfinder/detail/Handouts.h        |  12 +-
 src/xrpld/peerfinder/detail/Livecache.h       |  14 +-
 src/xrpld/peerfinder/detail/Logic.h           |  14 +-
 .../peerfinder/detail/PeerfinderConfig.cpp    |   9 +-
 src/xrpld/peerfinder/detail/SlotImp.cpp       |   6 +-
 src/xrpld/peerfinder/detail/SlotImp.h         |   4 +-
 src/xrpld/peerfinder/detail/StoreSqdb.h       |   4 +-
 src/xrpld/peerfinder/detail/Tuning.h          |  36 +-
 src/xrpld/rpc/BookChanges.h                   |   6 +-
 src/xrpld/rpc/CTID.h                          |  18 +-
 src/xrpld/rpc/detail/AccountAssets.cpp        |   2 +-
 src/xrpld/rpc/detail/Handler.cpp              |  16 +-
 src/xrpld/rpc/detail/Handler.h                |   6 +-
 src/xrpld/rpc/detail/LegacyPathFind.cpp       |   4 +-
 src/xrpld/rpc/detail/PathRequest.cpp          |  14 +-
 src/xrpld/rpc/detail/PathRequest.h            |   2 +-
 src/xrpld/rpc/detail/Pathfinder.cpp           |  54 +-
 src/xrpld/rpc/detail/Pathfinder.h             |  10 +-
 src/xrpld/rpc/detail/PathfinderUtils.h        |   6 +-
 src/xrpld/rpc/detail/RPCCall.cpp              |  20 +-
 src/xrpld/rpc/detail/RPCHandler.cpp           |  10 +-
 src/xrpld/rpc/detail/RPCHelpers.cpp           |  14 +-
 src/xrpld/rpc/detail/RPCHelpers.h             |   2 +-
 src/xrpld/rpc/detail/RPCLedgerHelpers.cpp     |  10 +-
 src/xrpld/rpc/detail/Role.cpp                 |   8 +-
 src/xrpld/rpc/detail/ServerHandler.cpp        |  69 +-
 src/xrpld/rpc/detail/TransactionSign.cpp      |   8 +-
 src/xrpld/rpc/detail/TransactionSign.h        |   4 +-
 src/xrpld/rpc/detail/Tuning.h                 |  45 +-
 src/xrpld/rpc/handlers/VaultInfo.cpp          |   8 +-
 .../rpc/handlers/account/AccountChannels.cpp  |   6 +-
 .../rpc/handlers/account/AccountInfo.cpp      |  24 +-
 .../rpc/handlers/account/AccountLines.cpp     |   6 +-
 .../rpc/handlers/account/AccountNFTs.cpp      |   8 +-
 .../rpc/handlers/account/AccountObjects.cpp   |  14 +-
 .../rpc/handlers/account/AccountOffers.cpp    |   6 +-
 src/xrpld/rpc/handlers/account/AccountTx.cpp  |   4 +-
 .../rpc/handlers/account/GatewayBalances.cpp  |  11 +-
 .../rpc/handlers/account/NoRippleCheck.cpp    |   2 +-
 .../rpc/handlers/admin/data/LedgerRequest.cpp |   2 +-
 src/xrpld/rpc/handlers/admin/peer/Connect.cpp |   2 +-
 src/xrpld/rpc/handlers/admin/signing/Sign.cpp |   2 +-
 .../rpc/handlers/admin/signing/SignFor.cpp    |   2 +-
 src/xrpld/rpc/handlers/ledger/Ledger.cpp      |   3 +-
 src/xrpld/rpc/handlers/ledger/Ledger.h        |   4 +-
 src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp |  15 +-
 src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp  |  10 +-
 .../rpc/handlers/orderbook/BookOffers.cpp     |   6 +-
 .../handlers/orderbook/DepositAuthorized.cpp  |   2 +-
 .../handlers/orderbook/GetAggregatePrice.cpp  |  14 +-
 .../rpc/handlers/orderbook/NFTOffersHelpers.h |   4 +-
 src/xrpld/rpc/handlers/orderbook/PathFind.cpp |   2 +-
 .../rpc/handlers/orderbook/RipplePathFind.cpp |   4 +-
 .../server_info/ServerDefinitions.cpp         |  14 +-
 src/xrpld/rpc/handlers/server_info/Version.h  |   4 +-
 .../rpc/handlers/subscribe/Subscribe.cpp      |   6 +-
 .../rpc/handlers/transaction/Simulate.cpp     |   4 +-
 src/xrpld/rpc/handlers/transaction/Submit.cpp |   2 +-
 .../transaction/SubmitMultiSigned.cpp         |   2 +-
 src/xrpld/rpc/handlers/transaction/Tx.cpp     |  10 +-
 .../rpc/handlers/transaction/TxHistory.cpp    |   2 +-
 src/xrpld/shamap/NodeFamily.cpp               |   4 +-
 648 files changed, 6582 insertions(+), 6686 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 15d354a8c3..a444957a0e 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -171,7 +171,7 @@ CheckOptions:
   readability-identifier-naming.EnumCase: CamelCase
   readability-identifier-naming.EnumConstantCase: CamelCase
   readability-identifier-naming.ScopedEnumConstantCase: CamelCase
-  readability-identifier-naming.GlobalConstantCase: UPPER_CASE
+  readability-identifier-naming.GlobalConstantCase: CamelCase
   readability-identifier-naming.GlobalConstantPrefix: "k"
   readability-identifier-naming.GlobalVariableCase: CamelCase
   readability-identifier-naming.GlobalVariablePrefix: "g"
@@ -179,14 +179,12 @@ CheckOptions:
   readability-identifier-naming.ConstexprMethodCase: camelBack
   readability-identifier-naming.ClassMethodCase: camelBack
   readability-identifier-naming.ClassMemberCase: camelBack
-  readability-identifier-naming.ClassConstantCase: UPPER_CASE
+  readability-identifier-naming.ClassConstantCase: CamelCase
   readability-identifier-naming.ClassConstantPrefix: "k"
-  readability-identifier-naming.StaticConstantCase: UPPER_CASE
+  readability-identifier-naming.StaticConstantCase: CamelCase
   readability-identifier-naming.StaticConstantPrefix: "k"
-  readability-identifier-naming.StaticVariableCase: UPPER_CASE
-  readability-identifier-naming.StaticVariablePrefix: "k"
-  readability-identifier-naming.ConstexprVariableCase: UPPER_CASE
-  readability-identifier-naming.ConstexprVariablePrefix: "k"
+  readability-identifier-naming.StaticVariableCase: camelBack
+  readability-identifier-naming.ConstexprVariableCase: camelBack
   readability-identifier-naming.LocalConstantCase: camelBack
   readability-identifier-naming.LocalVariableCase: camelBack
   readability-identifier-naming.TemplateParameterCase: CamelCase
diff --git a/.github/scripts/rename/config.sh b/.github/scripts/rename/config.sh
index a27d0823a9..81edcc73d6 100755
--- a/.github/scripts/rename/config.sh
+++ b/.github/scripts/rename/config.sh
@@ -62,7 +62,7 @@ ${SED_COMMAND} -i 's@ripple/@xrpld/@g' src/test/core/Config_test.cpp
 ${SED_COMMAND} -i 's/Rippled/File/g' src/test/core/Config_test.cpp
 
 # Restore the old config file name in the code that maintains support for now.
-${SED_COMMAND} -i 's/kCONFIG_LEGACY_NAME = "xrpld.cfg"/kCONFIG_LEGACY_NAME = "rippled.cfg"/g' src/xrpld/core/detail/Config.cpp
+${SED_COMMAND} -i 's/kConfigLegacyName = "xrpld.cfg"/kConfigLegacyName = "rippled.cfg"/g' src/xrpld/core/detail/Config.cpp
 
 # Restore an URL.
 ${SED_COMMAND} -i 's/connect-your-xrpld-to-the-xrp-test-net.html/connect-your-rippled-to-the-xrp-test-net.html/g' cfg/xrpld-example.cfg
diff --git a/.github/scripts/rename/docs.sh b/.github/scripts/rename/docs.sh
index 23ff76bc05..8b7a362405 100755
--- a/.github/scripts/rename/docs.sh
+++ b/.github/scripts/rename/docs.sh
@@ -90,7 +90,7 @@ ${SED_COMMAND} -i 's/www.ripple.com/www.xrpl.org/g' src/test/protocol/Seed_test.
 # Restore specific changes.
 ${SED_COMMAND} -i 's@b5efcc/src/xrpld@b5efcc/src/ripple@' include/xrpl/protocol/README.md
 ${SED_COMMAND} -i 's/dbPrefix_ = "xrpldb"/dbPrefix_ = "rippledb"/' src/xrpld/app/misc/SHAMapStoreImp.h # cspell: disable-line
-${SED_COMMAND} -i 's/kCONFIG_LEGACY_NAME = "xrpld.cfg"/kCONFIG_LEGACY_NAME = "rippled.cfg"/' src/xrpld/core/detail/Config.cpp
+${SED_COMMAND} -i 's/kConfigLegacyName = "xrpld.cfg"/kConfigLegacyName = "rippled.cfg"/' src/xrpld/core/detail/Config.cpp
 
 popd
 echo "Renaming complete."
diff --git a/include/xrpl/basics/IntrusivePointer.h b/include/xrpl/basics/IntrusivePointer.h
index 06ee3e5bb4..d66c340d3f 100644
--- a/include/xrpl/basics/IntrusivePointer.h
+++ b/include/xrpl/basics/IntrusivePointer.h
@@ -406,8 +406,8 @@ private:
     // pointer. The low bit must be masked to zero when converting back to a
     // pointer. If the low bit is '1', this is a weak pointer.
     std::uintptr_t tp_{0};
-    static constexpr std::uintptr_t kTAG_MASK = 1;
-    static constexpr std::uintptr_t kPTR_MASK = ~kTAG_MASK;
+    static constexpr std::uintptr_t kTagMask = 1;
+    static constexpr std::uintptr_t kPtrMask = ~kTagMask;
 
 private:
     /** Return the raw pointer held by this object.
diff --git a/include/xrpl/basics/IntrusivePointer.ipp b/include/xrpl/basics/IntrusivePointer.ipp
index f229df8b27..8344a3e613 100644
--- a/include/xrpl/basics/IntrusivePointer.ipp
+++ b/include/xrpl/basics/IntrusivePointer.ipp
@@ -567,14 +567,14 @@ template <class T>
 bool
 SharedWeakUnion<T>::isStrong() const
 {
-    return (tp_ & kTAG_MASK) == 0u;
+    return (tp_ & kTagMask) == 0u;
 }
 
 template <class T>
 bool
 SharedWeakUnion<T>::isWeak() const
 {
-    return (tp_ & kTAG_MASK) != 0u;
+    return (tp_ & kTagMask) != 0u;
 }
 
 template <class T>
@@ -641,7 +641,7 @@ template <class T>
 T*
 SharedWeakUnion<T>::unsafeGetRawPtr() const
 {
-    return reinterpret_cast<T*>(tp_ & kPTR_MASK);
+    return reinterpret_cast<T*>(tp_ & kPtrMask);
 }
 
 template <class T>
@@ -650,7 +650,7 @@ SharedWeakUnion<T>::unsafeSetRawPtr(T* p, RefStrength rs)
 {
     tp_ = reinterpret_cast<std::uintptr_t>(p);
     if (tp_ && rs == RefStrength::Weak)
-        tp_ |= kTAG_MASK;
+        tp_ |= kTagMask;
 }
 
 template <class T>
diff --git a/include/xrpl/basics/IntrusiveRefCounts.h b/include/xrpl/basics/IntrusiveRefCounts.h
index f0689197d7..0b00f1d5b1 100644
--- a/include/xrpl/basics/IntrusiveRefCounts.h
+++ b/include/xrpl/basics/IntrusiveRefCounts.h
@@ -98,11 +98,11 @@ private:
     // enough for strong pointers and 14 bit counts are enough for weak
     // pointers. Use type aliases to make it easy to switch types.
     using CountType = std::uint16_t;
-    static constexpr size_t kSTRONG_COUNT_NUM_BITS = sizeof(CountType) * 8;
-    static constexpr size_t kWEAK_COUNT_NUM_BITS = kSTRONG_COUNT_NUM_BITS - 2;
+    static constexpr size_t kStrongCountNumBits = sizeof(CountType) * 8;
+    static constexpr size_t kWeakCountNumBits = kStrongCountNumBits - 2;
     using FieldType = std::uint32_t;
-    static constexpr size_t kFIELD_TYPE_BITS = sizeof(FieldType) * 8;
-    static constexpr FieldType kONE = 1;
+    static constexpr size_t kFieldTypeBits = sizeof(FieldType) * 8;
+    static constexpr FieldType kOne = 1;
 
     /** `refCounts` consists of four fields that are treated atomically:
 
@@ -137,21 +137,21 @@ private:
 
          */
 
-    mutable std::atomic<FieldType> refCounts_{kSTRONG_DELTA};
+    mutable std::atomic<FieldType> refCounts_{kStrongDelta};
 
     /**  Amount to change the strong count when adding or releasing a reference
 
          Note: The strong count is stored in the low `StrongCountNumBits` bits
        of refCounts
       */
-    static constexpr FieldType kSTRONG_DELTA = 1;
+    static constexpr FieldType kStrongDelta = 1;
 
     /**  Amount to change the weak count when adding or releasing a reference
 
          Note: The weak count is stored in the high `WeakCountNumBits` bits of
          refCounts
       */
-    static constexpr FieldType kWEAK_DELTA = (kONE << kSTRONG_COUNT_NUM_BITS);
+    static constexpr FieldType kWeakDelta = (kOne << kStrongCountNumBits);
 
     /**  Flag that is set when the partialDestroy function has started running
          (or is about to start running).
@@ -159,34 +159,33 @@ private:
          See description of the `refCounts` field for a fuller description of
          this field.
       */
-    static constexpr FieldType kPARTIAL_DESTROY_STARTED_MASK = (kONE << (kFIELD_TYPE_BITS - 1));
+    static constexpr FieldType kPartialDestroyStartedMask = (kOne << (kFieldTypeBits - 1));
 
     /**  Flag that is set when the partialDestroy function has finished running
 
          See description of the `refCounts` field for a fuller description of
          this field.
       */
-    static constexpr FieldType kPARTIAL_DESTROY_FINISHED_MASK = (kONE << (kFIELD_TYPE_BITS - 2));
+    static constexpr FieldType kPartialDestroyFinishedMask = (kOne << (kFieldTypeBits - 2));
 
     /** Mask that will zero out all the `count` bits and leave the tag bits
         unchanged.
       */
-    static constexpr FieldType kTAG_MASK =
-        kPARTIAL_DESTROY_STARTED_MASK | kPARTIAL_DESTROY_FINISHED_MASK;
+    static constexpr FieldType kTagMask = kPartialDestroyStartedMask | kPartialDestroyFinishedMask;
 
     /** Mask that will zero out the `tag` bits and leave the count bits
         unchanged.
       */
-    static constexpr FieldType kVALUE_MASK = ~kTAG_MASK;
+    static constexpr FieldType kValueMask = ~kTagMask;
 
     /** Mask that will zero out everything except the strong count.
      */
-    static constexpr FieldType kSTRONG_MASK = ((kONE << kSTRONG_COUNT_NUM_BITS) - 1) & kVALUE_MASK;
+    static constexpr FieldType kStrongMask = ((kOne << kStrongCountNumBits) - 1) & kValueMask;
 
     /** Mask that will zero out everything except the weak count.
      */
-    static constexpr FieldType kWEAK_MASK =
-        (((kONE << kWEAK_COUNT_NUM_BITS) - 1) << kSTRONG_COUNT_NUM_BITS) & kVALUE_MASK;
+    static constexpr FieldType kWeakMask =
+        (((kOne << kWeakCountNumBits) - 1) << kStrongCountNumBits) & kValueMask;
 
     /** Unpack the count and tag fields from the packed atomic integer form. */
     struct RefCountPair
@@ -211,29 +210,29 @@ private:
         [[nodiscard]] FieldType
         combinedValue() const noexcept;
 
-        static constexpr CountType kMAX_STRONG_VALUE =
-            static_cast<CountType>((kONE << kSTRONG_COUNT_NUM_BITS) - 1);
-        static constexpr CountType kMAX_WEAK_VALUE =
-            static_cast<CountType>((kONE << kWEAK_COUNT_NUM_BITS) - 1);
+        static constexpr CountType kMaxStrongValue =
+            static_cast<CountType>((kOne << kStrongCountNumBits) - 1);
+        static constexpr CountType kMaxWeakValue =
+            static_cast<CountType>((kOne << kWeakCountNumBits) - 1);
         /**  Put an extra margin to detect when running up against limits.
              This is only used in debug code, and is useful if we reduce the
              number of bits in the strong and weak counts (to 16 and 14 bits).
          */
-        static constexpr CountType kCHECK_STRONG_MAX_VALUE = kMAX_STRONG_VALUE - 32;
-        static constexpr CountType kCHECK_WEAK_MAX_VALUE = kMAX_WEAK_VALUE - 32;
+        static constexpr CountType kCheckStrongMaxValue = kMaxStrongValue - 32;
+        static constexpr CountType kCheckWeakMaxValue = kMaxWeakValue - 32;
     };
 };
 
 inline void
 IntrusiveRefCounts::addStrongRef() const noexcept
 {
-    refCounts_.fetch_add(kSTRONG_DELTA, std::memory_order_acq_rel);
+    refCounts_.fetch_add(kStrongDelta, std::memory_order_acq_rel);
 }
 
 inline void
 IntrusiveRefCounts::addWeakRef() const noexcept
 {
-    refCounts_.fetch_add(kWEAK_DELTA, std::memory_order_acq_rel);
+    refCounts_.fetch_add(kWeakDelta, std::memory_order_acq_rel);
 }
 
 inline ReleaseStrongRefAction
@@ -252,10 +251,10 @@ IntrusiveRefCounts::releaseStrongRef() const
     {
         RefCountPair const prevVal{prevIntVal};
         XRPL_ASSERT(
-            (prevVal.strong >= kSTRONG_DELTA),
+            (prevVal.strong >= kStrongDelta),
             "xrpl::IntrusiveRefCounts::releaseStrongRef : previous ref "
             "higher than new");
-        auto nextIntVal = prevIntVal - kSTRONG_DELTA;
+        auto nextIntVal = prevIntVal - kStrongDelta;
         ReleaseStrongRefAction action = NoOp;
         if (prevVal.strong == 1)
         {
@@ -265,7 +264,7 @@ IntrusiveRefCounts::releaseStrongRef() const
             }
             else
             {
-                nextIntVal |= kPARTIAL_DESTROY_STARTED_MASK;
+                nextIntVal |= kPartialDestroyStartedMask;
                 action = PartialDestroy;
             }
         }
@@ -276,7 +275,7 @@ IntrusiveRefCounts::releaseStrongRef() const
             // count to zero can start a partial destroy, and that can't happen
             // twice.
             XRPL_ASSERT(
-                (action == NoOp) || !(prevIntVal & kPARTIAL_DESTROY_STARTED_MASK),
+                (action == NoOp) || !(prevIntVal & kPartialDestroyStartedMask),
                 "xrpl::IntrusiveRefCounts::releaseStrongRef : not in partial "
                 "destroy");
             return action;
@@ -289,8 +288,8 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
 {
     using enum ReleaseStrongRefAction;
 
-    static_assert(kWEAK_DELTA > kSTRONG_DELTA);
-    auto constexpr kDELTA = kWEAK_DELTA - kSTRONG_DELTA;
+    static_assert(kWeakDelta > kStrongDelta);
+    static constexpr auto kDelta = kWeakDelta - kStrongDelta;
     auto prevIntVal = refCounts_.load(std::memory_order_acquire);
     // This loop will almost always run once. The loop is needed to atomically
     // change the counts and flags (the count could be atomically changed, but
@@ -312,7 +311,7 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
             "xrpl::IntrusiveRefCounts::addWeakReleaseStrongRef : not in "
             "partial destroy");
 
-        auto nextIntVal = prevIntVal + kDELTA;
+        auto nextIntVal = prevIntVal + kDelta;
         ReleaseStrongRefAction action = NoOp;
         if (prevVal.strong == 1)
         {
@@ -322,14 +321,14 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
             }
             else
             {
-                nextIntVal |= kPARTIAL_DESTROY_STARTED_MASK;
+                nextIntVal |= kPartialDestroyStartedMask;
                 action = PartialDestroy;
             }
         }
         if (refCounts_.compare_exchange_weak(prevIntVal, nextIntVal, std::memory_order_acq_rel))
         {
             XRPL_ASSERT(
-                (!(prevIntVal & kPARTIAL_DESTROY_STARTED_MASK)),
+                (!(prevIntVal & kPartialDestroyStartedMask)),
                 "xrpl::IntrusiveRefCounts::addWeakReleaseStrongRef : not "
                 "started partial destroy");
             return action;
@@ -340,7 +339,7 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
 inline ReleaseWeakRefAction
 IntrusiveRefCounts::releaseWeakRef() const
 {
-    auto prevIntVal = refCounts_.fetch_sub(kWEAK_DELTA, std::memory_order_acq_rel);
+    auto prevIntVal = refCounts_.fetch_sub(kWeakDelta, std::memory_order_acq_rel);
     RefCountPair prev = prevIntVal;
     if (prev.weak == 1 && prev.strong == 0)
     {
@@ -357,7 +356,7 @@ IntrusiveRefCounts::releaseWeakRef() const
         {
             // partial destroy MUST finish before running a full destroy (when
             // using weak pointers)
-            refCounts_.wait(prevIntVal - kWEAK_DELTA, std::memory_order_acquire);
+            refCounts_.wait(prevIntVal - kWeakDelta, std::memory_order_acquire);
         }
         return ReleaseWeakRefAction::Destroy;
     }
@@ -376,7 +375,7 @@ IntrusiveRefCounts::checkoutStrongRefFromWeak() const noexcept
         if (prev.strong == 0u)
             return false;
 
-        desiredValue = curValue + kSTRONG_DELTA;
+        desiredValue = curValue + kStrongDelta;
     }
     return true;
 }
@@ -400,23 +399,22 @@ inline IntrusiveRefCounts::~IntrusiveRefCounts() noexcept
 #ifndef NDEBUG
     auto v = refCounts_.load(std::memory_order_acquire);
     XRPL_ASSERT(
-        (!(v & kVALUE_MASK)), "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : count must be zero");
-    auto t = v & kTAG_MASK;
-    XRPL_ASSERT(
-        (!t || t == kTAG_MASK), "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : valid tag");
+        (!(v & kValueMask)), "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : count must be zero");
+    auto t = v & kTagMask;
+    XRPL_ASSERT((!t || t == kTagMask), "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : valid tag");
 #endif
 }
 
 //------------------------------------------------------------------------------
 
 inline IntrusiveRefCounts::RefCountPair::RefCountPair(IntrusiveRefCounts::FieldType v) noexcept
-    : strong{static_cast<CountType>(v & kSTRONG_MASK)}
-    , weak{static_cast<CountType>((v & kWEAK_MASK) >> kSTRONG_COUNT_NUM_BITS)}
-    , partialDestroyStartedBit{v & kPARTIAL_DESTROY_STARTED_MASK}
-    , partialDestroyFinishedBit{v & kPARTIAL_DESTROY_FINISHED_MASK}
+    : strong{static_cast<CountType>(v & kStrongMask)}
+    , weak{static_cast<CountType>((v & kWeakMask) >> kStrongCountNumBits)}
+    , partialDestroyStartedBit{v & kPartialDestroyStartedMask}
+    , partialDestroyFinishedBit{v & kPartialDestroyFinishedMask}
 {
     XRPL_ASSERT(
-        (strong < kCHECK_STRONG_MAX_VALUE && weak < kCHECK_WEAK_MAX_VALUE),
+        (strong < kCheckStrongMaxValue && weak < kCheckWeakMaxValue),
         "xrpl::IntrusiveRefCounts::RefCountPair(FieldType) : inputs inside "
         "range");
 }
@@ -427,7 +425,7 @@ inline IntrusiveRefCounts::RefCountPair::RefCountPair(
     : strong{s}, weak{w}
 {
     XRPL_ASSERT(
-        (strong < kCHECK_STRONG_MAX_VALUE && weak < kCHECK_WEAK_MAX_VALUE),
+        (strong < kCheckStrongMaxValue && weak < kCheckWeakMaxValue),
         "xrpl::IntrusiveRefCounts::RefCountPair(CountType, CountType) : "
         "inputs inside range");
 }
@@ -436,11 +434,11 @@ inline IntrusiveRefCounts::FieldType
 IntrusiveRefCounts::RefCountPair::combinedValue() const noexcept
 {
     XRPL_ASSERT(
-        (strong < kCHECK_STRONG_MAX_VALUE && weak < kCHECK_WEAK_MAX_VALUE),
+        (strong < kCheckStrongMaxValue && weak < kCheckWeakMaxValue),
         "xrpl::IntrusiveRefCounts::RefCountPair::combinedValue : inputs "
         "inside range");
     return (static_cast<IntrusiveRefCounts::FieldType>(weak)
-            << IntrusiveRefCounts::kSTRONG_COUNT_NUM_BITS) |
+            << IntrusiveRefCounts::kStrongCountNumBits) |
         static_cast<IntrusiveRefCounts::FieldType>(strong) | partialDestroyStartedBit |
         partialDestroyFinishedBit;
 }
@@ -451,7 +449,7 @@ partialDestructorFinished(T** o)
 {
     T& self = **o;
     IntrusiveRefCounts::RefCountPair const p =
-        self.refCounts_.fetch_or(IntrusiveRefCounts::kPARTIAL_DESTROY_FINISHED_MASK);
+        self.refCounts_.fetch_or(IntrusiveRefCounts::kPartialDestroyFinishedMask);
     XRPL_ASSERT(
         (!p.partialDestroyFinishedBit && p.partialDestroyStartedBit && !p.strong),
         "xrpl::partialDestructorFinished : not a weak ref");
diff --git a/include/xrpl/basics/LocalValue.h b/include/xrpl/basics/LocalValue.h
index f39df425a6..1c2a657a18 100644
--- a/include/xrpl/basics/LocalValue.h
+++ b/include/xrpl/basics/LocalValue.h
@@ -55,8 +55,8 @@ template <class = void>
 boost::thread_specific_ptr<detail::LocalValues>&
 getLocalValues()
 {
-    static boost::thread_specific_ptr<detail::LocalValues> kTSP(&detail::LocalValues::cleanup);
-    return kTSP;
+    static boost::thread_specific_ptr<detail::LocalValues> kTsp(&detail::LocalValues::cleanup);
+    return kTsp;
 }
 
 }  // namespace detail
diff --git a/include/xrpl/basics/Log.h b/include/xrpl/basics/Log.h
index 82782ba314..6bafbc7c54 100644
--- a/include/xrpl/basics/Log.h
+++ b/include/xrpl/basics/Log.h
@@ -191,7 +191,7 @@ public:
 private:
     // Maximum line length for log messages.
     // If the message exceeds this length it will be truncated with ellipses.
-    static constexpr auto kMAXIMUM_MESSAGE_CHARACTERS = 12 * 1024;
+    static constexpr auto kMaximumMessageCharacters = 12 * 1024;
 
     static void
     format(
diff --git a/include/xrpl/basics/Number.h b/include/xrpl/basics/Number.h
index cdb9014a87..e67f1f534d 100644
--- a/include/xrpl/basics/Number.h
+++ b/include/xrpl/basics/Number.h
@@ -214,12 +214,12 @@ class Number
 
 public:
     // The range for the exponent when normalized
-    constexpr static int kMIN_EXPONENT = -32768;
-    constexpr static int kMAX_EXPONENT = 32768;
+    static constexpr int kMinExponent = -32768;
+    static constexpr int kMaxExponent = 32768;
 
-    constexpr static internalrep kMAX_REP = std::numeric_limits<rep>::max();
-    static_assert(kMAX_REP == 9'223'372'036'854'775'807);
-    static_assert(-kMAX_REP == std::numeric_limits<rep>::min() + 1);
+    static constexpr internalrep kMaxRep = std::numeric_limits<rep>::max();
+    static_assert(kMaxRep == 9'223'372'036'854'775'807);
+    static_assert(-kMaxRep == std::numeric_limits<rep>::min() + 1);
 
     // May need to make unchecked private
     struct Unchecked
@@ -409,26 +409,26 @@ public:
     static internalrep
     minMantissa()
     {
-        return kRANGE.get().min;
+        return kRange.get().min;
     }
 
     static internalrep
     maxMantissa()
     {
-        return kRANGE.get().max;
+        return kRange.get().max;
     }
 
     static int
     mantissaLog()
     {
-        return kRANGE.get().log;
+        return kRange.get().log;
     }
 
     /// oneSmall is needed because the ranges are private
-    constexpr static Number
+    static constexpr Number
     oneSmall();
     /// oneLarge is needed because the ranges are private
-    constexpr static Number
+    static constexpr Number
     oneLarge();
 
     // And one is needed because it needs to choose between oneSmall and
@@ -445,25 +445,25 @@ private:
     static thread_local RoundingMode mode;
     // The available ranges for mantissa
 
-    constexpr static MantissaRange kSMALL_RANGE{MantissaRange::MantissaScale::Small};
-    static_assert(isPowerOfTen(kSMALL_RANGE.min));
-    static_assert(kSMALL_RANGE.min == 1'000'000'000'000'000LL);
-    static_assert(kSMALL_RANGE.max == 9'999'999'999'999'999LL);
-    static_assert(kSMALL_RANGE.log == 15);
-    static_assert(kSMALL_RANGE.min < kMAX_REP);
-    static_assert(kSMALL_RANGE.max < kMAX_REP);
-    constexpr static MantissaRange kLARGE_RANGE{MantissaRange::MantissaScale::Large};
-    static_assert(isPowerOfTen(kLARGE_RANGE.min));
-    static_assert(kLARGE_RANGE.min == 1'000'000'000'000'000'000ULL);
-    static_assert(kLARGE_RANGE.max == internalrep(9'999'999'999'999'999'999ULL));
-    static_assert(kLARGE_RANGE.log == 18);
-    static_assert(kLARGE_RANGE.min < kMAX_REP);
-    static_assert(kLARGE_RANGE.max > kMAX_REP);
+    static constexpr MantissaRange kSmallRange{MantissaRange::MantissaScale::Small};
+    static_assert(isPowerOfTen(kSmallRange.min));
+    static_assert(kSmallRange.min == 1'000'000'000'000'000LL);
+    static_assert(kSmallRange.max == 9'999'999'999'999'999LL);
+    static_assert(kSmallRange.log == 15);
+    static_assert(kSmallRange.min < kMaxRep);
+    static_assert(kSmallRange.max < kMaxRep);
+    static constexpr MantissaRange kLargeRange{MantissaRange::MantissaScale::Large};
+    static_assert(isPowerOfTen(kLargeRange.min));
+    static_assert(kLargeRange.min == 1'000'000'000'000'000'000ULL);
+    static_assert(kLargeRange.max == internalrep(9'999'999'999'999'999'999ULL));
+    static_assert(kLargeRange.log == 18);
+    static_assert(kLargeRange.min < kMaxRep);
+    static_assert(kLargeRange.max > kMaxRep);
 
     // The range for the mantissa when normalized.
     // Use reference_wrapper to avoid making copies, and prevent accidentally
     // changing the values inside the range.
-    static thread_local std::reference_wrapper<MantissaRange const> kRANGE;
+    static thread_local std::reference_wrapper<MantissaRange const> kRange;
 
     void
     normalize();
@@ -471,7 +471,7 @@ private:
     /** Normalize Number components to an arbitrary range.
      *
      * min/maxMantissa are parameters because this function is used by both
-     * normalize(), which reads from kRANGE, and by normalizeToRange,
+     * normalize(), which reads from kRange, and by normalizeToRange,
      * which is public and can accept an arbitrary range from the caller.
      */
     template <class T>
@@ -521,7 +521,7 @@ constexpr Number::Number(internalrep mantissa, int exponent, Unchecked) noexcept
 {
 }
 
-constexpr static Number kNUM_ZERO{};
+static constexpr Number kNumZero{};
 
 inline Number::Number(bool negative, internalrep mantissa, int exponent, Normalized)
     : Number(negative, mantissa, exponent, Unchecked{})
@@ -552,10 +552,10 @@ constexpr Number::rep
 Number::mantissa() const noexcept
 {
     auto m = mantissa_;
-    if (m > kMAX_REP)
+    if (m > kMaxRep)
     {
         XRPL_ASSERT_PARTS(
-            !isnormal() || (m % 10 == 0 && m / 10 <= kMAX_REP),
+            !isnormal() || (m % 10 == 0 && m / 10 <= kMaxRep),
             "xrpl::Number::mantissa",
             "large normalized mantissa has no remainder");
         m /= 10;
@@ -573,10 +573,10 @@ constexpr int
 Number::exponent() const noexcept
 {
     auto e = exponent_;
-    if (mantissa_ > kMAX_REP)
+    if (mantissa_ > kMaxRep)
     {
         XRPL_ASSERT_PARTS(
-            !isnormal() || (mantissa_ % 10 == 0 && mantissa_ / 10 <= kMAX_REP),
+            !isnormal() || (mantissa_ % 10 == 0 && mantissa_ / 10 <= kMaxRep),
             "xrpl::Number::exponent",
             "large normalized mantissa has no remainder");
         ++e;
@@ -671,29 +671,29 @@ operator/(Number const& x, Number const& y)
 inline Number
 Number::min() noexcept
 {
-    return Number{false, kRANGE.get().min, kMIN_EXPONENT, Unchecked{}};
+    return Number{false, kRange.get().min, kMinExponent, Unchecked{}};
 }
 
 inline Number
 Number::max() noexcept
 {
-    return Number{false, std::min(kRANGE.get().max, kMAX_REP), kMAX_EXPONENT, Unchecked{}};
+    return Number{false, std::min(kRange.get().max, kMaxRep), kMaxExponent, Unchecked{}};
 }
 
 inline Number
 Number::lowest() noexcept
 {
-    return Number{true, std::min(kRANGE.get().max, kMAX_REP), kMAX_EXPONENT, Unchecked{}};
+    return Number{true, std::min(kRange.get().max, kMaxRep), kMaxExponent, Unchecked{}};
 }
 
 inline bool
 Number::isnormal() const noexcept
 {
-    MantissaRange const& range = kRANGE;
+    MantissaRange const& range = kRange;
     auto const absM = mantissa_;
     return *this == Number{} ||
-        (range.min <= absM && absM <= range.max && (absM <= kMAX_REP || absM % 10 == 0) &&
-         kMIN_EXPONENT <= exponent_ && exponent_ <= kMAX_EXPONENT);
+        (range.min <= absM && absM <= range.max && (absM <= kMaxRep || absM % 10 == 0) &&
+         kMinExponent <= exponent_ && exponent_ <= kMaxExponent);
 }
 
 template <Integral64 T>
diff --git a/include/xrpl/basics/SharedWeakCachePointer.ipp b/include/xrpl/basics/SharedWeakCachePointer.ipp
index 2f8345e645..6228d09b6f 100644
--- a/include/xrpl/basics/SharedWeakCachePointer.ipp
+++ b/include/xrpl/basics/SharedWeakCachePointer.ipp
@@ -57,10 +57,10 @@ template <class T>
 std::shared_ptr<T> const&
 SharedWeakCachePointer<T>::getStrong() const
 {
-    static std::shared_ptr<T> const kEMPTY;
+    static std::shared_ptr<T> const kEmpty;
     if (auto p = std::get_if<std::shared_ptr<T>>(&combo_))
         return *p;
-    return kEMPTY;
+    return kEmpty;
 }
 
 template <class T>
diff --git a/include/xrpl/basics/StringUtilities.h b/include/xrpl/basics/StringUtilities.h
index f4bdd61f6a..28421626aa 100644
--- a/include/xrpl/basics/StringUtilities.h
+++ b/include/xrpl/basics/StringUtilities.h
@@ -34,7 +34,7 @@ template <typename T>
 concept SomeChar = std::same_as<std::remove_cvref_t<T>, int8_t> ||
     std::same_as<std::remove_cvref_t<T>, char> || std::same_as<std::remove_cvref_t<T>, uint8_t>;
 
-inline constexpr std::array<std::optional<int>, 256> const kDIGIT_LOOKUP_TABLE = []() {
+inline constexpr std::array<std::optional<int>, 256> const kDigitLookupTable = []() {
     std::array<std::optional<int>, 256> t{};
 
     for (int i = 0; i < 10; ++i)
@@ -52,7 +52,7 @@ inline constexpr std::array<std::optional<int>, 256> const kDIGIT_LOOKUP_TABLE =
 inline std::optional<int>
 hexCharToInt(SomeChar auto hexChar)
 {
-    return kDIGIT_LOOKUP_TABLE[static_cast<uint8_t>(hexChar)];
+    return kDigitLookupTable[static_cast<uint8_t>(hexChar)];
 }
 
 }  // namespace detail
diff --git a/include/xrpl/basics/UptimeClock.h b/include/xrpl/basics/UptimeClock.h
index bb7d4fd77a..502aae7c25 100644
--- a/include/xrpl/basics/UptimeClock.h
+++ b/include/xrpl/basics/UptimeClock.h
@@ -30,8 +30,8 @@ public:
     now();  // seconds since xrpld program start
 
 private:
-    static std::atomic<rep> kNOW;
-    static std::atomic<bool> kSTOP;
+    static std::atomic<rep> kNow;
+    static std::atomic<bool> kStop;
 
     struct UpdateThread : private std::thread
     {
diff --git a/include/xrpl/basics/base_uint.h b/include/xrpl/basics/base_uint.h
index 727768a69a..93a9ced15e 100644
--- a/include/xrpl/basics/base_uint.h
+++ b/include/xrpl/basics/base_uint.h
@@ -73,12 +73,12 @@ class BaseUInt
 
     static_assert(Bits >= 64, "The length of a base_uint in bits must be at least 64.");
 
-    static constexpr std::size_t kWIDTH = Bits / 32;
+    static constexpr std::size_t kWidth = Bits / 32;
 
     // This is really big-endian in byte order.
     // We sometimes use std::uint32_t for speed.
 
-    std::array<std::uint32_t, kWIDTH> data_;
+    std::array<std::uint32_t, kWidth> data_;
 
 public:
     //--------------------------------------------------------------------------
@@ -86,8 +86,8 @@ public:
     // STL Container Interface
     //
 
-    static std::size_t constexpr kBYTES = Bits / 8;
-    static_assert(sizeof(data_) == kBYTES, "");
+    static constexpr std::size_t kBytes = Bits / 8;
+    static_assert(sizeof(data_) == kBytes, "");
 
     using size_type = std::size_t;
     using difference_type = std::ptrdiff_t;
@@ -121,7 +121,7 @@ public:
     iterator
     end()
     {
-        return data() + kBYTES;
+        return data() + kBytes;
     }
     [[nodiscard]] const_iterator
     begin() const
@@ -131,7 +131,7 @@ public:
     [[nodiscard]] const_iterator
     end() const
     {
-        return data() + kBYTES;
+        return data() + kBytes;
     }
     [[nodiscard]] const_iterator
     cbegin() const
@@ -141,7 +141,7 @@ public:
     [[nodiscard]] const_iterator
     cend() const
     {
-        return data() + kBYTES;
+        return data() + kBytes;
     }
 
     /** Value hashing function.
@@ -167,7 +167,7 @@ private:
 
     explicit BaseUInt(void const* data, VoidHelper)
     {
-        memcpy(data_.data(), data, kBYTES);
+        memcpy(data_.data(), data, kBytes);
     }
 
     // Helper function to initialize a base_uint from a std::string_view.
@@ -336,7 +336,7 @@ public:
     [[nodiscard]] constexpr int
     signum() const
     {
-        for (int i = 0; i < kWIDTH; i++)
+        for (int i = 0; i < kWidth; i++)
         {
             if (data_[i] != 0)
                 return 1;
@@ -348,7 +348,7 @@ public:
     bool
     operator!() const
     {
-        return *this == beast::kZERO;
+        return *this == beast::kZero;
     }
 
     constexpr BaseUInt
@@ -356,7 +356,7 @@ public:
     {
         BaseUInt ret;
 
-        for (int i = 0; i < kWIDTH; i++)
+        for (int i = 0; i < kWidth; i++)
             ret.data_[i] = ~data_[i];
 
         return ret;
@@ -365,7 +365,7 @@ public:
     BaseUInt&
     operator=(std::uint64_t uHost)
     {
-        *this = beast::kZERO;
+        *this = beast::kZero;
         // NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
         union
         {
@@ -375,15 +375,15 @@ public:
         // NOLINTEND(cppcoreguidelines-pro-type-member-init)
         // Put in least significant bits.
         ul = boost::endian::native_to_big(uHost);
-        data_[kWIDTH - 2] = u[0];
-        data_[kWIDTH - 1] = u[1];
+        data_[kWidth - 2] = u[0];
+        data_[kWidth - 1] = u[1];
         return *this;
     }
 
     BaseUInt&
     operator^=(BaseUInt const& b)
     {
-        for (int i = 0; i < kWIDTH; i++)
+        for (int i = 0; i < kWidth; i++)
             data_[i] ^= b.data_[i];
 
         return *this;
@@ -392,7 +392,7 @@ public:
     BaseUInt&
     operator&=(BaseUInt const& b)
     {
-        for (int i = 0; i < kWIDTH; i++)
+        for (int i = 0; i < kWidth; i++)
             data_[i] &= b.data_[i];
 
         return *this;
@@ -401,7 +401,7 @@ public:
     BaseUInt&
     operator|=(BaseUInt const& b)
     {
-        for (int i = 0; i < kWIDTH; i++)
+        for (int i = 0; i < kWidth; i++)
             data_[i] |= b.data_[i];
 
         return *this;
@@ -411,7 +411,7 @@ public:
     operator++()
     {
         // prefix operator
-        for (int i = kWIDTH - 1; i >= 0; --i)
+        for (int i = kWidth - 1; i >= 0; --i)
         {
             data_[i] = boost::endian::native_to_big(boost::endian::big_to_native(data_[i]) + 1);
             if (data_[i] != 0)
@@ -434,7 +434,7 @@ public:
     BaseUInt&
     operator--()
     {
-        for (int i = kWIDTH - 1; i >= 0; --i)
+        for (int i = kWidth - 1; i >= 0; --i)
         {
             auto prev = data_[i];
             data_[i] = boost::endian::native_to_big(boost::endian::big_to_native(data_[i]) - 1);
@@ -475,7 +475,7 @@ public:
     {
         std::uint64_t carry = 0;
 
-        for (int i = kWIDTH - 1; i >= 0; i--)
+        for (int i = kWidth - 1; i >= 0; i--)
         {
             std::uint64_t const n = carry + boost::endian::big_to_native(data_[i]) +
                 boost::endian::big_to_native(b.data_[i]);
@@ -526,10 +526,10 @@ public:
         return parseHex(std::string_view{str});
     }
 
-    constexpr static std::size_t
+    static constexpr std::size_t
     size()
     {
-        return kBYTES;
+        return kBytes;
     }
 
     BaseUInt<Bits, Tag>&
@@ -543,17 +543,17 @@ public:
     [[nodiscard]] bool
     isZero() const
     {
-        return *this == beast::kZERO;
+        return *this == beast::kZero;
     }
     [[nodiscard]] bool
     isNonZero() const
     {
-        return *this != beast::kZERO;
+        return *this != beast::kZero;
     }
     void
     zero()
     {
-        *this = beast::kZERO;
+        *this = beast::kZero;
     }
 };
 
@@ -639,7 +639,7 @@ template <std::size_t Bits, class Tag>
 inline std::string
 toShortString(BaseUInt<Bits, Tag> const& a)
 {
-    static_assert(BaseUInt<Bits, Tag>::kBYTES > 4, "For 4 bytes or less, use a native type");
+    static_assert(BaseUInt<Bits, Tag>::kBytes > 4, "For 4 bytes or less, use a native type");
     return strHex(a.cbegin(), a.cbegin() + 4) + "...";
 }
 
diff --git a/include/xrpl/basics/chrono.h b/include/xrpl/basics/chrono.h
index 8b71be04b4..5d6de06248 100644
--- a/include/xrpl/basics/chrono.h
+++ b/include/xrpl/basics/chrono.h
@@ -30,10 +30,10 @@ using weeks = std::chrono::duration<int, std::ratio_multiply<days::period, std::
     = seconds(946684800)
 */
 
-constexpr static std::chrono::seconds kEPOCH_OFFSET =
+static constexpr std::chrono::seconds kEpochOffset =
     date::sys_days{date::year{2000} / 1 / 1} - date::sys_days{date::year{1970} / 1 / 1};
 
-static_assert(kEPOCH_OFFSET.count() == 946684800);
+static_assert(kEpochOffset.count() == 946684800);
 
 class NetClock
 {
@@ -60,7 +60,7 @@ to_string(NetClock::time_point tp)
 {
     // 2000-01-01 00:00:00 UTC is 946684800s from 1970-01-01 00:00:00 UTC
     using namespace std::chrono;
-    return to_string(system_clock::time_point{tp.time_since_epoch() + kEPOCH_OFFSET});
+    return to_string(system_clock::time_point{tp.time_since_epoch() + kEpochOffset});
 }
 
 template <class Duration>
@@ -77,7 +77,7 @@ toStringIso(NetClock::time_point tp)
     // 2000-01-01 00:00:00 UTC is 946684800s from 1970-01-01 00:00:00 UTC
     // Note, NetClock::duration is seconds, as checked by static_assert
     static_assert(std::is_same_v<NetClock::duration::period, std::ratio<1>>);
-    return toStringIso(date::sys_time<NetClock::duration>{tp.time_since_epoch() + kEPOCH_OFFSET});
+    return toStringIso(date::sys_time<NetClock::duration>{tp.time_since_epoch() + kEpochOffset});
 }
 
 /** A clock for measuring elapsed time.
diff --git a/include/xrpl/basics/hardened_hash.h b/include/xrpl/basics/hardened_hash.h
index 07f5aded4c..efc77e058b 100644
--- a/include/xrpl/basics/hardened_hash.h
+++ b/include/xrpl/basics/hardened_hash.h
@@ -31,9 +31,9 @@ makeSeedPair() noexcept
         // state_t(state_t const&) = delete;
         // state_t& operator=(state_t const&) = delete;
     };
-    static StateT kSTATE;
-    std::scoped_lock const lock(kSTATE.mutex);
-    return {kSTATE.dist(kSTATE.gen), kSTATE.dist(kSTATE.gen)};
+    static StateT kState;
+    std::scoped_lock const lock(kState.mutex);
+    return {kState.dist(kState.gen), kState.dist(kState.gen)};
 }
 
 }  // namespace detail
diff --git a/include/xrpl/basics/mulDiv.h b/include/xrpl/basics/mulDiv.h
index 8a9bc4f5dc..9076da62f2 100644
--- a/include/xrpl/basics/mulDiv.h
+++ b/include/xrpl/basics/mulDiv.h
@@ -5,7 +5,7 @@
 #include <optional>
 
 namespace xrpl {
-auto constexpr kMULDIV_MAX = std::numeric_limits<std::uint64_t>::max();
+constexpr auto kMuldivMax = std::numeric_limits<std::uint64_t>::max();
 
 /** Return value*mul/div accurately.
     Computes the result of the multiplication and division in
diff --git a/include/xrpl/basics/random.h b/include/xrpl/basics/random.h
index 7dfade5bda..17f4a1c213 100644
--- a/include/xrpl/basics/random.h
+++ b/include/xrpl/basics/random.h
@@ -47,7 +47,7 @@ inline beast::xor_shift_engine&
 defaultPrng()
 {
     // This is used to seed the thread-specific PRNGs on demand
-    static beast::xor_shift_engine kSEEDER = [] {
+    static beast::xor_shift_engine kSeeder = [] {
         std::random_device rng;
         std::uniform_int_distribution<std::uint64_t> distribution{1};
         return beast::xor_shift_engine(distribution(rng));
@@ -57,17 +57,17 @@ defaultPrng()
     static std::mutex kM;
 
     // The thread-specific PRNGs:
-    thread_local beast::xor_shift_engine kENGINE = [] {
+    thread_local beast::xor_shift_engine kEngine = [] {
         std::uint64_t seed = 0;
         {
             std::scoped_lock const lk(kM);
             std::uniform_int_distribution<std::uint64_t> distribution{1};
-            seed = distribution(kSEEDER);
+            seed = distribution(kSeeder);
         }
         return beast::xor_shift_engine{seed};
     }();
 
-    return kENGINE;
+    return kEngine;
 }
 
 /** Return a uniformly distributed random integer.
diff --git a/include/xrpl/basics/safe_cast.h b/include/xrpl/basics/safe_cast.h
index e35495bcf7..f71edc47ad 100644
--- a/include/xrpl/basics/safe_cast.h
+++ b/include/xrpl/basics/safe_cast.h
@@ -22,9 +22,9 @@ safeCast(Src s) noexcept
 {
     static_assert(
         std::is_signed_v<Dest> || std::is_unsigned_v<Src>, "Cannot cast signed to unsigned");
-    constexpr unsigned kNOT_SAME = std::is_signed_v<Dest> != std::is_signed_v<Src>;
+    constexpr unsigned kNotSame = std::is_signed_v<Dest> != std::is_signed_v<Src>;
     static_assert(
-        sizeof(Dest) >= sizeof(Src) + kNOT_SAME,
+        sizeof(Dest) >= sizeof(Src) + kNotSame,
         "Destination is too small to hold all values of source");
     return static_cast<Dest>(s);
 }
diff --git a/include/xrpl/beast/clock/abstract_clock.h b/include/xrpl/beast/clock/abstract_clock.h
index 67320ceabc..33d4096d0e 100644
--- a/include/xrpl/beast/clock/abstract_clock.h
+++ b/include/xrpl/beast/clock/abstract_clock.h
@@ -83,8 +83,8 @@ template <class Facade, class Clock = Facade>
 AbstractClock<Facade>&
 getAbstractClock()
 {
-    static detail::AbstractClockWrapper<Facade, Clock> kCLOCK;
-    return kCLOCK;
+    static detail::AbstractClockWrapper<Facade, Clock> kClock;
+    return kClock;
 }
 
 }  // namespace beast
diff --git a/include/xrpl/beast/core/CurrentThreadName.h b/include/xrpl/beast/core/CurrentThreadName.h
index 9bf062a885..6175d99b16 100644
--- a/include/xrpl/beast/core/CurrentThreadName.h
+++ b/include/xrpl/beast/core/CurrentThreadName.h
@@ -21,7 +21,7 @@ setCurrentThreadName(std::string_view newThreadName);
 
 // On Linux, thread names are limited to 16 bytes including the null terminator.
 // Maximum number of characters is therefore 15.
-constexpr std::size_t kMAX_THREAD_NAME_LENGTH = 15;
+constexpr std::size_t kMaxThreadNameLength = 15;
 
 /** Sets the name of the caller thread with compile-time size checking.
     @tparam N The size of the string literal including null terminator
@@ -34,7 +34,7 @@ template <std::size_t N>
 void
 setCurrentThreadName(char const (&newThreadName)[N])
 {
-    static_assert(N <= kMAX_THREAD_NAME_LENGTH + 1, "Thread name cannot exceed 15 characters");
+    static_assert(N <= kMaxThreadNameLength + 1, "Thread name cannot exceed 15 characters");
 
     setCurrentThreadName(std::string_view(newThreadName, N - 1));
 }
diff --git a/include/xrpl/beast/hash/hash_append.h b/include/xrpl/beast/hash/hash_append.h
index 25ce668166..83cff4bdea 100644
--- a/include/xrpl/beast/hash/hash_append.h
+++ b/include/xrpl/beast/hash/hash_append.h
@@ -53,7 +53,7 @@ inline void
 maybeReverseBytes(T& t, Hasher&)
 {
     maybeReverseBytes(
-        t, std::integral_constant<bool, Hasher::kENDIAN != boost::endian::order::native>{});
+        t, std::integral_constant<bool, Hasher::kEndian != boost::endian::order::native>{});
 }
 
 }  // namespace detail
@@ -154,7 +154,7 @@ struct IsContiguouslyHashable
     : public std::integral_constant<
           bool,
           IsUniquelyRepresented<T>::value &&
-              (sizeof(T) == 1 || HashAlgorithm::kENDIAN == boost::endian::order::native)>
+              (sizeof(T) == 1 || HashAlgorithm::kEndian == boost::endian::order::native)>
 {
     explicit IsContiguouslyHashable() = default;
 };
diff --git a/include/xrpl/beast/hash/xxhasher.h b/include/xrpl/beast/hash/xxhasher.h
index 01485e1e85..95a67dede0 100644
--- a/include/xrpl/beast/hash/xxhasher.h
+++ b/include/xrpl/beast/hash/xxhasher.h
@@ -21,9 +21,9 @@ private:
     static_assert(sizeof(std::size_t) == 8, "requires 64-bit std::size_t");
     // Have an internal buffer to avoid the streaming API
     // A 64-byte buffer should to be big enough for us
-    static constexpr std::size_t kINTERNAL_BUFFER_SIZE = 64;
+    static constexpr std::size_t kInternalBufferSize = 64;
 
-    alignas(64) std::array<std::uint8_t, kINTERNAL_BUFFER_SIZE> buffer_{};
+    alignas(64) std::array<std::uint8_t, kInternalBufferSize> buffer_{};
     std::span<std::uint8_t> readBuffer_;
     std::span<std::uint8_t> writeBuffer_;
 
@@ -102,7 +102,7 @@ private:
     }
 
 public:
-    static constexpr auto const kENDIAN = boost::endian::order::native;
+    static constexpr auto kEndian = boost::endian::order::native;
 
     Xxhasher(Xxhasher const&) = delete;
     Xxhasher&
diff --git a/include/xrpl/beast/unit_test/reporter.h b/include/xrpl/beast/unit_test/reporter.h
index d9bfcaa477..b4b6c69fa4 100644
--- a/include/xrpl/beast/unit_test/reporter.h
+++ b/include/xrpl/beast/unit_test/reporter.h
@@ -62,7 +62,7 @@ private:
     {
         using run_time = std::pair<std::string, typename clock_type::duration>;
 
-        static constexpr auto kMAX_TOP = 10;
+        static constexpr auto kMaxTop = 10;
 
         std::size_t suites = 0;
         std::size_t cases = 0;
@@ -146,11 +146,11 @@ Reporter<Unused>::Results::add(SuiteResults const& r)
             });
         if (iter != top.end())
         {
-            if (top.size() == kMAX_TOP)
+            if (top.size() == kMaxTop)
                 top.resize(top.size() - 1);
             top.emplace(iter, r.name, elapsed);
         }
-        else if (top.size() < kMAX_TOP)
+        else if (top.size() < kMaxTop)
         {
             top.emplace_back(r.name, elapsed);
         }
diff --git a/include/xrpl/beast/unit_test/suite.h b/include/xrpl/beast/unit_test/suite.h
index 999058b7f1..fded866da0 100644
--- a/include/xrpl/beast/unit_test/suite.h
+++ b/include/xrpl/beast/unit_test/suite.h
@@ -299,8 +299,8 @@ private:
     static Suite**
     pThisSuite()
     {
-        static Suite* kP_TS = nullptr;  // NOLINT TODO
-        return &kP_TS;
+        static Suite* kPTs = nullptr;  // NOLINT TODO
+        return &kPTs;
     }
 
     /** Runs the suite. */
diff --git a/include/xrpl/beast/utility/Zero.h b/include/xrpl/beast/utility/Zero.h
index 7825bb96e0..f54345d437 100644
--- a/include/xrpl/beast/utility/Zero.h
+++ b/include/xrpl/beast/utility/Zero.h
@@ -27,7 +27,7 @@ struct Zero
 };
 
 namespace {
-constexpr Zero kZERO{};
+constexpr Zero kZero{};
 }  // namespace
 
 /** Default implementation of signum calls the method on the class. */
@@ -102,42 +102,42 @@ template <typename T>
 bool
 operator==(Zero, T const& t)
 {
-    return t == kZERO;
+    return t == kZero;
 }
 
 template <typename T>
 bool
 operator!=(Zero, T const& t)
 {
-    return t != kZERO;
+    return t != kZero;
 }
 
 template <typename T>
 bool
 operator<(Zero, T const& t)
 {
-    return t > kZERO;
+    return t > kZero;
 }
 
 template <typename T>
 bool
 operator>(Zero, T const& t)
 {
-    return t < kZERO;
+    return t < kZero;
 }
 
 template <typename T>
 bool
 operator>=(Zero, T const& t)
 {
-    return t <= kZERO;
+    return t <= kZero;
 }
 
 template <typename T>
 bool
 operator<=(Zero, T const& t)
 {
-    return t >= kZERO;
+    return t >= kZero;
 }
 
 }  // namespace beast
diff --git a/include/xrpl/beast/utility/rngfill.h b/include/xrpl/beast/utility/rngfill.h
index 1bc8350d4f..1614a594c5 100644
--- a/include/xrpl/beast/utility/rngfill.h
+++ b/include/xrpl/beast/utility/rngfill.h
@@ -14,23 +14,23 @@ void
 rngfill(void* const buffer, std::size_t const bytes, Generator& g)
 {
     using result_type = typename Generator::result_type;
-    constexpr std::size_t kRESULT_SIZE = sizeof(result_type);
+    constexpr std::size_t kResultSize = sizeof(result_type);
 
     std::uint8_t* const bufferStart = static_cast<std::uint8_t*>(buffer);
-    std::size_t const completeIterations = bytes / kRESULT_SIZE;
-    std::size_t const bytesRemaining = bytes % kRESULT_SIZE;
+    std::size_t const completeIterations = bytes / kResultSize;
+    std::size_t const bytesRemaining = bytes % kResultSize;
 
     for (std::size_t count = 0; count < completeIterations; ++count)
     {
         result_type const v = g();
-        std::size_t const offset = count * kRESULT_SIZE;
-        std::memcpy(bufferStart + offset, &v, kRESULT_SIZE);
+        std::size_t const offset = count * kResultSize;
+        std::memcpy(bufferStart + offset, &v, kResultSize);
     }
 
     if (bytesRemaining > 0)
     {
         result_type const v = g();
-        std::size_t const offset = completeIterations * kRESULT_SIZE;
+        std::size_t const offset = completeIterations * kResultSize;
         std::memcpy(bufferStart + offset, &v, bytesRemaining);
     }
 }
diff --git a/include/xrpl/beast/xor_shift_engine.h b/include/xrpl/beast/xor_shift_engine.h
index 3a5345934e..45baecf101 100644
--- a/include/xrpl/beast/xor_shift_engine.h
+++ b/include/xrpl/beast/xor_shift_engine.h
@@ -26,12 +26,14 @@ public:
     result_type
     operator()();
 
-    static result_type constexpr min()
+    static constexpr result_type
+    min()
     {
         return std::numeric_limits<result_type>::min();
     }
 
-    static result_type constexpr max()
+    static constexpr result_type
+    max()
     {
         return std::numeric_limits<result_type>::max();
     }
diff --git a/include/xrpl/conditions/Condition.h b/include/xrpl/conditions/Condition.h
index 0d45245585..66d1d24736 100644
--- a/include/xrpl/conditions/Condition.h
+++ b/include/xrpl/conditions/Condition.h
@@ -27,7 +27,7 @@ public:
               that were previously considered valid to no longer
               be allowed.
     */
-    static constexpr std::size_t kMAX_SERIALIZED_CONDITION = 128;
+    static constexpr std::size_t kMaxSerializedCondition = 128;
 
     /** Load a condition from its binary form
 
diff --git a/include/xrpl/conditions/Fulfillment.h b/include/xrpl/conditions/Fulfillment.h
index 8b315297d7..fd8cd7d31e 100644
--- a/include/xrpl/conditions/Fulfillment.h
+++ b/include/xrpl/conditions/Fulfillment.h
@@ -16,7 +16,7 @@ public:
               that were previously considered valid to no longer
               be allowed.
     */
-    static constexpr std::size_t kMAX_SERIALIZED_FULFILLMENT = 256;
+    static constexpr std::size_t kMaxSerializedFulfillment = 256;
 
     /** Load a fulfillment from its binary form
 
diff --git a/include/xrpl/conditions/detail/PreimageSha256.h b/include/xrpl/conditions/detail/PreimageSha256.h
index e3018f754c..c592ea37ee 100644
--- a/include/xrpl/conditions/detail/PreimageSha256.h
+++ b/include/xrpl/conditions/detail/PreimageSha256.h
@@ -23,7 +23,7 @@ public:
         While future versions of this code will never lower
         this limit, they may opt to raise it.
     */
-    static constexpr std::size_t kMAX_PREIMAGE_LENGTH = 128;
+    static constexpr std::size_t kMaxPreimageLength = 128;
 
     /** Parse the payload for a PreimageSha256 condition
 
@@ -65,7 +65,7 @@ public:
             return {};
         }
 
-        if (s.size() > kMAX_PREIMAGE_LENGTH)
+        if (s.size() > kMaxPreimageLength)
         {
             ec = Error::PreimageTooLong;
             return {};
diff --git a/include/xrpl/core/Coro.ipp b/include/xrpl/core/Coro.ipp
index 4b876dc68d..90fa965038 100644
--- a/include/xrpl/core/Coro.ipp
+++ b/include/xrpl/core/Coro.ipp
@@ -6,7 +6,7 @@ namespace xrpl {
 
 /// Coroutine stack size (1.5 MB). Increased from 1 MB because
 /// ASAN-instrumented deep call stacks exceeded the original limit.
-constexpr std::size_t kCORO_STACK_SIZE = 1536 * 1024;
+constexpr std::size_t kCoroStackSize = 1536 * 1024;
 
 template <class F>
 JobQueue::Coro::Coro(CoroCreateT, JobQueue& jq, JobType type, std::string name, F&& f)
@@ -14,7 +14,7 @@ JobQueue::Coro::Coro(CoroCreateT, JobQueue& jq, JobType type, std::string name,
     , type_(type)
     , name_(std::move(name))
     , coro_(
-          boost::context::protected_fixedsize_stack(kCORO_STACK_SIZE),
+          boost::context::protected_fixedsize_stack(kCoroStackSize),
           [this, fn = std::forward<F>(f)](boost::coroutines2::coroutine<void>::push_type& doYield) {
               yield_ = &doYield;
               yield();
diff --git a/include/xrpl/core/JobTypes.h b/include/xrpl/core/JobTypes.h
index 32a793c9dc..fb5c7988cb 100644
--- a/include/xrpl/core/JobTypes.h
+++ b/include/xrpl/core/JobTypes.h
@@ -101,8 +101,8 @@ public:
     static JobTypes const&
     instance()
     {
-        static JobTypes const kTYPES;
-        return kTYPES;
+        static JobTypes const kTypes;
+        return kTypes;
     }
 
     static std::string const&
diff --git a/include/xrpl/json/json_reader.h b/include/xrpl/json/json_reader.h
index ecd9ea7985..9251183281 100644
--- a/include/xrpl/json/json_reader.h
+++ b/include/xrpl/json/json_reader.h
@@ -67,7 +67,7 @@ public:
     [[nodiscard]] std::string
     getFormattedErrorMessages() const;
 
-    static constexpr unsigned kNEST_LIMIT{25};
+    static constexpr unsigned kNestLimit{25};
 
 private:
     enum class TokenType {
diff --git a/include/xrpl/json/json_value.h b/include/xrpl/json/json_value.h
index a11090d98b..e9dcb8bcbe 100644
--- a/include/xrpl/json/json_value.h
+++ b/include/xrpl/json/json_value.h
@@ -102,8 +102,8 @@ operator!=(StaticString x, std::string const& y)
 /** \brief Represents a <a HREF="http://www.json.org">JSON</a> value.
  *
  * This class is a discriminated union wrapper that can represent a:
- * - signed integer [range: Value::kMIN_INT - Value::kMAX_INT]
- * - unsigned integer (range: 0 - Value::kMAX_UINT)
+ * - signed integer [range: Value::kMinInt - Value::kMaxInt]
+ * - unsigned integer (range: 0 - Value::kMaxUInt)
  * - double
  * - UTF-8 string
  * - boolean
@@ -138,10 +138,10 @@ public:
     using Int = json::Int;
     using ArrayIndex = UInt;
 
-    static Value const kNULL;
-    static constexpr Int kMIN_INT = std::numeric_limits<Int>::min();
-    static constexpr Int kMAX_INT = std::numeric_limits<Int>::max();
-    static constexpr UInt kMAX_UINT = std::numeric_limits<UInt>::max();
+    static Value const kNull;
+    static constexpr Int kMinInt = std::numeric_limits<Int>::min();
+    static constexpr Int kMaxInt = std::numeric_limits<Int>::max();
+    static constexpr UInt kMaxUInt = std::numeric_limits<UInt>::max();
 
 private:
     class CZString
@@ -472,7 +472,7 @@ operator>=(Value const& x, Value const& y)
 class ValueAllocator
 {
 public:
-    static constexpr auto kUNKNOWN = (unsigned)-1;
+    static constexpr auto kUnknown = (unsigned)-1;
 
     virtual ~ValueAllocator() = default;
 
@@ -481,7 +481,7 @@ public:
     virtual void
     releaseMemberName(char* memberName) = 0;
     virtual char*
-    duplicateStringValue(char const* value, unsigned int length = kUNKNOWN) = 0;
+    duplicateStringValue(char const* value, unsigned int length = kUnknown) = 0;
     virtual void
     releaseStringValue(char* value) = 0;
 };
diff --git a/include/xrpl/ledger/Ledger.h b/include/xrpl/ledger/Ledger.h
index 2d6f48db2d..351f7d80e5 100644
--- a/include/xrpl/ledger/Ledger.h
+++ b/include/xrpl/ledger/Ledger.h
@@ -24,7 +24,7 @@ struct CreateGenesisT
 {
     explicit CreateGenesisT() = default;
 };
-extern CreateGenesisT const kCREATE_GENESIS;
+extern CreateGenesisT const kCreateGenesis;
 
 /** Holds a ledger.
 
diff --git a/include/xrpl/ledger/LedgerTiming.h b/include/xrpl/ledger/LedgerTiming.h
index dce28bd44b..508403d760 100644
--- a/include/xrpl/ledger/LedgerTiming.h
+++ b/include/xrpl/ledger/LedgerTiming.h
@@ -12,7 +12,7 @@ namespace xrpl {
     Values should not be duplicated.
     @see getNextLedgerTimeResolution
 */
-std::chrono::seconds constexpr kLEDGER_POSSIBLE_TIME_RESOLUTIONS[] = {
+constexpr std::chrono::seconds kLedgerPossibleTimeResolutions[] = {
     std::chrono::seconds{10},
     std::chrono::seconds{20},
     std::chrono::seconds{30},
@@ -21,16 +21,16 @@ std::chrono::seconds constexpr kLEDGER_POSSIBLE_TIME_RESOLUTIONS[] = {
     std::chrono::seconds{120}};
 
 //! Initial resolution of ledger close time.
-auto constexpr kLEDGER_DEFAULT_TIME_RESOLUTION = kLEDGER_POSSIBLE_TIME_RESOLUTIONS[2];
+constexpr auto kLedgerDefaultTimeResolution = kLedgerPossibleTimeResolutions[2];
 
 //! Close time resolution in genesis ledger
-auto constexpr kLEDGER_GENESIS_TIME_RESOLUTION = kLEDGER_POSSIBLE_TIME_RESOLUTIONS[0];
+constexpr auto kLedgerGenesisTimeResolution = kLedgerPossibleTimeResolutions[0];
 
 //! How often we increase the close time resolution (in numbers of ledgers)
-auto constexpr kINCREASE_LEDGER_TIME_RESOLUTION_EVERY = 8;
+constexpr auto kIncreaseLedgerTimeResolutionEvery = 8;
 
 //! How often we decrease the close time resolution (in numbers of ledgers)
-auto constexpr kDECREASE_LEDGER_TIME_RESOLUTION_EVERY = 1;
+constexpr auto kDecreaseLedgerTimeResolutionEvery = 1;
 
 /** Calculates the close time resolution for the specified ledger.
 
@@ -46,7 +46,7 @@ auto constexpr kDECREASE_LEDGER_TIME_RESOLUTION_EVERY = 1;
     @param ledgerSeq the sequence number of the new ledger
 
     @pre previousResolution must be a valid bin
-         from @ref kLEDGER_POSSIBLE_TIME_RESOLUTIONS
+         from @ref kLedgerPossibleTimeResolutions
 
     @tparam Rep Type representing number of ticks in std::chrono::duration
     @tparam Period An std::ratio representing tick period in
@@ -67,30 +67,30 @@ getNextLedgerTimeResolution(
     using namespace std::chrono;
     // Find the current resolution:
     auto iter = std::find(
-        std::begin(kLEDGER_POSSIBLE_TIME_RESOLUTIONS),
-        std::end(kLEDGER_POSSIBLE_TIME_RESOLUTIONS),
+        std::begin(kLedgerPossibleTimeResolutions),
+        std::end(kLedgerPossibleTimeResolutions),
         previousResolution);
     XRPL_ASSERT(
-        iter != std::end(kLEDGER_POSSIBLE_TIME_RESOLUTIONS),
+        iter != std::end(kLedgerPossibleTimeResolutions),
         "xrpl::getNextLedgerTimeResolution : found time resolution");
 
     // This should never happen, but just as a precaution
-    if (iter == std::end(kLEDGER_POSSIBLE_TIME_RESOLUTIONS))
+    if (iter == std::end(kLedgerPossibleTimeResolutions))
         return previousResolution;
 
     // If we did not previously agree, we try to decrease the resolution to
     // improve the chance that we will agree now.
-    if (!previousAgree && (ledgerSeq % Seq{kDECREASE_LEDGER_TIME_RESOLUTION_EVERY} == Seq{0}))
+    if (!previousAgree && (ledgerSeq % Seq{kDecreaseLedgerTimeResolutionEvery} == Seq{0}))
     {
-        if (++iter != std::end(kLEDGER_POSSIBLE_TIME_RESOLUTIONS))
+        if (++iter != std::end(kLedgerPossibleTimeResolutions))
             return *iter;
     }
 
     // If we previously agreed, we try to increase the resolution to determine
     // if we can continue to agree.
-    if (previousAgree && (ledgerSeq % Seq{kINCREASE_LEDGER_TIME_RESOLUTION_EVERY} == Seq{0}))
+    if (previousAgree && (ledgerSeq % Seq{kIncreaseLedgerTimeResolutionEvery} == Seq{0}))
     {
-        if (iter-- != std::begin(kLEDGER_POSSIBLE_TIME_RESOLUTIONS))
+        if (iter-- != std::begin(kLedgerPossibleTimeResolutions))
             return *iter;
     }
 
diff --git a/include/xrpl/ledger/OpenView.h b/include/xrpl/ledger/OpenView.h
index 59ab733211..c7f80ee321 100644
--- a/include/xrpl/ledger/OpenView.h
+++ b/include/xrpl/ledger/OpenView.h
@@ -23,7 +23,7 @@ namespace xrpl {
 inline constexpr struct OpenLedgerT
 {
     explicit constexpr OpenLedgerT() = default;
-} kOPEN_LEDGER{};
+} kOpenLedger{};
 
 /** Batch view construction tag.
 
@@ -33,7 +33,7 @@ inline constexpr struct OpenLedgerT
 inline constexpr struct BatchViewT
 {
     explicit constexpr BatchViewT() = default;
-} kBATCH_VIEW{};
+} kBatchView{};
 
 //------------------------------------------------------------------------------
 
@@ -47,7 +47,7 @@ private:
     // Initial size for the monotonic_buffer_resource used for allocations
     // The size was chosen from the old `qalloc` code (which this replaces).
     // It is unclear how the size initially chosen in qalloc.
-    static constexpr size_t kINITIAL_BUFFER_SIZE = kilobytes(256);
+    static constexpr size_t kInitialBufferSize = kilobytes(256);
 
     class TxsIterImpl;
 
@@ -139,7 +139,7 @@ public:
         std::shared_ptr<void const> hold = nullptr);
 
     OpenView(OpenLedgerT, Rules const& rules, std::shared_ptr<ReadView const> const& base)
-        : OpenView(kOPEN_LEDGER, &*base, rules, base)
+        : OpenView(kOpenLedger, &*base, rules, base)
     {
     }
 
diff --git a/include/xrpl/ledger/detail/RawStateTable.h b/include/xrpl/ledger/detail/RawStateTable.h
index 169a7c505e..53532ee5ec 100644
--- a/include/xrpl/ledger/detail/RawStateTable.h
+++ b/include/xrpl/ledger/detail/RawStateTable.h
@@ -19,16 +19,16 @@ public:
     // Initial size for the monotonic_buffer_resource used for allocations
     // The size was chosen from the old `qalloc` code (which this replaces).
     // It is unclear how the size initially chosen in qalloc.
-    static constexpr size_t kINITIAL_BUFFER_SIZE = kilobytes(256);
+    static constexpr size_t kInitialBufferSize = kilobytes(256);
 
     RawStateTable()
         : monotonic_resource_{std::make_unique<boost::container::pmr::monotonic_buffer_resource>(
-              kINITIAL_BUFFER_SIZE)}
+              kInitialBufferSize)}
         , items_{monotonic_resource_.get()} {};
 
     RawStateTable(RawStateTable const& rhs)
         : monotonic_resource_{std::make_unique<boost::container::pmr::monotonic_buffer_resource>(
-              kINITIAL_BUFFER_SIZE)}
+              kInitialBufferSize)}
         , items_{rhs.items_, monotonic_resource_.get()}
         , dropsDestroyed_{rhs.dropsDestroyed_} {};
 
diff --git a/include/xrpl/ledger/helpers/AMMHelpers.h b/include/xrpl/ledger/helpers/AMMHelpers.h
index c62437bf75..a146ef753b 100644
--- a/include/xrpl/ledger/helpers/AMMHelpers.h
+++ b/include/xrpl/ledger/helpers/AMMHelpers.h
@@ -25,11 +25,11 @@ namespace detail {
 Number
 reduceOffer(auto const& amount)
 {
-    static Number const kREDUCED_OFFER_PCT(9999, -4);
+    static Number const kReducedOfferPct(9999, -4);
 
     // Make sure the result is always less than amount or zero.
     NumberRoundModeGuard const mg(Number::RoundingMode::TowardsZero);
-    return amount * kREDUCED_OFFER_PCT;
+    return amount * kReducedOfferPct;
 }
 
 }  // namespace detail
@@ -177,7 +177,7 @@ getAMMOfferStartWithTakerGets(
     Quality const& targetQuality,
     std::uint16_t const& tfee)
 {
-    if (targetQuality.rate() == beast::kZERO)
+    if (targetQuality.rate() == beast::kZero)
         return std::nullopt;
 
     NumberRoundModeGuard const mg(Number::RoundingMode::ToNearest);
@@ -244,7 +244,7 @@ getAMMOfferStartWithTakerPays(
     Quality const& targetQuality,
     std::uint16_t tfee)
 {
-    if (targetQuality.rate() == beast::kZERO)
+    if (targetQuality.rate() == beast::kZero)
         return std::nullopt;
 
     NumberRoundModeGuard const mg(Number::RoundingMode::ToNearest);
diff --git a/include/xrpl/ledger/helpers/EscrowHelpers.h b/include/xrpl/ledger/helpers/EscrowHelpers.h
index 305834a6bc..859981cf05 100644
--- a/include/xrpl/ledger/helpers/EscrowHelpers.h
+++ b/include/xrpl/ledger/helpers/EscrowHelpers.h
@@ -111,7 +111,7 @@ escrowUnlockApplyHelper<Issue>(
     // whereas in a normal payment, the transfer fee is taken on top of the
     // sending amount.
     auto finalAmt = amount;
-    if ((!senderIssuer && !receiverIssuer) && lockedRate != kPARITY_RATE)
+    if ((!senderIssuer && !receiverIssuer) && lockedRate != kParityRate)
     {
         // compute transfer fee, if any
         auto const xferFee =
@@ -211,7 +211,7 @@ escrowUnlockApplyHelper<MPTIssue>(
     // whereas in a normal payment, the transfer fee is taken on top of the
     // sending amount.
     auto finalAmt = amount;
-    if ((!senderIssuer && !receiverIssuer) && lockedRate != kPARITY_RATE)
+    if ((!senderIssuer && !receiverIssuer) && lockedRate != kParityRate)
     {
         // compute transfer fee, if any
         auto const xferFee = amount.value() - divideRound(amount, lockedRate, amount.asset(), true);
diff --git a/include/xrpl/ledger/helpers/LendingHelpers.h b/include/xrpl/ledger/helpers/LendingHelpers.h
index b9711c4053..a6ab42254b 100644
--- a/include/xrpl/ledger/helpers/LendingHelpers.h
+++ b/include/xrpl/ledger/helpers/LendingHelpers.h
@@ -10,7 +10,7 @@ namespace xrpl {
 bool
 checkLendingProtocolDependencies(Rules const& rules, STTx const& tx);
 
-static constexpr std::uint32_t kSECONDS_IN_YEAR = 365 * 24 * 60 * 60;
+static constexpr std::uint32_t kSecondsInYear = 365 * 24 * 60 * 60;
 
 Number
 loanPeriodicRate(TenthBips32 interestRate, std::uint32_t paymentInterval);
@@ -42,14 +42,14 @@ struct LoanPaymentParts
     // The amount of principal paid that reduces the loan balance.
     // This amount is subtracted from sfPrincipalOutstanding in the Loan object
     // and paid to the Vault
-    Number principalPaid = kNUM_ZERO;
+    Number principalPaid = kNumZero;
 
     // The total amount of interest paid to the Vault.
     // This includes:
     // - Tracked interest from the amortization schedule
     // - Untracked interest (e.g., late payment penalty interest)
     // This value is always non-negative.
-    Number interestPaid = kNUM_ZERO;
+    Number interestPaid = kNumZero;
 
     // The change in the loan's total value outstanding.
     // - If valueChange < 0: Loan value decreased
@@ -62,7 +62,7 @@ struct LoanPaymentParts
     // - Late payments add penalty interest to the loan value
     // - Early full payment may increase or decrease the loan value based on
     // terms
-    Number valueChange = kNUM_ZERO;
+    Number valueChange = kNumZero;
 
     /* The total amount of fees paid to the Broker.
      * This includes:
@@ -70,7 +70,7 @@ struct LoanPaymentParts
      * - Untracked fees (e.g., late payment fees, service fees, origination
      * fees) This value is always non-negative.
      */
-    Number feePaid = kNUM_ZERO;
+    Number feePaid = kNumZero;
 
     LoanPaymentParts&
     operator+=(LoanPaymentParts const& other);
@@ -161,7 +161,7 @@ adjustImpreciseNumber(
 {
     value = roundToAsset(asset, value + adjustment, vaultScale);
 
-    if (*value < beast::kZERO)
+    if (*value < beast::kZero)
         value = 0;
 }
 
@@ -169,7 +169,7 @@ inline int
 getAssetsTotalScale(SLE::const_ref vaultSle)
 {
     if (!vaultSle)
-        return Number::kMIN_EXPONENT - 1;  // LCOV_EXCL_LINE
+        return Number::kMinExponent - 1;  // LCOV_EXCL_LINE
     return scale(vaultSle->at(sfAssetsTotal), vaultSle->at(sfAsset));
 }
 
@@ -311,7 +311,7 @@ struct ExtendedPaymentComponents : public PaymentComponents
     // borrower is sufficient to cover all components of the payment.
     Number totalDue;
 
-    ExtendedPaymentComponents(PaymentComponents const& p, Number fee, Number interest = kNUM_ZERO)
+    ExtendedPaymentComponents(PaymentComponents const& p, Number fee, Number interest = kNumZero)
         : PaymentComponents(p)
         , untrackedManagementFee(fee)
         , untrackedInterest(interest)
diff --git a/include/xrpl/net/HTTPClient.h b/include/xrpl/net/HTTPClient.h
index ea0c5d72cd..f059b19047 100644
--- a/include/xrpl/net/HTTPClient.h
+++ b/include/xrpl/net/HTTPClient.h
@@ -20,7 +20,7 @@ class HTTPClient
 public:
     explicit HTTPClient() = default;
 
-    static constexpr auto kMAX_CLIENT_HEADER_BYTES = kilobytes(32);
+    static constexpr auto kMaxClientHeaderBytes = kilobytes(32);
 
     static void
     initializeSSLContext(
diff --git a/include/xrpl/nodestore/NodeObject.h b/include/xrpl/nodestore/NodeObject.h
index 2a216606c4..04ba391b2b 100644
--- a/include/xrpl/nodestore/NodeObject.h
+++ b/include/xrpl/nodestore/NodeObject.h
@@ -29,7 +29,7 @@ enum class NodeObjectType : std::uint32_t {
 class NodeObject : public CountedObject<NodeObject>
 {
 public:
-    static constexpr std::size_t kKEY_BYTES = 32;
+    static constexpr std::size_t kKeyBytes = 32;
 
 private:
     // This hack is used to make the constructor effectively private
diff --git a/include/xrpl/nodestore/Types.h b/include/xrpl/nodestore/Types.h
index cf1a9db42e..21c01e9111 100644
--- a/include/xrpl/nodestore/Types.h
+++ b/include/xrpl/nodestore/Types.h
@@ -9,13 +9,13 @@ namespace xrpl::NodeStore {
 // This is only used to pre-allocate the array for
 // batch objects and does not affect the amount written.
 //
-static constexpr auto kBATCH_WRITE_PREALLOCATION_SIZE = 256;
+static constexpr auto kBatchWritePreallocationSize = 256;
 
 // This sets a limit on the maximum number of writes
 // in a batch. Actual usage can be twice this since
 // we have a new batch growing as we write the old.
 //
-static constexpr auto kBATCH_WRITE_LIMIT_SIZE = 65536;
+static constexpr auto kBatchWriteLimitSize = 65536;
 
 /** Return codes from Backend operations. */
 enum class Status {
diff --git a/include/xrpl/nodestore/detail/codec.h b/include/xrpl/nodestore/detail/codec.h
index 4dedc54902..49238fa34a 100644
--- a/include/xrpl/nodestore/detail/codec.h
+++ b/include/xrpl/nodestore/detail/codec.h
@@ -55,7 +55,7 @@ lz4Compress(void const* in, std::size_t inSize, BufferFactory&& bf)
     using std::runtime_error;
     using namespace nudb::detail;
     std::pair<void const*, std::size_t> result;
-    std::array<std::uint8_t, varint_traits<std::size_t>::kMAX> vi{};
+    std::array<std::uint8_t, varint_traits<std::size_t>::kMax> vi{};
     auto const n = writeVarint(vi.data(), inSize);
     auto const outMax = LZ4_compressBound(inSize);
     std::uint8_t* out = reinterpret_cast<std::uint8_t*>(bf(n + outMax));
@@ -254,12 +254,12 @@ nodeobjectCompress(void const* in, std::size_t inSize, BufferFactory&& bf)
         }
     }
 
-    std::array<std::uint8_t, varint_traits<std::size_t>::kMAX> vi{};
+    std::array<std::uint8_t, varint_traits<std::size_t>::kMax> vi{};
 
-    constexpr std::size_t kCODEC_TYPE = 1;
-    auto const vn = writeVarint(vi.data(), kCODEC_TYPE);
+    static constexpr std::size_t kCodecType = 1;
+    auto const vn = writeVarint(vi.data(), kCodecType);
     std::pair<void const*, std::size_t> result;
-    switch (kCODEC_TYPE)
+    switch (kCodecType)
     {
         // case 0 was uncompressed data; we always compress now.
         case 1:  // lz4
@@ -275,7 +275,7 @@ nodeobjectCompress(void const* in, std::size_t inSize, BufferFactory&& bf)
             break;
         }
         default:
-            Throw<std::logic_error>("nodeobject codec: unknown=" + std::to_string(kCODEC_TYPE));
+            Throw<std::logic_error>("nodeobject codec: unknown=" + std::to_string(kCodecType));
     };
     return result;
 }
diff --git a/include/xrpl/nodestore/detail/varint.h b/include/xrpl/nodestore/detail/varint.h
index c98b36e322..e6b78fcf08 100644
--- a/include/xrpl/nodestore/detail/varint.h
+++ b/include/xrpl/nodestore/detail/varint.h
@@ -25,7 +25,7 @@ struct varint_traits<T, true>
 {
     explicit varint_traits() = default;
 
-    static std::size_t constexpr kMAX = (8 * sizeof(T) + 6) / 7;
+    static constexpr std::size_t kMax = (8 * sizeof(T) + 6) / 7;
 };
 
 // Returns: Number of bytes consumed or 0 on error,
diff --git a/include/xrpl/protocol/AMMCore.h b/include/xrpl/protocol/AMMCore.h
index 9d8f8c62b0..ced84c4c87 100644
--- a/include/xrpl/protocol/AMMCore.h
+++ b/include/xrpl/protocol/AMMCore.h
@@ -8,21 +8,21 @@
 
 namespace xrpl {
 
-std::uint16_t constexpr kTRADING_FEE_THRESHOLD = 1000;  // 1%
+constexpr std::uint16_t kTradingFeeThreshold = 1000;  // 1%
 
 // Auction slot
-std::uint32_t constexpr kTOTAL_TIME_SLOT_SECS = 24 * 3600;
-std::uint16_t constexpr kAUCTION_SLOT_TIME_INTERVALS = 20;
-std::uint16_t constexpr kAUCTION_SLOT_MAX_AUTH_ACCOUNTS = 4;
-std::uint32_t constexpr kAUCTION_SLOT_FEE_SCALE_FACTOR = 100000;
-std::uint32_t constexpr kAUCTION_SLOT_DISCOUNTED_FEE_FRACTION = 10;
-std::uint32_t constexpr kAUCTION_SLOT_MIN_FEE_FRACTION = 25;
-std::uint32_t constexpr kAUCTION_SLOT_INTERVAL_DURATION =
-    kTOTAL_TIME_SLOT_SECS / kAUCTION_SLOT_TIME_INTERVALS;
+constexpr std::uint32_t kTotalTimeSlotSecs = 24 * 3600;
+constexpr std::uint16_t kAuctionSlotTimeIntervals = 20;
+constexpr std::uint16_t kAuctionSlotMaxAuthAccounts = 4;
+constexpr std::uint32_t kAuctionSlotFeeScaleFactor = 100000;
+constexpr std::uint32_t kAuctionSlotDiscountedFeeFraction = 10;
+constexpr std::uint32_t kAuctionSlotMinFeeFraction = 25;
+constexpr std::uint32_t kAuctionSlotIntervalDuration =
+    kTotalTimeSlotSecs / kAuctionSlotTimeIntervals;
 
 // Votes
-std::uint16_t constexpr kVOTE_MAX_SLOTS = 8;
-std::uint32_t constexpr kVOTE_WEIGHT_SCALE_FACTOR = 100000;
+constexpr std::uint16_t kVoteMaxSlots = 8;
+constexpr std::uint32_t kVoteWeightScaleFactor = 100000;
 
 class STObject;
 class STAmount;
@@ -77,7 +77,7 @@ ammEnabled(Rules const&);
 inline Number
 getFee(std::uint16_t tfee)
 {
-    return Number{tfee} / kAUCTION_SLOT_FEE_SCALE_FACTOR;
+    return Number{tfee} / kAuctionSlotFeeScaleFactor;
 }
 
 /** Get fee multiplier (1 - tfee)
diff --git a/include/xrpl/protocol/AccountID.h b/include/xrpl/protocol/AccountID.h
index 0b15f651bc..4938812ffa 100644
--- a/include/xrpl/protocol/AccountID.h
+++ b/include/xrpl/protocol/AccountID.h
@@ -69,7 +69,7 @@ toIssuer(AccountID&, std::string const&);
 inline bool
 isXRP(AccountID const& c)
 {
-    return c == beast::kZERO;
+    return c == beast::kZero;
 }
 
 // DEPRECATED
diff --git a/include/xrpl/protocol/AmountConversions.h b/include/xrpl/protocol/AmountConversions.h
index 53b7dace3c..a5f7ec310f 100644
--- a/include/xrpl/protocol/AmountConversions.h
+++ b/include/xrpl/protocol/AmountConversions.h
@@ -96,9 +96,9 @@ inline MPTAmount
 toAmount<MPTAmount>(STAmount const& amt)
 {
     XRPL_ASSERT(
-        amt.holds<MPTIssue>() && amt.mantissa() <= kMAX_MP_TOKEN_AMOUNT && amt.exponent() == 0,
+        amt.holds<MPTIssue>() && amt.mantissa() <= kMaxMpTokenAmount && amt.exponent() == 0,
         "xrpl::toAmount<MPTAmount> : maximum mantissa");
-    if (amt.mantissa() > kMAX_MP_TOKEN_AMOUNT || amt.exponent() != 0)
+    if (amt.mantissa() > kMaxMpTokenAmount || amt.exponent() != 0)
         Throw<std::runtime_error>("toAmount<MPTAmount>: invalid mantissa or exponent");
     bool const isNeg = amt.negative();
     std::int64_t const sMant = isNeg ? -std::int64_t(amt.mantissa()) : amt.mantissa();
@@ -167,8 +167,8 @@ toAmount(Asset const& asset, Number const& n, Number::RoundingMode mode = Number
     }
     else
     {
-        constexpr bool kALWAYS_FALSE = !std::is_same_v<T, T>;
-        static_assert(kALWAYS_FALSE, "Unsupported type for toAmount");
+        static constexpr bool kAlwaysFalse = !std::is_same_v<T, T>;
+        static_assert(kAlwaysFalse, "Unsupported type for toAmount");
     }
 }
 
@@ -178,30 +178,30 @@ toMaxAmount(Asset const& asset)
 {
     if constexpr (std::is_same_v<IOUAmount, T>)
     {
-        return IOUAmount(STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
+        return IOUAmount(STAmount::kMaxValue, STAmount::kMaxOffset);
     }
     else if constexpr (std::is_same_v<XRPAmount, T>)
     {
-        return XRPAmount(static_cast<std::int64_t>(STAmount::kMAX_NATIVE_N));
+        return XRPAmount(static_cast<std::int64_t>(STAmount::kMaxNativeN));
     }
     else if constexpr (std::is_same_v<MPTAmount, T>)
     {
-        return MPTAmount(kMAX_MP_TOKEN_AMOUNT);
+        return MPTAmount(kMaxMpTokenAmount);
     }
     else if constexpr (std::is_same_v<STAmount, T>)
     {
         return asset.visit(
             [](Issue const& issue) {
                 if (isXRP(issue))
-                    return STAmount(issue, static_cast<std::int64_t>(STAmount::kMAX_NATIVE_N));
-                return STAmount(issue, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
+                    return STAmount(issue, static_cast<std::int64_t>(STAmount::kMaxNativeN));
+                return STAmount(issue, STAmount::kMaxValue, STAmount::kMaxOffset);
             },
-            [](MPTIssue const& issue) { return STAmount(issue, kMAX_MP_TOKEN_AMOUNT); });
+            [](MPTIssue const& issue) { return STAmount(issue, kMaxMpTokenAmount); });
     }
     else
     {
-        constexpr bool kALWAYS_FALSE = !std::is_same_v<T, T>;
-        static_assert(kALWAYS_FALSE, "Unsupported type for toMaxAmount");
+        static constexpr bool kAlwaysFalse = !std::is_same_v<T, T>;
+        static_assert(kAlwaysFalse, "Unsupported type for toMaxAmount");
     }
 }
 
@@ -233,8 +233,8 @@ getAsset(T const& amt)
     }
     else
     {
-        constexpr bool kALWAYS_FALSE = !std::is_same_v<T, T>;
-        static_assert(kALWAYS_FALSE, "Unsupported type for getIssue");
+        static constexpr bool kAlwaysFalse = !std::is_same_v<T, T>;
+        static_assert(kAlwaysFalse, "Unsupported type for getIssue");
     }
 }
 
@@ -260,8 +260,8 @@ get(STAmount const& a)
     }
     else
     {
-        constexpr bool kALWAYS_FALSE = !std::is_same_v<T, T>;
-        static_assert(kALWAYS_FALSE, "Unsupported type for get");
+        constexpr bool kAlwaysFalse = !std::is_same_v<T, T>;
+        static_assert(kAlwaysFalse, "Unsupported type for get");
     }
 }
 
diff --git a/include/xrpl/protocol/ApiVersion.h b/include/xrpl/protocol/ApiVersion.h
index 4d68cdaa5a..345049b377 100644
--- a/include/xrpl/protocol/ApiVersion.h
+++ b/include/xrpl/protocol/ApiVersion.h
@@ -35,49 +35,49 @@ namespace xrpl {
 namespace RPC {
 
 template <unsigned int Version>
-constexpr static std::integral_constant<unsigned, Version> kAPI_VERSION = {};
+static constexpr std::integral_constant<unsigned, Version> kApiVersion = {};
 
-constexpr static auto kAPI_INVALID_VERSION = kAPI_VERSION<0>;
-constexpr static auto kAPI_MINIMUM_SUPPORTED_VERSION = kAPI_VERSION<1>;
-constexpr static auto kAPI_MAXIMUM_SUPPORTED_VERSION = kAPI_VERSION<2>;
-constexpr static auto kAPI_VERSION_IF_UNSPECIFIED = kAPI_VERSION<1>;
-constexpr static auto kAPI_COMMAND_LINE_VERSION = kAPI_VERSION<1>;  // TODO Bump to 2 later
-constexpr static auto kAPI_BETA_VERSION = kAPI_VERSION<3>;
-constexpr static auto kAPI_MAXIMUM_VALID_VERSION = kAPI_BETA_VERSION;
+static constexpr auto kApiInvalidVersion = kApiVersion<0>;
+static constexpr auto kApiMinimumSupportedVersion = kApiVersion<1>;
+static constexpr auto kApiMaximumSupportedVersion = kApiVersion<2>;
+static constexpr auto kApiVersionIfUnspecified = kApiVersion<1>;
+static constexpr auto kApiCommandLineVersion = kApiVersion<1>;  // TODO Bump to 2 later
+static constexpr auto kApiBetaVersion = kApiVersion<3>;
+static constexpr auto kApiMaximumValidVersion = kApiBetaVersion;
 
-static_assert(kAPI_INVALID_VERSION < kAPI_MINIMUM_SUPPORTED_VERSION);
+static_assert(kApiInvalidVersion < kApiMinimumSupportedVersion);
 static_assert(
-    kAPI_VERSION_IF_UNSPECIFIED >= kAPI_MINIMUM_SUPPORTED_VERSION &&
-    kAPI_VERSION_IF_UNSPECIFIED <= kAPI_MAXIMUM_SUPPORTED_VERSION);
+    kApiVersionIfUnspecified >= kApiMinimumSupportedVersion &&
+    kApiVersionIfUnspecified <= kApiMaximumSupportedVersion);
 static_assert(
-    kAPI_COMMAND_LINE_VERSION >= kAPI_MINIMUM_SUPPORTED_VERSION &&
-    kAPI_COMMAND_LINE_VERSION <= kAPI_MAXIMUM_SUPPORTED_VERSION);
-static_assert(kAPI_MAXIMUM_SUPPORTED_VERSION >= kAPI_MINIMUM_SUPPORTED_VERSION);
-static_assert(kAPI_BETA_VERSION >= kAPI_MAXIMUM_SUPPORTED_VERSION);
-static_assert(kAPI_MAXIMUM_VALID_VERSION >= kAPI_MAXIMUM_SUPPORTED_VERSION);
+    kApiCommandLineVersion >= kApiMinimumSupportedVersion &&
+    kApiCommandLineVersion <= kApiMaximumSupportedVersion);
+static_assert(kApiMaximumSupportedVersion >= kApiMinimumSupportedVersion);
+static_assert(kApiBetaVersion >= kApiMaximumSupportedVersion);
+static_assert(kApiMaximumValidVersion >= kApiMaximumSupportedVersion);
 
 inline void
 setVersion(json::Value& parent, unsigned int apiVersion, bool betaEnabled)
 {
-    XRPL_ASSERT(apiVersion != kAPI_INVALID_VERSION, "xrpl::RPC::setVersion : input is valid");
+    XRPL_ASSERT(apiVersion != kApiInvalidVersion, "xrpl::RPC::setVersion : input is valid");
 
     auto& retObj = parent[jss::version] = json::ValueType::Object;
 
-    if (apiVersion == kAPI_VERSION_IF_UNSPECIFIED)
+    if (apiVersion == kApiVersionIfUnspecified)
     {
         // API version numbers used in API version 1
-        static beast::SemanticVersion const kFIRST_VERSION{"1.0.0"};
-        static beast::SemanticVersion const kGOOD_VERSION{"1.0.0"};
-        static beast::SemanticVersion const kLAST_VERSION{"1.0.0"};
+        static beast::SemanticVersion const kFirstVersion{"1.0.0"};
+        static beast::SemanticVersion const kGoodVersion{"1.0.0"};
+        static beast::SemanticVersion const kLastVersion{"1.0.0"};
 
-        retObj[jss::first] = kFIRST_VERSION.print();
-        retObj[jss::good] = kGOOD_VERSION.print();
-        retObj[jss::last] = kLAST_VERSION.print();
+        retObj[jss::first] = kFirstVersion.print();
+        retObj[jss::good] = kGoodVersion.print();
+        retObj[jss::last] = kLastVersion.print();
     }
     else
     {
-        retObj[jss::first] = kAPI_MINIMUM_SUPPORTED_VERSION.value;
-        retObj[jss::last] = betaEnabled ? kAPI_BETA_VERSION : kAPI_MAXIMUM_SUPPORTED_VERSION;
+        retObj[jss::first] = kApiMinimumSupportedVersion.value;
+        retObj[jss::last] = betaEnabled ? kApiBetaVersion : kApiMaximumSupportedVersion;
     }
 }
 
@@ -98,9 +98,9 @@ setVersion(json::Value& parent, unsigned int apiVersion, bool betaEnabled)
 inline unsigned int
 getAPIVersionNumber(json::Value const& jv, bool betaEnabled)
 {
-    static json::Value const kMIN_VERSION(RPC::kAPI_MINIMUM_SUPPORTED_VERSION);
+    static json::Value const kMinVersion(RPC::kApiMinimumSupportedVersion);
     json::Value const maxVersion(
-        betaEnabled ? RPC::kAPI_BETA_VERSION : RPC::kAPI_MAXIMUM_SUPPORTED_VERSION);
+        betaEnabled ? RPC::kApiBetaVersion : RPC::kApiMaximumSupportedVersion);
 
     if (jv.isObject())
     {
@@ -109,18 +109,18 @@ getAPIVersionNumber(json::Value const& jv, bool betaEnabled)
             auto const specifiedVersion = jv[jss::api_version];
             if (!specifiedVersion.isInt() && !specifiedVersion.isUInt())
             {
-                return RPC::kAPI_INVALID_VERSION;
+                return RPC::kApiInvalidVersion;
             }
             auto const specifiedVersionInt = specifiedVersion.asInt();
-            if (specifiedVersionInt < kMIN_VERSION || specifiedVersionInt > maxVersion)
+            if (specifiedVersionInt < kMinVersion || specifiedVersionInt > maxVersion)
             {
-                return RPC::kAPI_INVALID_VERSION;
+                return RPC::kApiInvalidVersion;
             }
             return specifiedVersionInt;
         }
     }
 
-    return RPC::kAPI_VERSION_IF_UNSPECIFIED;
+    return RPC::kApiVersionIfUnspecified;
 }
 
 }  // namespace RPC
@@ -128,33 +128,33 @@ getAPIVersionNumber(json::Value const& jv, bool betaEnabled)
 template <unsigned MinVer, unsigned MaxVer, typename Fn, typename... Args>
 void
 forApiVersions(Fn const& fn, Args&&... args)
-    requires                                            //
-    (MaxVer >= MinVer) &&                               //
-    (MinVer >= RPC::kAPI_MINIMUM_SUPPORTED_VERSION) &&  //
-    (RPC::kAPI_MAXIMUM_VALID_VERSION >= MaxVer) && requires {
+    requires                                         //
+    (MaxVer >= MinVer) &&                            //
+    (MinVer >= RPC::kApiMinimumSupportedVersion) &&  //
+    (RPC::kApiMaximumValidVersion >= MaxVer) && requires {
         fn(std::integral_constant<unsigned int, MinVer>{}, std::forward<Args>(args)...);
         fn(std::integral_constant<unsigned int, MaxVer>{}, std::forward<Args>(args)...);
     }
 {
-    constexpr auto kSIZE = MaxVer + 1 - MinVer;
+    static constexpr auto kSize = MaxVer + 1 - MinVer;
     [&]<std::size_t... Offset>(std::index_sequence<Offset...>) {
         // NOLINTBEGIN(bugprone-use-after-move)
         (((void)fn(
              std::integral_constant<unsigned int, MinVer + Offset>{}, std::forward<Args>(args)...)),
          ...);
         // NOLINTEND(bugprone-use-after-move)
-    }(std::make_index_sequence<kSIZE>{});
+    }(std::make_index_sequence<kSize>{});
 }
 
 template <typename Fn, typename... Args>
 void
 forAllApiVersions(Fn const& fn, Args&&... args)
     requires requires {
-        forApiVersions<RPC::kAPI_MINIMUM_SUPPORTED_VERSION, RPC::kAPI_MAXIMUM_VALID_VERSION>(
+        forApiVersions<RPC::kApiMinimumSupportedVersion, RPC::kApiMaximumValidVersion>(
             fn, std::forward<Args>(args)...);
     }
 {
-    forApiVersions<RPC::kAPI_MINIMUM_SUPPORTED_VERSION, RPC::kAPI_MAXIMUM_VALID_VERSION>(
+    forApiVersions<RPC::kApiMinimumSupportedVersion, RPC::kApiMaximumValidVersion>(
         fn, std::forward<Args>(args)...);
 }
 
diff --git a/include/xrpl/protocol/Asset.h b/include/xrpl/protocol/Asset.h
index e0f4aa08a2..ec9d8db02f 100644
--- a/include/xrpl/protocol/Asset.h
+++ b/include/xrpl/protocol/Asset.h
@@ -148,10 +148,10 @@ public:
 };
 
 template <ValidIssueType TIss>
-constexpr bool kIS_ISSUE_V = std::is_same_v<TIss, Issue>;
+constexpr bool kIsIssueV = std::is_same_v<TIss, Issue>;
 
 template <ValidIssueType TIss>
-constexpr bool kIS_MPTISSUE_V = std::is_same_v<TIss, MPTIssue>;
+constexpr bool kIsMptissueV = std::is_same_v<TIss, MPTIssue>;
 
 inline json::Value
 toJson(Asset const& asset)
@@ -242,7 +242,7 @@ operator<=>(Asset const& lhs, Asset const& rhs)
             {
                 return std::weak_ordering(lhs <=> rhs);
             }
-            else if constexpr (kIS_ISSUE_V<TLhs> && kIS_MPTISSUE_V<TRhs>)
+            else if constexpr (kIsIssueV<TLhs> && kIsMptissueV<TRhs>)
             {
                 return std::weak_ordering::greater;
             }
diff --git a/include/xrpl/protocol/Feature.h b/include/xrpl/protocol/Feature.h
index 281e598bf7..5de8ca64a9 100644
--- a/include/xrpl/protocol/Feature.h
+++ b/include/xrpl/protocol/Feature.h
@@ -65,11 +65,11 @@
 namespace xrpl {
 
 // Feature names must not exceed this length (in characters, excluding the null terminator).
-static constexpr std::size_t kMAX_FEATURE_NAME_SIZE = 63;
+static constexpr std::size_t kMaxFeatureNameSize = 63;
 // Reserve this exact feature-name length (in characters/bytes, excluding the null terminator)
 // so that a 32-byte uint256 (for example, in WASM or other interop contexts) can be used
 // as a compact, fixed-size feature selector without conflicting with human-readable names.
-static constexpr std::size_t kRESERVED_FEATURE_NAME_SIZE = 32;
+static constexpr std::size_t kReservedFeatureNameSize = 32;
 
 // Both validFeatureNameSize and validFeatureName are consteval functions that can be used in
 // static_asserts to validate feature names at compile time. They are only used inside
@@ -81,14 +81,14 @@ validFeatureNameSize(auto fn) -> bool
 {
     constexpr char const* kN = fn();
     // Note, std::strlen is not constexpr, we need to implement our own here.
-    constexpr std::size_t kLEN = [](auto n) {
+    constexpr std::size_t kLen = [](auto n) {
         std::size_t ret = 0;
         for (auto ptr = n; *ptr != '\0'; ret++, ++ptr)
             ;
         return ret;
     }(kN);
-    return kLEN != kRESERVED_FEATURE_NAME_SIZE &&  //
-        kLEN <= kMAX_FEATURE_NAME_SIZE;
+    return kLen != kReservedFeatureNameSize &&  //
+        kLen <= kMaxFeatureNameSize;
 }
 
 consteval auto
@@ -136,7 +136,7 @@ namespace detail {
 // Feature.cpp. Because it's only used to reserve storage, and determine how
 // large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than
 // the actual number of amendments. A LogicError on startup will verify this.
-static constexpr std::size_t kNUM_FEATURES =
+static constexpr std::size_t kNumFeatures =
     (0 +
 #include <xrpl/protocol/detail/features.macro>
     );
@@ -184,9 +184,9 @@ bitsetIndexToFeature(size_t i);
 std::string
 featureToName(uint256 const& f);
 
-class FeatureBitset : private std::bitset<detail::kNUM_FEATURES>
+class FeatureBitset : private std::bitset<detail::kNumFeatures>
 {
-    using base = std::bitset<detail::kNUM_FEATURES>;
+    using base = std::bitset<detail::kNumFeatures>;
 
     template <class... Fs>
     void
diff --git a/include/xrpl/protocol/Fees.h b/include/xrpl/protocol/Fees.h
index c94ba31b8a..14bcc068bf 100644
--- a/include/xrpl/protocol/Fees.h
+++ b/include/xrpl/protocol/Fees.h
@@ -6,7 +6,7 @@ namespace xrpl {
 
 // Deprecated constant for backwards compatibility with pre-XRPFees amendment.
 // This was the reference fee units used in the old fee calculation.
-inline constexpr std::uint32_t kFEE_UNITS_DEPRECATED = 10;
+inline constexpr std::uint32_t kFeeUnitsDeprecated = 10;
 
 /** Reflects the fee settings for a particular ledger.
 
diff --git a/include/xrpl/protocol/IOUAmount.h b/include/xrpl/protocol/IOUAmount.h
index 6ce773fabd..9e0fbe38eb 100644
--- a/include/xrpl/protocol/IOUAmount.h
+++ b/include/xrpl/protocol/IOUAmount.h
@@ -92,7 +92,7 @@ public:
 
 inline IOUAmount::IOUAmount(beast::Zero)
 {
-    *this = beast::kZERO;
+    *this = beast::kZero;
 }
 
 inline IOUAmount::IOUAmount(mantissa_type mantissa, exponent_type exponent)
diff --git a/include/xrpl/protocol/Indexes.h b/include/xrpl/protocol/Indexes.h
index 14e7d95e23..887a208ec6 100644
--- a/include/xrpl/protocol/Indexes.h
+++ b/include/xrpl/protocol/Indexes.h
@@ -82,7 +82,7 @@ struct BookT
     Keylet
     operator()(Book const& b) const;
 };
-static BookT const kBOOK{};
+static BookT const kBook{};
 
 /** The index of a trust line for a given currency
 
@@ -126,7 +126,7 @@ struct NextT
     Keylet
     operator()(Keylet const& k) const;
 };
-static NextT const kNEXT{};
+static NextT const kNext{};
 
 /** A ticket belonging to an account */
 struct TicketT
@@ -145,7 +145,7 @@ struct TicketT
         return {ltTICKET, key};
     }
 };
-static TicketT const kTICKET{};
+static TicketT const kTicket{};
 
 /** A SignerList */
 Keylet
@@ -373,7 +373,7 @@ struct KeyletDesc
 
 // This list should include all of the keylet functions that take a single
 // AccountID parameter.
-std::array<KeyletDesc<AccountID const&>, 6> const kDIRECT_ACCOUNT_KEYLETS{
+std::array<KeyletDesc<AccountID const&>, 6> const kDirectAccountKeylets{
     {{.function = &keylet::account, .expectedLEName = jss::AccountRoot, .includeInTests = false},
      {.function = &keylet::ownerDir, .expectedLEName = jss::DirectoryNode, .includeInTests = true},
      {.function = &keylet::signers, .expectedLEName = jss::SignerList, .includeInTests = true},
diff --git a/include/xrpl/protocol/Issue.h b/include/xrpl/protocol/Issue.h
index 3b74b9132a..c8022698d3 100644
--- a/include/xrpl/protocol/Issue.h
+++ b/include/xrpl/protocol/Issue.h
@@ -96,16 +96,16 @@ operator<=>(Issue const& lhs, Issue const& rhs)
 inline Issue const&
 xrpIssue()
 {
-    static Issue const kISSUE{xrpCurrency(), xrpAccount()};
-    return kISSUE;
+    static Issue const kIssue{xrpCurrency(), xrpAccount()};
+    return kIssue;
 }
 
 /** Returns an asset specifier that represents no account and currency. */
 inline Issue const&
 noIssue()
 {
-    static Issue const kISSUE{noCurrency(), noAccount()};
-    return kISSUE;
+    static Issue const kIssue{noCurrency(), noAccount()};
+    return kIssue;
 }
 
 inline bool
diff --git a/include/xrpl/protocol/LedgerHeader.h b/include/xrpl/protocol/LedgerHeader.h
index 68dd5e24b9..f05b11d1eb 100644
--- a/include/xrpl/protocol/LedgerHeader.h
+++ b/include/xrpl/protocol/LedgerHeader.h
@@ -26,12 +26,12 @@ struct LedgerHeader
     //
 
     // Closed means "tx set already determined"
-    uint256 hash = beast::kZERO;
-    uint256 txHash = beast::kZERO;
-    uint256 accountHash = beast::kZERO;
-    uint256 parentHash = beast::kZERO;
+    uint256 hash = beast::kZero;
+    uint256 txHash = beast::kZero;
+    uint256 accountHash = beast::kZero;
+    uint256 parentHash = beast::kZero;
 
-    XRPAmount drops = beast::kZERO;
+    XRPAmount drops = beast::kZero;
 
     // If validated is false, it means "not yet validated."
     // Once validated is true, it will never be set false at a later time.
@@ -53,12 +53,12 @@ struct LedgerHeader
 };
 
 // ledger close flags
-static std::uint32_t const kS_LCF_NO_CONSENSUS_TIME = 0x01;
+static std::uint32_t const kSLcfNoConsensusTime = 0x01;
 
 inline bool
 getCloseAgree(LedgerHeader const& info)
 {
-    return (info.closeFlags & kS_LCF_NO_CONSENSUS_TIME) == 0;
+    return (info.closeFlags & kSLcfNoConsensusTime) == 0;
 }
 
 void
diff --git a/include/xrpl/protocol/MPTAmount.h b/include/xrpl/protocol/MPTAmount.h
index b4907774d2..6ea36fc294 100644
--- a/include/xrpl/protocol/MPTAmount.h
+++ b/include/xrpl/protocol/MPTAmount.h
@@ -88,7 +88,7 @@ constexpr MPTAmount::MPTAmount(value_type value) : value_(value)
 
 constexpr MPTAmount::MPTAmount(beast::Zero)
 {
-    *this = beast::kZERO;
+    *this = beast::kZero;
 }
 
 constexpr MPTAmount&
diff --git a/include/xrpl/protocol/MultiApiJson.h b/include/xrpl/protocol/MultiApiJson.h
index 5a7dfcd731..9a4882ec55 100644
--- a/include/xrpl/protocol/MultiApiJson.h
+++ b/include/xrpl/protocol/MultiApiJson.h
@@ -15,14 +15,14 @@ namespace xrpl {
 
 namespace detail {
 template <typename T>
-constexpr bool kIS_INTEGRAL_CONSTANT = false;
+constexpr bool kIsIntegralConstant = false;
 template <typename I, auto A>
-constexpr bool kIS_INTEGRAL_CONSTANT<std::integral_constant<I, A>&> = true;
+constexpr bool kIsIntegralConstant<std::integral_constant<I, A>&> = true;
 template <typename I, auto A>
-constexpr bool kIS_INTEGRAL_CONSTANT<std::integral_constant<I, A> const&> = true;
+constexpr bool kIsIntegralConstant<std::integral_constant<I, A> const&> = true;
 
 template <typename T>
-concept some_integral_constant = detail::kIS_INTEGRAL_CONSTANT<T&>;
+concept some_integral_constant = detail::kIsIntegralConstant<T&>;
 
 // This class is designed to wrap a collection of _almost_ identical json::Value
 // objects, indexed by version (i.e. there is some mapping of version to object
@@ -47,8 +47,8 @@ struct MultiApiJson
         return (v < MinVer) ? 0 : static_cast<std::size_t>(v - MinVer);
     }
 
-    constexpr static std::size_t kSIZE = MaxVer + 1 - MinVer;
-    std::array<json::Value, kSIZE> val = {};
+    static constexpr std::size_t kSize = MaxVer + 1 - MinVer;
+    std::array<json::Value, kSize> val = {};
 
     explicit MultiApiJson(json::Value const& init = {})
     {
@@ -80,7 +80,7 @@ struct MultiApiJson
 
         if (count == 0)
             return IsMemberResult::None;
-        return count < kSIZE ? IsMemberResult::Some : IsMemberResult::All;
+        return count < kSize ? IsMemberResult::Some : IsMemberResult::All;
     }
 
     static constexpr struct VisitorT final
@@ -100,7 +100,7 @@ struct MultiApiJson
                 std::integral_constant<unsigned int, Version>,
                 Args&&...>
         {
-            static_assert(valid(Version) && index(Version) >= 0 && index(Version) < kSIZE);
+            static_assert(valid(Version) && index(Version) >= 0 && index(Version) < kSize);
             return std::invoke(fn, json.val[index(Version)], version, std::forward<Args>(args)...);
         }
 
@@ -111,7 +111,7 @@ struct MultiApiJson
         operator()(Json& json, std::integral_constant<unsigned int, Version> const, Fn fn) const
             -> std::invoke_result_t<Fn, decltype(json.val[0])>
         {
-            static_assert(valid(Version) && index(Version) >= 0 && index(Version) < kSIZE);
+            static_assert(valid(Version) && index(Version) >= 0 && index(Version) < kSize);
             return std::invoke(fn, json.val[index(Version)]);
         }
 
@@ -124,7 +124,7 @@ struct MultiApiJson
             -> std::invoke_result_t<Fn, decltype(json.val[0]), Version, Args&&...>
         {
             XRPL_ASSERT(
-                valid(version) && index(version) >= 0 && index(version) < kSIZE,
+                valid(version) && index(version) >= 0 && index(version) < kSize,
                 "xrpl::detail::MultiApijson::operator<Args...>() : valid "
                 "version");
             return std::invoke(fn, json.val[index(version)], version, std::forward<Args>(args)...);
@@ -139,20 +139,20 @@ struct MultiApiJson
             -> std::invoke_result_t<Fn, decltype(json.val[0])>
         {
             XRPL_ASSERT(
-                valid(version) && index(version) >= 0 && index(version) < kSIZE,
+                valid(version) && index(version) >= 0 && index(version) < kSize,
                 "xrpl::detail::MultiApijson::operator() : valid version");
             return std::invoke(fn, json.val[index(version)]);
         }
-    } kVISITOR = {};
+    } kVisitor = {};
 
     auto
     visit()
     {
         return [self = this](auto... args)
             requires requires {
-                kVISITOR(std::declval<MultiApiJson&>(), std::declval<decltype(args)>()...);
+                kVisitor(std::declval<MultiApiJson&>(), std::declval<decltype(args)>()...);
             }
-        { return kVISITOR(*self, std::forward<decltype(args)>(args)...); };
+        { return kVisitor(*self, std::forward<decltype(args)>(args)...); };
     }
 
     [[nodiscard]] auto
@@ -160,27 +160,27 @@ struct MultiApiJson
     {
         return [self = this](auto... args)
             requires requires {
-                kVISITOR(std::declval<MultiApiJson const&>(), std::declval<decltype(args)>()...);
+                kVisitor(std::declval<MultiApiJson const&>(), std::declval<decltype(args)>()...);
             }
-        { return kVISITOR(*self, std::forward<decltype(args)>(args)...); };
+        { return kVisitor(*self, std::forward<decltype(args)>(args)...); };
     }
 
     template <typename... Args>
     auto
     visit(Args... args) -> std::invoke_result_t<VisitorT, MultiApiJson&, Args...>
         requires(sizeof...(args) > 0) &&
-        requires { kVISITOR(*this, std::forward<decltype(args)>(args)...); }
+        requires { kVisitor(*this, std::forward<decltype(args)>(args)...); }
     {
-        return kVISITOR(*this, std::forward<decltype(args)>(args)...);
+        return kVisitor(*this, std::forward<decltype(args)>(args)...);
     }
 
     template <typename... Args>
     [[nodiscard]] auto
     visit(Args... args) const -> std::invoke_result_t<VisitorT, MultiApiJson const&, Args...>
         requires(sizeof...(args) > 0) &&
-        requires { kVISITOR(*this, std::forward<decltype(args)>(args)...); }
+        requires { kVisitor(*this, std::forward<decltype(args)>(args)...); }
     {
-        return kVISITOR(*this, std::forward<decltype(args)>(args)...);
+        return kVisitor(*this, std::forward<decltype(args)>(args)...);
     }
 };
 
@@ -188,6 +188,6 @@ struct MultiApiJson
 
 // Wrapper for Json for all supported API versions.
 using MultiApiJson =
-    detail::MultiApiJson<RPC::kAPI_MINIMUM_SUPPORTED_VERSION, RPC::kAPI_MAXIMUM_VALID_VERSION>;
+    detail::MultiApiJson<RPC::kApiMinimumSupportedVersion, RPC::kApiMaximumValidVersion>;
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/PathAsset.h b/include/xrpl/protocol/PathAsset.h
index 4c4a3f7af4..b51dc52b47 100644
--- a/include/xrpl/protocol/PathAsset.h
+++ b/include/xrpl/protocol/PathAsset.h
@@ -52,10 +52,10 @@ public:
 };
 
 template <ValidPathAsset PA>
-constexpr bool kIS_CURRENCY_V = std::is_same_v<PA, Currency>;
+constexpr bool kIsCurrencyV = std::is_same_v<PA, Currency>;
 
 template <ValidPathAsset PA>
-constexpr bool kIS_MPTID_V = std::is_same_v<PA, MPTID>;
+constexpr bool kIsMptidV = std::is_same_v<PA, MPTID>;
 
 inline PathAsset::PathAsset(Asset const& asset)
 {
diff --git a/include/xrpl/protocol/Protocol.h b/include/xrpl/protocol/Protocol.h
index 50b2425016..6a96b2ccbe 100644
--- a/include/xrpl/protocol/Protocol.h
+++ b/include/xrpl/protocol/Protocol.h
@@ -19,40 +19,40 @@ namespace xrpl {
     @ingroup protocol
 */
 /** Smallest legal byte size of a transaction. */
-std::size_t constexpr kTX_MIN_SIZE_BYTES = 32;
+constexpr std::size_t kTxMinSizeBytes = 32;
 
 /** Largest legal byte size of a transaction. */
-std::size_t constexpr kTX_MAX_SIZE_BYTES = megabytes(1);
+constexpr std::size_t kTxMaxSizeBytes = megabytes(1);
 
 /** The maximum number of unfunded offers to delete at once */
-std::size_t constexpr kUNFUNDED_OFFER_REMOVE_LIMIT = 1000;
+constexpr std::size_t kUnfundedOfferRemoveLimit = 1000;
 
 /** The maximum number of expired offers to delete at once */
-std::size_t constexpr kEXPIRED_OFFER_REMOVE_LIMIT = 256;
+constexpr std::size_t kExpiredOfferRemoveLimit = 256;
 
 /** The maximum number of metadata entries allowed in one transaction */
-std::size_t constexpr kOVERSIZE_META_DATA_CAP = 5200;
+constexpr std::size_t kOversizeMetaDataCap = 5200;
 
 /** The maximum number of entries per directory page */
-std::size_t constexpr kDIR_NODE_MAX_ENTRIES = 32;
+constexpr std::size_t kDirNodeMaxEntries = 32;
 
 /** The maximum number of pages allowed in a directory
 
     Made obsolete by fixDirectoryLimit amendment.
 */
-std::uint64_t constexpr kDIR_NODE_MAX_PAGES = 262144;
+constexpr std::uint64_t kDirNodeMaxPages = 262144;
 
 /** The maximum number of items in an NFT page */
-std::size_t constexpr kDIR_MAX_TOKENS_PER_PAGE = 32;
+constexpr std::size_t kDirMaxTokensPerPage = 32;
 
 /** The maximum number of owner directory entries for account to be deletable */
-std::size_t constexpr kMAX_DELETABLE_DIR_ENTRIES = 1000;
+constexpr std::size_t kMaxDeletableDirEntries = 1000;
 
 /** The maximum number of token offers that can be canceled at once */
-std::size_t constexpr kMAX_TOKEN_OFFER_CANCEL_COUNT = 500;
+constexpr std::size_t kMaxTokenOfferCancelCount = 500;
 
 /** The maximum number of offers in an offer directory for NFT to be burnable */
-std::size_t constexpr kMAX_DELETABLE_TOKEN_OFFER_ENTRIES = 500;
+constexpr std::size_t kMaxDeletableTokenOfferEntries = 500;
 
 /** The maximum token transfer fee allowed.
 
@@ -63,7 +63,7 @@ std::size_t constexpr kMAX_DELETABLE_TOKEN_OFFER_ENTRIES = 500;
     Note that for extremely low transfer fees values, it is possible that the
     calculated fee will be 0.
  */
-std::uint16_t constexpr kMAX_TRANSFER_FEE = 50000;
+constexpr std::uint16_t kMaxTransferFee = 50000;
 
 /** There are 10,000 basis points (bips) in 100%.
  *
@@ -81,32 +81,32 @@ std::uint16_t constexpr kMAX_TRANSFER_FEE = 50000;
  *
  * Example: 50% is 0.50 * bipsPerUnity = 5,000 bps.
  */
-Bips32 constexpr kBIPS_PER_UNITY(100 * 100);
-static_assert(kBIPS_PER_UNITY == Bips32{10'000});
-TenthBips32 constexpr kTENTH_BIPS_PER_UNITY(kBIPS_PER_UNITY.value() * 10);
-static_assert(kTENTH_BIPS_PER_UNITY == TenthBips32(100'000));
+constexpr Bips32 kBipsPerUnity(100 * 100);
+static_assert(kBipsPerUnity == Bips32{10'000});
+constexpr TenthBips32 kTenthBipsPerUnity(kBipsPerUnity.value() * 10);
+static_assert(kTenthBipsPerUnity == TenthBips32(100'000));
 
 constexpr Bips32
 percentageToBips(std::uint32_t percentage)
 {
-    return Bips32(percentage * kBIPS_PER_UNITY.value() / 100);
+    return Bips32(percentage * kBipsPerUnity.value() / 100);
 }
 constexpr TenthBips32
 percentageToTenthBips(std::uint32_t percentage)
 {
-    return TenthBips32(percentage * kTENTH_BIPS_PER_UNITY.value() / 100);
+    return TenthBips32(percentage * kTenthBipsPerUnity.value() / 100);
 }
 template <typename T, class TBips>
 constexpr T
 bipsOfValue(T value, Bips<TBips> bips)
 {
-    return value * bips.value() / kBIPS_PER_UNITY.value();
+    return value * bips.value() / kBipsPerUnity.value();
 }
 template <typename T, class TBips>
 constexpr T
 tenthBipsOfValue(T value, TenthBips<TBips> bips)
 {
-    return value * bips.value() / kTENTH_BIPS_PER_UNITY.value();
+    return value * bips.value() / kTenthBipsPerUnity.value();
 }
 
 namespace Lending {
@@ -114,54 +114,54 @@ namespace Lending {
 
     Valid values are between 0 and 10% inclusive.
 */
-TenthBips16 constexpr kMAX_MANAGEMENT_FEE_RATE(
+constexpr TenthBips16 kMaxManagementFeeRate(
     unsafeCast<std::uint16_t>(percentageToTenthBips(10).value()));
-static_assert(kMAX_MANAGEMENT_FEE_RATE == TenthBips16(std::uint16_t(10'000u)));
+static_assert(kMaxManagementFeeRate == TenthBips16(std::uint16_t(10'000u)));
 
 /** The maximum coverage rate required of a loan broker in 1/10 bips.
 
     Valid values are between 0 and 100% inclusive.
 */
-TenthBips32 constexpr kMAX_COVER_RATE = percentageToTenthBips(100);
-static_assert(kMAX_COVER_RATE == TenthBips32(100'000u));
+constexpr TenthBips32 kMaxCoverRate = percentageToTenthBips(100);
+static_assert(kMaxCoverRate == TenthBips32(100'000u));
 
 /** The maximum overpayment fee on a loan in 1/10 bips.
 *
     Valid values are between 0 and 100% inclusive.
 */
-TenthBips32 constexpr kMAX_OVERPAYMENT_FEE = percentageToTenthBips(100);
-static_assert(kMAX_OVERPAYMENT_FEE == TenthBips32(100'000u));
+constexpr TenthBips32 kMaxOverpaymentFee = percentageToTenthBips(100);
+static_assert(kMaxOverpaymentFee == TenthBips32(100'000u));
 
 /** Annualized interest rate of the Loan in 1/10 bips.
  *
  * Valid values are between 0 and 100% inclusive.
  */
-TenthBips32 constexpr kMAX_INTEREST_RATE = percentageToTenthBips(100);
-static_assert(kMAX_INTEREST_RATE == TenthBips32(100'000u));
+constexpr TenthBips32 kMaxInterestRate = percentageToTenthBips(100);
+static_assert(kMaxInterestRate == TenthBips32(100'000u));
 
 /** The maximum premium added to the interest rate for late payments on a loan
  * in 1/10 bips.
  *
  * Valid values are between 0 and 100% inclusive.
  */
-TenthBips32 constexpr kMAX_LATE_INTEREST_RATE = percentageToTenthBips(100);
-static_assert(kMAX_LATE_INTEREST_RATE == TenthBips32(100'000u));
+constexpr TenthBips32 kMaxLateInterestRate = percentageToTenthBips(100);
+static_assert(kMaxLateInterestRate == TenthBips32(100'000u));
 
 /** The maximum close interest rate charged for repaying a loan early in 1/10
  * bips.
  *
  * Valid values are between 0 and 100% inclusive.
  */
-TenthBips32 constexpr kMAX_CLOSE_INTEREST_RATE = percentageToTenthBips(100);
-static_assert(kMAX_CLOSE_INTEREST_RATE == TenthBips32(100'000u));
+constexpr TenthBips32 kMaxCloseInterestRate = percentageToTenthBips(100);
+static_assert(kMaxCloseInterestRate == TenthBips32(100'000u));
 
 /** The maximum overpayment interest rate charged on loan overpayments in 1/10
  * bips.
  *
  * Valid values are between 0 and 100% inclusive.
  */
-TenthBips32 constexpr kMAX_OVERPAYMENT_INTEREST_RATE = percentageToTenthBips(100);
-static_assert(kMAX_OVERPAYMENT_INTEREST_RATE == TenthBips32(100'000u));
+constexpr TenthBips32 kMaxOverpaymentInterestRate = percentageToTenthBips(100);
+static_assert(kMaxOverpaymentInterestRate == TenthBips32(100'000u));
 
 /** LoanPay transaction cost will be one base fee per X combined payments
  *
@@ -172,7 +172,7 @@ static_assert(kMAX_OVERPAYMENT_INTEREST_RATE == TenthBips32(100'000u));
  * This number was chosen arbitrarily, but should not be changed once released
  * without an amendment
  */
-static constexpr int kLOAN_PAYMENTS_PER_FEE_INCREMENT = 5;
+static constexpr int kLoanPaymentsPerFeeIncrement = 5;
 
 /** Maximum number of combined payments that a LoanPay transaction will process
  *
@@ -196,65 +196,65 @@ static constexpr int kLOAN_PAYMENTS_PER_FEE_INCREMENT = 5;
  * This number was chosen arbitrarily, but should not be changed once released
  * without an amendment
  */
-static constexpr int kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION = 100;
+static constexpr int kLoanMaximumPaymentsPerTransaction = 100;
 }  // namespace Lending
 
 /** The maximum length of a URI inside an NFT */
-std::size_t constexpr kMAX_TOKEN_URI_LENGTH = 256;
+constexpr std::size_t kMaxTokenUriLength = 256;
 
 /** The maximum length of a Data element inside a DID */
-std::size_t constexpr kMAX_DID_DOCUMENT_LENGTH = 256;
+constexpr std::size_t kMaxDidDocumentLength = 256;
 
 /** The maximum length of a URI inside a DID */
-std::size_t constexpr kMAX_DIDURI_LENGTH = 256;
+constexpr std::size_t kMaxDidUriLength = 256;
 
 /** The maximum length of an Attestation inside a DID */
-std::size_t constexpr kMAX_DID_DATA_LENGTH = 256;
+constexpr std::size_t kMaxDidDataLength = 256;
 
 /** The maximum length of a domain */
-std::size_t constexpr kMAX_DOMAIN_LENGTH = 256;
+constexpr std::size_t kMaxDomainLength = 256;
 
 /** The maximum length of a URI inside a Credential */
-std::size_t constexpr kMAX_CREDENTIAL_URI_LENGTH = 256;
+constexpr std::size_t kMaxCredentialUriLength = 256;
 
 /** The maximum length of a CredentialType inside a Credential */
-std::size_t constexpr kMAX_CREDENTIAL_TYPE_LENGTH = 64;
+constexpr std::size_t kMaxCredentialTypeLength = 64;
 
 /** The maximum number of credentials can be passed in array */
-std::size_t constexpr kMAX_CREDENTIALS_ARRAY_SIZE = 8;
+constexpr std::size_t kMaxCredentialsArraySize = 8;
 
 /** The maximum number of credentials can be passed in array for permissioned
  * domain */
-std::size_t constexpr kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE = 10;
+constexpr std::size_t kMaxPermissionedDomainCredentialsArraySize = 10;
 
 /** The maximum length of MPTokenMetadata */
-std::size_t constexpr kMAX_MP_TOKEN_METADATA_LENGTH = 1024;
+constexpr std::size_t kMaxMpTokenMetadataLength = 1024;
 
 /** The maximum amount of MPTokenIssuance */
-std::uint64_t constexpr kMAX_MP_TOKEN_AMOUNT = 0x7FFF'FFFF'FFFF'FFFFull;
-static_assert(Number::kMAX_REP >= kMAX_MP_TOKEN_AMOUNT);
+constexpr std::uint64_t kMaxMpTokenAmount = 0x7FFF'FFFF'FFFF'FFFFull;
+static_assert(Number::kMaxRep >= kMaxMpTokenAmount);
 
 /** The maximum length of Data payload */
-std::size_t constexpr kMAX_DATA_PAYLOAD_LENGTH = 256;
+constexpr std::size_t kMaxDataPayloadLength = 256;
 
 /** Vault withdrawal policies */
-std::uint8_t constexpr kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE = 1;
+constexpr std::uint8_t kVaultStrategyFirstComeFirstServe = 1;
 
 /** Default IOU scale factor for a Vault */
-std::uint8_t constexpr kVAULT_DEFAULT_IOU_SCALE = 6;
+constexpr std::uint8_t kVaultDefaultIouScale = 6;
 /** Maximum scale factor for a Vault. The number is chosen to ensure that
 1 IOU can be always converted to shares.
 10^19 > maxMPTokenAmount (2^64-1) > 10^18 */
-std::uint8_t constexpr kVAULT_MAXIMUM_IOU_SCALE = 18;
+constexpr std::uint8_t kVaultMaximumIouScale = 18;
 
 /** Maximum recursion depth for vault shares being put as an asset inside
  * another vault; counted from 0 */
-std::uint8_t constexpr kMAX_ASSET_CHECK_DEPTH = 5;
+constexpr std::uint8_t kMaxAssetCheckDepth = 5;
 
 /** A ledger index. */
 using LedgerIndex = std::uint32_t;
 
-std::uint32_t constexpr kFLAG_LEDGER_INTERVAL = 256;
+constexpr std::uint32_t kFlagLedgerInterval = 256;
 
 /** Returns true if the given ledgerIndex is a voting ledgerIndex */
 bool
@@ -273,38 +273,38 @@ using TxID = uint256;
 /** The maximum number of trustlines to delete as part of AMM account
  * deletion cleanup.
  */
-std::uint16_t constexpr kMAX_DELETABLE_AMM_TRUST_LINES = 512;
+constexpr std::uint16_t kMaxDeletableAmmTrustLines = 512;
 
 /** The maximum length of a URI inside an Oracle */
-std::size_t constexpr kMAX_ORACLE_URI = 256;
+constexpr std::size_t kMaxOracleUri = 256;
 
 /** The maximum length of a Provider inside an Oracle */
-std::size_t constexpr kMAX_ORACLE_PROVIDER = 256;
+constexpr std::size_t kMaxOracleProvider = 256;
 
 /** The maximum size of a data series array inside an Oracle */
-std::size_t constexpr kMAX_ORACLE_DATA_SERIES = 10;
+constexpr std::size_t kMaxOracleDataSeries = 10;
 
 /** The maximum length of a SymbolClass inside an Oracle */
-std::size_t constexpr kMAX_ORACLE_SYMBOL_CLASS = 16;
+constexpr std::size_t kMaxOracleSymbolClass = 16;
 
 /** The maximum allowed time difference between lastUpdateTime and the time
     of the last closed ledger
 */
-std::size_t constexpr kMAX_LAST_UPDATE_TIME_DELTA = 300;
+constexpr std::size_t kMaxLastUpdateTimeDelta = 300;
 
 /** The maximum price scaling factor
  */
-std::size_t constexpr kMAX_PRICE_SCALE = 20;
+constexpr std::size_t kMaxPriceScale = 20;
 
 /** The maximum percentage of outliers to trim
  */
-std::size_t constexpr kMAX_TRIM = 25;
+constexpr std::size_t kMaxTrim = 25;
 
 /** The maximum number of delegate permissions an account can grant
  */
-std::size_t constexpr kPERMISSION_MAX_SIZE = 10;
+constexpr std::size_t kPermissionMaxSize = 10;
 
 /** The maximum number of transactions that can be in a batch. */
-std::size_t constexpr kMAX_BATCH_TX_COUNT = 8;
+constexpr std::size_t kMaxBatchTxCount = 8;
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/PublicKey.h b/include/xrpl/protocol/PublicKey.h
index 16d558d73c..20693160d3 100644
--- a/include/xrpl/protocol/PublicKey.h
+++ b/include/xrpl/protocol/PublicKey.h
@@ -43,8 +43,8 @@ class PublicKey
 protected:
     // All the constructed public keys are valid, non-empty and contain 33
     // bytes of data.
-    static constexpr std::size_t kSIZE = 33;
-    std::uint8_t buf_[kSIZE]{};  // should be large enough
+    static constexpr std::size_t kSize = 33;
+    std::uint8_t buf_[kSize]{};  // should be large enough
 
 public:
     using const_iterator = std::uint8_t const*;
@@ -72,7 +72,7 @@ public:
     static std::size_t
     size() noexcept
     {
-        return kSIZE;
+        return kSize;
     }
 
     [[nodiscard]] const_iterator
@@ -90,19 +90,19 @@ public:
     [[nodiscard]] const_iterator
     end() const noexcept
     {
-        return buf_ + kSIZE;
+        return buf_ + kSize;
     }
 
     [[nodiscard]] const_iterator
     cend() const noexcept
     {
-        return buf_ + kSIZE;
+        return buf_ + kSize;
     }
 
     [[nodiscard]] Slice
     slice() const noexcept
     {
-        return {buf_, kSIZE};
+        return {buf_, kSize};
     }
 
     operator Slice() const noexcept
diff --git a/include/xrpl/protocol/Quality.h b/include/xrpl/protocol/Quality.h
index 115e4498df..e261025cb8 100644
--- a/include/xrpl/protocol/Quality.h
+++ b/include/xrpl/protocol/Quality.h
@@ -26,7 +26,7 @@ struct TAmounts
 {
     TAmounts() = default;
 
-    TAmounts(beast::Zero, beast::Zero) : in(beast::kZERO), out(beast::kZERO)
+    TAmounts(beast::Zero, beast::Zero) : in(beast::kZero), out(beast::kZero)
     {
     }
 
@@ -38,7 +38,7 @@ struct TAmounts
     [[nodiscard]] bool
     empty() const noexcept
     {
-        return in <= beast::kZERO || out <= beast::kZERO;
+        return in <= beast::kZero || out <= beast::kZero;
     }
 
     TAmounts&
@@ -94,8 +94,8 @@ public:
     // have lower unsigned integer representations.
     using value_type = std::uint64_t;
 
-    static int const kMIN_TICK_SIZE = 3;
-    static int const kMAX_TICK_SIZE = 16;
+    static int const kMinTickSize = 3;
+    static int const kMaxTickSize = 16;
 
 private:
     // This has the same representation as STAmount, see the comment on the
@@ -316,10 +316,10 @@ TAmounts<In, Out>
 Quality::ceilIn(TAmounts<In, Out> const& amount, In const& limit) const
 {
     // Construct a function pointer to the function we want to call.
-    static constexpr Amounts (Quality::*kCEIL_IN_FN_PTR)(Amounts const&, STAmount const&) const =
+    static constexpr Amounts (Quality::*kCeilInFnPtr)(Amounts const&, STAmount const&) const =
         &Quality::ceilIn;
 
-    return ceilTAmountsHelper(amount, limit, amount.in, kCEIL_IN_FN_PTR);
+    return ceilTAmountsHelper(amount, limit, amount.in, kCeilInFnPtr);
 }
 
 template <class In, class Out>
@@ -327,10 +327,10 @@ TAmounts<In, Out>
 Quality::ceilInStrict(TAmounts<In, Out> const& amount, In const& limit, bool roundUp) const
 {
     // Construct a function pointer to the function we want to call.
-    static constexpr Amounts (Quality::*kCEIL_IN_FN_PTR)(Amounts const&, STAmount const&, bool)
-        const = &Quality::ceilInStrict;
+    static constexpr Amounts (Quality::*kCeilInFnPtr)(Amounts const&, STAmount const&, bool) const =
+        &Quality::ceilInStrict;
 
-    return ceilTAmountsHelper(amount, limit, amount.in, kCEIL_IN_FN_PTR, roundUp);
+    return ceilTAmountsHelper(amount, limit, amount.in, kCeilInFnPtr, roundUp);
 }
 
 template <class In, class Out>
@@ -338,10 +338,10 @@ TAmounts<In, Out>
 Quality::ceilOut(TAmounts<In, Out> const& amount, Out const& limit) const
 {
     // Construct a function pointer to the function we want to call.
-    static constexpr Amounts (Quality::*kCEIL_OUT_FN_PTR)(Amounts const&, STAmount const&) const =
+    static constexpr Amounts (Quality::*kCeilOutFnPtr)(Amounts const&, STAmount const&) const =
         &Quality::ceilOut;
 
-    return ceil_TAmounts_helper(amount, limit, amount.out, kCEIL_OUT_FN_PTR);
+    return ceil_TAmounts_helper(amount, limit, amount.out, kCeilOutFnPtr);
 }
 
 template <class In, class Out>
@@ -349,10 +349,10 @@ TAmounts<In, Out>
 Quality::ceilOutStrict(TAmounts<In, Out> const& amount, Out const& limit, bool roundUp) const
 {
     // Construct a function pointer to the function we want to call.
-    static constexpr Amounts (Quality::*kCEIL_OUT_FN_PTR)(Amounts const&, STAmount const&, bool)
+    static constexpr Amounts (Quality::*kCeilOutFnPtr)(Amounts const&, STAmount const&, bool)
         const = &Quality::ceilOutStrict;
 
-    return ceilTAmountsHelper(amount, limit, amount.out, kCEIL_OUT_FN_PTR, roundUp);
+    return ceilTAmountsHelper(amount, limit, amount.out, kCeilOutFnPtr, roundUp);
 }
 
 /** Calculate the quality of a two-hop path given the two hops.
diff --git a/include/xrpl/protocol/QualityFunction.h b/include/xrpl/protocol/QualityFunction.h
index f7f92e50da..96d30735b8 100644
--- a/include/xrpl/protocol/QualityFunction.h
+++ b/include/xrpl/protocol/QualityFunction.h
@@ -72,7 +72,7 @@ QualityFunction::QualityFunction(
     std::uint32_t tfee,
     QualityFunction::AMMTag)
 {
-    if (amounts.in <= beast::kZERO || amounts.out <= beast::kZERO)
+    if (amounts.in <= beast::kZero || amounts.out <= beast::kZero)
         Throw<std::runtime_error>("QualityFunction amounts are 0.");
     Number const cfee = feeMult(tfee);
     m_ = -cfee / amounts.in;
diff --git a/include/xrpl/protocol/Rate.h b/include/xrpl/protocol/Rate.h
index 5dcd62a295..504b17ed80 100644
--- a/include/xrpl/protocol/Rate.h
+++ b/include/xrpl/protocol/Rate.h
@@ -72,6 +72,6 @@ transferFeeAsRate(std::uint16_t fee);
 }  // namespace nft
 
 /** A transfer rate signifying a 1:1 exchange */
-extern Rate const kPARITY_RATE;
+extern Rate const kParityRate;
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/SField.h b/include/xrpl/protocol/SField.h
index 26f52cd6a9..1d4e4e69a0 100644
--- a/include/xrpl/protocol/SField.h
+++ b/include/xrpl/protocol/SField.h
@@ -92,7 +92,7 @@ class STCurrency;
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum SerializedTypeID { XMACRO(TO_ENUM) };
 
-static std::map<std::string, int> const kS_TYPE_MAP = {XMACRO(TO_MAP)};
+static std::map<std::string, int> const kSTypeMap = {XMACRO(TO_MAP)};
 
 #undef XMACRO
 #undef TO_ENUM
@@ -129,23 +129,23 @@ fieldCode(int id, int index)
 class SField
 {
 public:
-    static constexpr auto kSMD_NEVER = 0x00;
-    static constexpr auto kSMD_CHANGE_ORIG = 0x01;   // original value when it changes
-    static constexpr auto kSMD_CHANGE_NEW = 0x02;    // new value when it changes
-    static constexpr auto kSMD_DELETE_FINAL = 0x04;  // final value when it is deleted
-    static constexpr auto kSMD_CREATE = 0x08;        // value when it's created
-    static constexpr auto kSMD_ALWAYS = 0x10;    // value when node containing it is affected at all
-    static constexpr auto kSMD_BASE_TEN = 0x20;  // value is treated as base 10, overriding behavior
-    static constexpr auto kSMD_PSEUDO_ACCOUNT = 0x40;  // if this field is set in an ACCOUNT_ROOT
-                                                       // _only_, then it is a pseudo-account
-    static constexpr auto kSMD_NEEDS_ASSET = 0x80;     // This field needs to be associated with an
-                                                       // asset before it is serialized as a ledger
-                                                       // object. Intended for STNumber.
-    static constexpr auto kSMD_DEFAULT =
-        kSMD_CHANGE_ORIG | kSMD_CHANGE_NEW | kSMD_DELETE_FINAL | kSMD_CREATE;
+    static constexpr auto kSmdNever = 0x00;
+    static constexpr auto kSmdChangeOrig = 0x01;   // original value when it changes
+    static constexpr auto kSmdChangeNew = 0x02;    // new value when it changes
+    static constexpr auto kSmdDeleteFinal = 0x04;  // final value when it is deleted
+    static constexpr auto kSmdCreate = 0x08;       // value when it's created
+    static constexpr auto kSmdAlways = 0x10;   // value when node containing it is affected at all
+    static constexpr auto kSmdBaseTen = 0x20;  // value is treated as base 10, overriding behavior
+    static constexpr auto kSmdPseudoAccount = 0x40;  // if this field is set in an ACCOUNT_ROOT
+                                                     // _only_, then it is a pseudo-account
+    static constexpr auto kSmdNeedsAsset = 0x80;     // This field needs to be associated with an
+                                                     // asset before it is serialized as a ledger
+                                                     // object. Intended for STNumber.
+    static constexpr auto kSmdDefault =
+        kSmdChangeOrig | kSmdChangeNew | kSmdDeleteFinal | kSmdCreate;
 
     enum class IsSigning : unsigned char { No, Yes };
-    static IsSigning const kNOT_SIGNING = IsSigning::No;
+    static IsSigning const kNotSigning = IsSigning::No;
 
     int const fieldCodeMem;            // (type<<16)|index // TODO: rename, clashes with function
     SerializedTypeID const fieldType;  // STI_*
@@ -172,7 +172,7 @@ public:
         SerializedTypeID tid,
         int fv,
         char const* fn,
-        int meta = kSMD_DEFAULT,
+        int meta = kSmdDefault,
         IsSigning signing = IsSigning::Yes);
     explicit SField(PrivateAccessTagT, int fc, char const* fn);
 
@@ -365,8 +365,8 @@ using SF_XCHAIN_BRIDGE = TypedField<STXChainBridge>;
 #define UNTYPED_SFIELD(sfName, stiSuffix, fieldValue, ...) extern SField const sfName;
 #define TYPED_SFIELD(sfName, stiSuffix, fieldValue, ...) extern SF_##stiSuffix const sfName;
 
-extern SField const kSF_INVALID;
-extern SField const kSF_GENERIC;
+extern SField const kSfInvalid;
+extern SField const kSfGeneric;
 
 #include <xrpl/protocol/detail/sfields.macro>
 
diff --git a/include/xrpl/protocol/STAmount.h b/include/xrpl/protocol/STAmount.h
index f05d44441d..01511c23ea 100644
--- a/include/xrpl/protocol/STAmount.h
+++ b/include/xrpl/protocol/STAmount.h
@@ -42,24 +42,24 @@ private:
 public:
     using value_type = STAmount;
 
-    constexpr static int kMIN_OFFSET = -96;
-    constexpr static int kMAX_OFFSET = 80;
+    static constexpr int kMinOffset = -96;
+    static constexpr int kMaxOffset = 80;
 
     // Maximum native value supported by the code
-    constexpr static std::uint64_t kMIN_VALUE = 1'000'000'000'000'000ull;
-    static_assert(isPowerOfTen(kMIN_VALUE));
-    constexpr static std::uint64_t kMAX_VALUE = (kMIN_VALUE * 10) - 1;
-    static_assert(kMAX_VALUE == 9'999'999'999'999'999ull);
-    constexpr static std::uint64_t kMAX_NATIVE = 9'000'000'000'000'000'000ull;
+    static constexpr std::uint64_t kMinValue = 1'000'000'000'000'000ull;
+    static_assert(isPowerOfTen(kMinValue));
+    static constexpr std::uint64_t kMaxValue = (kMinValue * 10) - 1;
+    static_assert(kMaxValue == 9'999'999'999'999'999ull);
+    static constexpr std::uint64_t kMaxNative = 9'000'000'000'000'000'000ull;
 
     // Max native value on network.
-    constexpr static std::uint64_t kMAX_NATIVE_N = 100'000'000'000'000'000ull;
-    constexpr static std::uint64_t kISSUED_CURRENCY = 0x8'000'000'000'000'000ull;
-    constexpr static std::uint64_t kPOSITIVE = 0x4'000'000'000'000'000ull;
-    constexpr static std::uint64_t kMP_TOKEN = 0x2'000'000'000'000'000ull;
-    constexpr static std::uint64_t kVALUE_MASK = ~(kPOSITIVE | kMP_TOKEN);
+    static constexpr std::uint64_t kMaxNativeN = 100'000'000'000'000'000ull;
+    static constexpr std::uint64_t kIssuedCurrency = 0x8'000'000'000'000'000ull;
+    static constexpr std::uint64_t kPositive = 0x4'000'000'000'000'000ull;
+    static constexpr std::uint64_t kMpToken = 0x2'000'000'000'000'000ull;
+    static constexpr std::uint64_t kValueMask = ~(kPositive | kMpToken);
 
-    static std::uint64_t const kU_RATE_ONE;
+    static std::uint64_t const kURateOne;
 
     //--------------------------------------------------------------------------
     STAmount(SerialIter& sit, SField const& name);
@@ -356,7 +356,7 @@ STAmount::STAmount(A const& asset, int mantissa, int exponent)
 
 // Legacy support for new-style amounts
 inline STAmount::STAmount(IOUAmount const& amount, Issue const& issue)
-    : asset_(issue), offset_(amount.exponent()), isNegative_(amount < beast::kZERO)
+    : asset_(issue), offset_(amount.exponent()), isNegative_(amount < beast::kZero)
 {
     if (isNegative_)
     {
@@ -371,7 +371,7 @@ inline STAmount::STAmount(IOUAmount const& amount, Issue const& issue)
 }
 
 inline STAmount::STAmount(MPTAmount const& amount, MPTIssue const& mptIssue)
-    : asset_(mptIssue), offset_(0), isNegative_(amount < beast::kZERO)
+    : asset_(mptIssue), offset_(0), isNegative_(amount < beast::kZero)
 {
     if (isNegative_)
     {
@@ -498,7 +498,7 @@ STAmount::zeroed() const
 inline STAmount::
 operator bool() const noexcept
 {
-    return *this != beast::kZERO;
+    return *this != beast::kZero;
 }
 
 inline STAmount::
@@ -540,7 +540,7 @@ STAmount::fromNumber(A const& a, Number const& number)
         return STAmount{asset, intValue, 0, negative};
     }
 
-    auto const [mantissa, exponent] = working.normalizeToRange(kMIN_VALUE, kMAX_VALUE);
+    auto const [mantissa, exponent] = working.normalizeToRange(kMinValue, kMaxValue);
 
     return STAmount{asset, mantissa, exponent, negative};
 }
@@ -548,7 +548,7 @@ STAmount::fromNumber(A const& a, Number const& number)
 inline void
 STAmount::negate()
 {
-    if (*this != beast::kZERO)
+    if (*this != beast::kZero)
         isNegative_ = !isNegative_;
 }
 
@@ -578,7 +578,7 @@ STAmount::value() const noexcept
 inline bool
 isLegalNet(STAmount const& value)
 {
-    return !value.native() || (value.mantissa() <= STAmount::kMAX_NATIVE_N);
+    return !value.native() || (value.mantissa() <= STAmount::kMaxNativeN);
 }
 
 //------------------------------------------------------------------------------
diff --git a/include/xrpl/protocol/STBase.h b/include/xrpl/protocol/STBase.h
index bfcc50d1ff..6633253d3b 100644
--- a/include/xrpl/protocol/STBase.h
+++ b/include/xrpl/protocol/STBase.h
@@ -65,7 +65,7 @@ struct JsonOptions
     }
 
     /// Returns JsonOptions binary negation, can be used with & (above) for set
-    /// difference e.g. `(options & ~JsonOptions::kINCLUDE_DATE)`
+    /// difference e.g. `(options & ~JsonOptions::kIncludeDate)`
     [[nodiscard]] constexpr JsonOptions friend
     operator~(JsonOptions v) noexcept
     {
diff --git a/include/xrpl/protocol/STBitString.h b/include/xrpl/protocol/STBitString.h
index 8a7e5a6030..87c8cd4f45 100644
--- a/include/xrpl/protocol/STBitString.h
+++ b/include/xrpl/protocol/STBitString.h
@@ -180,7 +180,7 @@ template <int Bits>
 bool
 STBitString<Bits>::isDefault() const
 {
-    return value_ == beast::kZERO;
+    return value_ == beast::kZero;
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/STBlob.h b/include/xrpl/protocol/STBlob.h
index 84f44f1b78..c9110a367e 100644
--- a/include/xrpl/protocol/STBlob.h
+++ b/include/xrpl/protocol/STBlob.h
@@ -24,7 +24,7 @@ public:
     STBlob(SField const& f, void const* data, std::size_t size);
     STBlob(SField const& f, Buffer&& b);
     STBlob(SField const& n);
-    STBlob(SerialIter&, SField const& name = kSF_GENERIC);
+    STBlob(SerialIter&, SField const& name = kSfGeneric);
 
     [[nodiscard]] std::size_t
     size() const;
diff --git a/include/xrpl/protocol/STParsedJSON.h b/include/xrpl/protocol/STParsedJSON.h
index 04ffc624fb..2557ab055b 100644
--- a/include/xrpl/protocol/STParsedJSON.h
+++ b/include/xrpl/protocol/STParsedJSON.h
@@ -7,11 +7,11 @@
 namespace xrpl {
 
 /** Maximum JSON object nesting depth permitted during parsing. */
-inline constexpr std::size_t kMAX_PARSED_JSON_DEPTH = 64;
+inline constexpr std::size_t kMaxParsedJsonDepth = 64;
 
 /** Maximum number of elements permitted in any JSON array field during parsing.
     Requests exceeding this limit are rejected with an invalidParams error. */
-inline constexpr std::size_t kMAX_PARSED_JSON_ARRAY_SIZE = 512;
+inline constexpr std::size_t kMaxParsedJsonArraySize = 512;
 
 /** Holds the serialized result of parsing an input JSON object.
     This does validation and checking on the provided JSON.
diff --git a/include/xrpl/protocol/STTx.h b/include/xrpl/protocol/STTx.h
index d1bd32848f..5aa70d1299 100644
--- a/include/xrpl/protocol/STTx.h
+++ b/include/xrpl/protocol/STTx.h
@@ -30,8 +30,8 @@ class STTx final : public STObject, public CountedObject<STTx>
     TxType tx_type_;
 
 public:
-    static constexpr std::size_t kMIN_MULTI_SIGNERS = 1;
-    static constexpr std::size_t kMAX_MULTI_SIGNERS = 32;
+    static constexpr std::size_t kMinMultiSigners = 1;
+    static constexpr std::size_t kMaxMultiSigners = 32;
 
     STTx() = delete;
     STTx(STTx const& other) = default;
diff --git a/include/xrpl/protocol/STValidation.h b/include/xrpl/protocol/STValidation.h
index 0b7f53eb55..91ce88b441 100644
--- a/include/xrpl/protocol/STValidation.h
+++ b/include/xrpl/protocol/STValidation.h
@@ -16,10 +16,10 @@ namespace xrpl {
 // Validation flags
 
 // This is a full (as opposed to a partial) validation
-constexpr std::uint32_t kVF_FULL_VALIDATION = 0x00000001;
+constexpr std::uint32_t kVfFullValidation = 0x00000001;
 
 // The signature is fully canonical
-constexpr std::uint32_t kVF_FULLY_CANONICAL_SIG = 0x80000000;
+constexpr std::uint32_t kVfFullyCanonicalSig = 0x80000000;
 
 class STValidation final : public STObject, public CountedObject<STValidation>
 {
@@ -204,7 +204,7 @@ STValidation::STValidation(
     f(*this);
 
     // Finally, sign the validation and mark it as trusted:
-    setFlag(kVF_FULLY_CANONICAL_SIG);
+    setFlag(kVfFullyCanonicalSig);
     setFieldVL(sfSignature, signDigest(pk, sk, getSigningHash()));
     setTrusted();
 
diff --git a/include/xrpl/protocol/SecretKey.h b/include/xrpl/protocol/SecretKey.h
index 9af27e9709..712b095f81 100644
--- a/include/xrpl/protocol/SecretKey.h
+++ b/include/xrpl/protocol/SecretKey.h
@@ -17,10 +17,10 @@ namespace xrpl {
 class SecretKey
 {
 public:
-    static constexpr std::size_t kSIZE = 32;
+    static constexpr std::size_t kSize = 32;
 
 private:
-    std::uint8_t buf_[kSIZE]{};
+    std::uint8_t buf_[kSize]{};
 
 public:
     using const_iterator = std::uint8_t const*;
@@ -37,7 +37,7 @@ public:
 
     ~SecretKey();
 
-    SecretKey(std::array<std::uint8_t, kSIZE> const& data);
+    SecretKey(std::array<std::uint8_t, kSize> const& data);
     SecretKey(Slice const& slice);
 
     [[nodiscard]] std::uint8_t const*
diff --git a/include/xrpl/protocol/Serializer.h b/include/xrpl/protocol/Serializer.h
index 81706e152a..ffe9afabe8 100644
--- a/include/xrpl/protocol/Serializer.h
+++ b/include/xrpl/protocol/Serializer.h
@@ -134,13 +134,13 @@ public:
     bool
     getInteger(Integer& number, int offset)
     {
-        static auto const kBYTES = sizeof(Integer);
-        if ((offset + kBYTES) > data_.size())
+        static auto const kBytes = sizeof(Integer);
+        if ((offset + kBytes) > data_.size())
             return false;
         number = 0;
 
         auto ptr = &data_[offset];
-        for (auto i = 0; i < kBYTES; ++i)
+        for (auto i = 0; i < kBytes; ++i)
         {
             if (i)
                 number <<= 8;
diff --git a/include/xrpl/protocol/SystemParameters.h b/include/xrpl/protocol/SystemParameters.h
index 029c0418b5..1cc35a0f31 100644
--- a/include/xrpl/protocol/SystemParameters.h
+++ b/include/xrpl/protocol/SystemParameters.h
@@ -14,22 +14,22 @@ namespace xrpl {
 static inline std::string const&
 systemName()
 {
-    static std::string const kNAME = "xrpld";
-    return kNAME;
+    static std::string const kName = "xrpld";
+    return kName;
 }
 
 /** Configure the native currency. */
 
 /** Number of drops in the genesis account. */
-constexpr XRPAmount kINITIAL_XRP{100'000'000'000 * kDROPS_PER_XRP};
-static_assert(kINITIAL_XRP.drops() == 100'000'000'000'000'000);
-static_assert(Number::kMAX_REP >= kINITIAL_XRP.drops());
+constexpr XRPAmount kInitialXrp{100'000'000'000 * kDropsPerXrp};
+static_assert(kInitialXrp.drops() == 100'000'000'000'000'000);
+static_assert(Number::kMaxRep >= kInitialXrp.drops());
 
 /** Returns true if the amount does not exceed the initial XRP in existence. */
 inline bool
 isLegalAmount(XRPAmount const& amount)
 {
-    return amount <= kINITIAL_XRP;
+    return amount <= kInitialXrp;
 }
 
 /** Returns true if the absolute value of the amount does not exceed the initial
@@ -37,31 +37,31 @@ isLegalAmount(XRPAmount const& amount)
 inline bool
 isLegalAmountSigned(XRPAmount const& amount)
 {
-    return amount >= -kINITIAL_XRP && amount <= kINITIAL_XRP;
+    return amount >= -kInitialXrp && amount <= kInitialXrp;
 }
 
 /* The currency code for the native currency. */
 static inline std::string const&
 systemCurrencyCode()
 {
-    static std::string const kCODE = "XRP";
-    return kCODE;
+    static std::string const kCode = "XRP";
+    return kCode;
 }
 
 /** The XRP ledger network's earliest allowed sequence */
-static constexpr std::uint32_t kXRP_LEDGER_EARLIEST_SEQ{32570u};
+static constexpr std::uint32_t kXrpLedgerEarliestSeq{32570u};
 
 /** The XRP Ledger mainnet's earliest ledger with a FeeSettings object. Only
  * used in asserts and tests. */
-static constexpr std::uint32_t kXRP_LEDGER_EARLIEST_FEES{562177u};
+static constexpr std::uint32_t kXrpLedgerEarliestFees{562177u};
 
 /** The minimum amount of support an amendment should have. */
-constexpr std::ratio<80, 100> kAMENDMENT_MAJORITY_CALC_THRESHOLD;
+constexpr std::ratio<80, 100> kAmendmentMajorityCalcThreshold;
 
 /** The minimum amount of time an amendment must hold a majority */
-constexpr std::chrono::seconds const kDEFAULT_AMENDMENT_MAJORITY_TIME = weeks{2};
+constexpr std::chrono::seconds const kDefaultAmendmentMajorityTime = weeks{2};
 
 }  // namespace xrpl
 
 /** Default peer port (IANA registered) */
-inline std::uint16_t constexpr kDEFAULT_PEER_PORT{2459};
+inline constexpr std::uint16_t kDefaultPeerPort{2459};
diff --git a/include/xrpl/protocol/UintTypes.h b/include/xrpl/protocol/UintTypes.h
index 322c58ea1f..b38c544096 100644
--- a/include/xrpl/protocol/UintTypes.h
+++ b/include/xrpl/protocol/UintTypes.h
@@ -62,7 +62,7 @@ badCurrency();
 inline bool
 isXRP(Currency const& c)
 {
-    return c == beast::kZERO;
+    return c == beast::kZero;
 }
 
 /** Returns "", "XRP", or three letter ISO code. */
diff --git a/include/xrpl/protocol/Units.h b/include/xrpl/protocol/Units.h
index dd5cfdeffd..7fedc05a0d 100644
--- a/include/xrpl/protocol/Units.h
+++ b/include/xrpl/protocol/Units.h
@@ -300,13 +300,13 @@ public:
             using jsontype =
                 std::conditional_t<std::is_signed_v<value_type>, json::Int, json::UInt>;
 
-            constexpr auto kMIN = std::numeric_limits<jsontype>::min();
-            constexpr auto kMAX = std::numeric_limits<jsontype>::max();
+            constexpr auto kMin = std::numeric_limits<jsontype>::min();
+            constexpr auto kMax = std::numeric_limits<jsontype>::max();
 
-            if (value_ < kMIN)
-                return kMIN;
-            if (value_ > kMAX)
-                return kMAX;
+            if (value_ < kMin)
+                return kMin;
+            if (value_ > kMax)
+                return kMax;
             return static_cast<jsontype>(value_);
         }
         else
@@ -392,14 +392,14 @@ mulDivU(Source1 value, Dest mul, Source2 div)
     }
 
     using desttype = typename Dest::value_type;
-    constexpr auto kMAX = std::numeric_limits<desttype>::max();
+    constexpr auto kMax = std::numeric_limits<desttype>::max();
 
     // Shortcuts, since these happen a lot in the real world
     if (value == div)
         return mul;
     if (mul.value() == div.value())
     {
-        if (value.value() > kMAX)
+        if (value.value() > kMax)
             return std::nullopt;
         return Dest{static_cast<desttype>(value.value())};
     }
@@ -414,7 +414,7 @@ mulDivU(Source1 value, Dest mul, Source2 div)
 
     auto quotient = product / div.value();
 
-    if (quotient > kMAX)
+    if (quotient > kMax)
         return std::nullopt;
 
     return Dest{static_cast<desttype>(quotient)};
diff --git a/include/xrpl/protocol/XChainAttestations.h b/include/xrpl/protocol/XChainAttestations.h
index d8a35a29e3..993f478b5e 100644
--- a/include/xrpl/protocol/XChainAttestations.h
+++ b/include/xrpl/protocol/XChainAttestations.h
@@ -357,7 +357,7 @@ private:
     // Set a max number of allowed attestations to limit the amount of memory
     // allocated and processing time. This number is much larger than the actual
     // number of attestation a server would ever expect.
-    static constexpr std::uint32_t kMAX_ATTESTATIONS = 256;
+    static constexpr std::uint32_t kMaxAttestations = 256;
     AttCollection attestations_;
 
 protected:
diff --git a/include/xrpl/protocol/XRPAmount.h b/include/xrpl/protocol/XRPAmount.h
index 067ea511da..f09ddc337a 100644
--- a/include/xrpl/protocol/XRPAmount.h
+++ b/include/xrpl/protocol/XRPAmount.h
@@ -202,13 +202,13 @@ public:
             std::is_signed_v<value_type> && std::is_integral_v<value_type>,
             "Expected XRPAmount to be a signed integral type");
 
-        constexpr auto kMIN = std::numeric_limits<json::Int>::min();
-        constexpr auto kMAX = std::numeric_limits<json::Int>::max();
+        constexpr auto kMin = std::numeric_limits<json::Int>::min();
+        constexpr auto kMax = std::numeric_limits<json::Int>::max();
 
-        if (drops_ < kMIN)
-            return kMIN;
-        if (drops_ > kMAX)
-            return kMAX;
+        if (drops_ < kMin)
+            return kMin;
+        if (drops_ > kMax)
+            return kMax;
         return static_cast<json::Int>(drops_);
     }
 
@@ -237,12 +237,12 @@ public:
 };
 
 /** Number of drops per 1 XRP */
-constexpr XRPAmount kDROPS_PER_XRP{1'000'000};
+constexpr XRPAmount kDropsPerXrp{1'000'000};
 
 constexpr double
 XRPAmount::decimalXRP() const
 {
-    return static_cast<double>(drops_) / kDROPS_PER_XRP.drops();
+    return static_cast<double>(drops_) / kDropsPerXrp.drops();
 }
 
 // Output XRPAmount as just the drops value.
diff --git a/include/xrpl/protocol/detail/STVar.h b/include/xrpl/protocol/detail/STVar.h
index 52045965fd..98a0b8dcd2 100644
--- a/include/xrpl/protocol/detail/STVar.h
+++ b/include/xrpl/protocol/detail/STVar.h
@@ -35,9 +35,9 @@ class STVar
 {
 private:
     // The largest "small object" we can accommodate
-    static std::size_t constexpr kMAX_SIZE = 72;
+    static constexpr std::size_t kMaxSize = 72;
 
-    std::aligned_storage<kMAX_SIZE>::type d_ = {};
+    std::aligned_storage<kMaxSize>::type d_ = {};
     STBase* p_ = nullptr;
 
 public:
@@ -51,12 +51,12 @@ public:
 
     STVar(STBase&& t)  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
     {
-        p_ = t.move(kMAX_SIZE, &d_);
+        p_ = t.move(kMaxSize, &d_);
     }
 
     STVar(STBase const& t)
     {
-        p_ = t.copy(kMAX_SIZE, &d_);
+        p_ = t.copy(kMaxSize, &d_);
     }
 
     STVar(DefaultObjectT, SField const& name);
@@ -110,7 +110,7 @@ private:
     void
     construct(Args&&... args)
     {
-        if constexpr (sizeof(T) > kMAX_SIZE)
+        if constexpr (sizeof(T) > kMaxSize)
         {
             p_ = new T(std::forward<Args>(args)...);
         }
diff --git a/include/xrpl/protocol/detail/b58_utils.h b/include/xrpl/protocol/detail/b58_utils.h
index f860dc40c4..e800dbda06 100644
--- a/include/xrpl/protocol/detail/b58_utils.h
+++ b/include/xrpl/protocol/detail/b58_utils.h
@@ -155,16 +155,16 @@ inplaceBigintDivRem(std::span<uint64_t> numerator, std::uint64_t divisor)
 [[nodiscard]] inline std::array<std::uint8_t, 10>
 b5810ToB58Be(std::uint64_t input)
 {
-    [[maybe_unused]] static constexpr std::uint64_t kB_58_10 = 430804206899405824;  // 58^10;
-    XRPL_ASSERT(input < kB_58_10, "xrpl::b58_fast::detail::b5810ToB58Be : valid input");
-    constexpr std::size_t kRESULT_SIZE = 10;
-    std::array<std::uint8_t, kRESULT_SIZE> result{};
+    [[maybe_unused]] static constexpr std::uint64_t kB5810 = 430804206899405824;  // 58^10;
+    XRPL_ASSERT(input < kB5810, "xrpl::b58_fast::detail::b5810ToB58Be : valid input");
+    static constexpr std::size_t kResultSize = 10;
+    std::array<std::uint8_t, kResultSize> result{};
     int i = 0;
     while (input > 0)
     {
         std::uint64_t rem = 0;
         std::tie(input, rem) = divRem(input, 58);
-        result[kRESULT_SIZE - 1 - i] = rem;
+        result[kResultSize - 1 - i] = rem;
         i += 1;
     }
 
diff --git a/include/xrpl/protocol/detail/sfields.macro b/include/xrpl/protocol/detail/sfields.macro
index 882f85a919..5d1689dce9 100644
--- a/include/xrpl/protocol/detail/sfields.macro
+++ b/include/xrpl/protocol/detail/sfields.macro
@@ -27,7 +27,7 @@ TYPED_SFIELD(sfWasLockingChainSend,      UINT8,     19)
 TYPED_SFIELD(sfWithdrawalPolicy,         UINT8,     20)
 
 // 16-bit integers (common)
-TYPED_SFIELD(sfLedgerEntryType,          UINT16,     1, SField::kSMD_NEVER)
+TYPED_SFIELD(sfLedgerEntryType,          UINT16,     1, SField::kSmdNever)
 TYPED_SFIELD(sfTransactionType,          UINT16,     2)
 TYPED_SFIELD(sfSignerWeight,             UINT16,     3)
 TYPED_SFIELD(sfTransferFee,              UINT16,     4)
@@ -48,7 +48,7 @@ TYPED_SFIELD(sfNetworkID,                UINT32,     1)
 TYPED_SFIELD(sfFlags,                    UINT32,     2)
 TYPED_SFIELD(sfSourceTag,                UINT32,     3)
 TYPED_SFIELD(sfSequence,                 UINT32,     4)
-TYPED_SFIELD(sfPreviousTxnLgrSeq,        UINT32,     5, SField::kSMD_DELETE_FINAL)
+TYPED_SFIELD(sfPreviousTxnLgrSeq,        UINT32,     5, SField::kSmdDeleteFinal)
 TYPED_SFIELD(sfLedgerSequence,           UINT32,     6)
 TYPED_SFIELD(sfCloseTime,                UINT32,     7)
 TYPED_SFIELD(sfParentCloseTime,          UINT32,     8)
@@ -138,12 +138,12 @@ TYPED_SFIELD(sfXChainClaimID,            UINT64,    20)
 TYPED_SFIELD(sfXChainAccountCreateCount, UINT64,    21)
 TYPED_SFIELD(sfXChainAccountClaimCount,  UINT64,    22)
 TYPED_SFIELD(sfAssetPrice,               UINT64,    23)
-TYPED_SFIELD(sfMaximumAmount,            UINT64,    24, SField::kSMD_BASE_TEN|SField::kSMD_DEFAULT)
-TYPED_SFIELD(sfOutstandingAmount,        UINT64,    25, SField::kSMD_BASE_TEN|SField::kSMD_DEFAULT)
-TYPED_SFIELD(sfMPTAmount,                UINT64,    26, SField::kSMD_BASE_TEN|SField::kSMD_DEFAULT)
+TYPED_SFIELD(sfMaximumAmount,            UINT64,    24, SField::kSmdBaseTen|SField::kSmdDefault)
+TYPED_SFIELD(sfOutstandingAmount,        UINT64,    25, SField::kSmdBaseTen|SField::kSmdDefault)
+TYPED_SFIELD(sfMPTAmount,                UINT64,    26, SField::kSmdBaseTen|SField::kSmdDefault)
 TYPED_SFIELD(sfIssuerNode,               UINT64,    27)
 TYPED_SFIELD(sfSubjectNode,              UINT64,    28)
-TYPED_SFIELD(sfLockedAmount,             UINT64,    29, SField::kSMD_BASE_TEN|SField::kSMD_DEFAULT)
+TYPED_SFIELD(sfLockedAmount,             UINT64,    29, SField::kSmdBaseTen|SField::kSmdDefault)
 TYPED_SFIELD(sfVaultNode,                UINT64,    30)
 TYPED_SFIELD(sfLoanBrokerNode,           UINT64,    31)
 
@@ -167,17 +167,17 @@ TYPED_SFIELD(sfLedgerHash,               UINT256,    1)
 TYPED_SFIELD(sfParentHash,               UINT256,    2)
 TYPED_SFIELD(sfTransactionHash,          UINT256,    3)
 TYPED_SFIELD(sfAccountHash,              UINT256,    4)
-TYPED_SFIELD(sfPreviousTxnID,            UINT256,    5, SField::kSMD_DELETE_FINAL)
+TYPED_SFIELD(sfPreviousTxnID,            UINT256,    5, SField::kSmdDeleteFinal)
 TYPED_SFIELD(sfLedgerIndex,              UINT256,    6)
 TYPED_SFIELD(sfWalletLocator,            UINT256,    7)
-TYPED_SFIELD(sfRootIndex,                UINT256,    8, SField::kSMD_ALWAYS)
+TYPED_SFIELD(sfRootIndex,                UINT256,    8, SField::kSmdAlways)
 TYPED_SFIELD(sfAccountTxnID,             UINT256,    9)
 TYPED_SFIELD(sfNFTokenID,                UINT256,   10)
 TYPED_SFIELD(sfEmitParentTxnID,          UINT256,   11)
 TYPED_SFIELD(sfEmitNonce,                UINT256,   12)
 TYPED_SFIELD(sfEmitHookHash,             UINT256,   13)
 TYPED_SFIELD(sfAMMID,                    UINT256,   14,
-    SField::kSMD_PSEUDO_ACCOUNT | SField::kSMD_DEFAULT)
+    SField::kSmdPseudoAccount | SField::kSmdDefault)
 
 // 256-bit (uncommon)
 TYPED_SFIELD(sfBookDirectory,            UINT256,   16)
@@ -200,30 +200,30 @@ TYPED_SFIELD(sfHookNamespace,            UINT256,   32)
 TYPED_SFIELD(sfHookSetTxnID,             UINT256,   33)
 TYPED_SFIELD(sfDomainID,                 UINT256,   34)
 TYPED_SFIELD(sfVaultID,                  UINT256,   35,
-    SField::kSMD_PSEUDO_ACCOUNT | SField::kSMD_DEFAULT)
+    SField::kSmdPseudoAccount | SField::kSmdDefault)
 TYPED_SFIELD(sfParentBatchID,            UINT256,   36)
 TYPED_SFIELD(sfLoanBrokerID,             UINT256,   37,
-    SField::kSMD_PSEUDO_ACCOUNT | SField::kSMD_DEFAULT)
+    SField::kSmdPseudoAccount | SField::kSmdDefault)
 TYPED_SFIELD(sfLoanID,                   UINT256,   38)
 
 // number (common)
 TYPED_SFIELD(sfNumber,                   NUMBER,     1)
-TYPED_SFIELD(sfAssetsAvailable,          NUMBER,     2, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
-TYPED_SFIELD(sfAssetsMaximum,            NUMBER,     3, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
-TYPED_SFIELD(sfAssetsTotal,              NUMBER,     4, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
-TYPED_SFIELD(sfLossUnrealized,           NUMBER,     5, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
-TYPED_SFIELD(sfDebtTotal,                NUMBER,     6, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
-TYPED_SFIELD(sfDebtMaximum,              NUMBER,     7, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
-TYPED_SFIELD(sfCoverAvailable,           NUMBER,     8, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
+TYPED_SFIELD(sfAssetsAvailable,          NUMBER,     2, SField::kSmdNeedsAsset | SField::kSmdDefault)
+TYPED_SFIELD(sfAssetsMaximum,            NUMBER,     3, SField::kSmdNeedsAsset | SField::kSmdDefault)
+TYPED_SFIELD(sfAssetsTotal,              NUMBER,     4, SField::kSmdNeedsAsset | SField::kSmdDefault)
+TYPED_SFIELD(sfLossUnrealized,           NUMBER,     5, SField::kSmdNeedsAsset | SField::kSmdDefault)
+TYPED_SFIELD(sfDebtTotal,                NUMBER,     6, SField::kSmdNeedsAsset | SField::kSmdDefault)
+TYPED_SFIELD(sfDebtMaximum,              NUMBER,     7, SField::kSmdNeedsAsset | SField::kSmdDefault)
+TYPED_SFIELD(sfCoverAvailable,           NUMBER,     8, SField::kSmdNeedsAsset | SField::kSmdDefault)
 TYPED_SFIELD(sfLoanOriginationFee,       NUMBER,     9)
 TYPED_SFIELD(sfLoanServiceFee,           NUMBER,     10)
 TYPED_SFIELD(sfLatePaymentFee,           NUMBER,     11)
 TYPED_SFIELD(sfClosePaymentFee,          NUMBER,     12)
-TYPED_SFIELD(sfPrincipalOutstanding,     NUMBER,     13, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
+TYPED_SFIELD(sfPrincipalOutstanding,     NUMBER,     13, SField::kSmdNeedsAsset | SField::kSmdDefault)
 TYPED_SFIELD(sfPrincipalRequested,       NUMBER,     14)
-TYPED_SFIELD(sfTotalValueOutstanding,    NUMBER,     15, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
+TYPED_SFIELD(sfTotalValueOutstanding,    NUMBER,     15, SField::kSmdNeedsAsset | SField::kSmdDefault)
 TYPED_SFIELD(sfPeriodicPayment,          NUMBER,     16)
-TYPED_SFIELD(sfManagementFeeOutstanding, NUMBER,     17, SField::kSMD_NEEDS_ASSET | SField::kSMD_DEFAULT)
+TYPED_SFIELD(sfManagementFeeOutstanding, NUMBER,     17, SField::kSmdNeedsAsset | SField::kSmdDefault)
 
 // int32
 TYPED_SFIELD(sfLoanScale,                INT32,      1)
@@ -269,9 +269,9 @@ TYPED_SFIELD(sfLPTokenBalance,           AMOUNT,    31)
 TYPED_SFIELD(sfPublicKey,                VL,         1)
 TYPED_SFIELD(sfMessageKey,               VL,         2)
 TYPED_SFIELD(sfSigningPubKey,            VL,         3)
-TYPED_SFIELD(sfTxnSignature,             VL,         4, SField::kSMD_DEFAULT, SField::kNOT_SIGNING)
+TYPED_SFIELD(sfTxnSignature,             VL,         4, SField::kSmdDefault, SField::kNotSigning)
 TYPED_SFIELD(sfURI,                      VL,         5)
-TYPED_SFIELD(sfSignature,                VL,         6, SField::kSMD_DEFAULT, SField::kNOT_SIGNING)
+TYPED_SFIELD(sfSignature,                VL,         6, SField::kSmdDefault, SField::kNotSigning)
 TYPED_SFIELD(sfDomain,                   VL,         7)
 TYPED_SFIELD(sfFundCode,                 VL,         8)
 TYPED_SFIELD(sfRemoveCode,               VL,         9)
@@ -284,7 +284,7 @@ TYPED_SFIELD(sfMemoFormat,               VL,        14)
 // variable length (uncommon)
 TYPED_SFIELD(sfFulfillment,              VL,        16)
 TYPED_SFIELD(sfCondition,                VL,        17)
-TYPED_SFIELD(sfMasterSignature,          VL,        18, SField::kSMD_DEFAULT, SField::kNOT_SIGNING)
+TYPED_SFIELD(sfMasterSignature,          VL,        18, SField::kSmdDefault, SField::kNotSigning)
 TYPED_SFIELD(sfUNLModifyValidator,       VL,        19)
 TYPED_SFIELD(sfValidatorToDisable,       VL,        20)
 TYPED_SFIELD(sfValidatorToReEnable,      VL,        21)
@@ -326,7 +326,7 @@ TYPED_SFIELD(sfBorrower,                 ACCOUNT,   25)
 TYPED_SFIELD(sfCounterparty,             ACCOUNT,   26)
 
 // vector of 256-bit
-TYPED_SFIELD(sfIndexes,                  VECTOR256,  1, SField::kSMD_NEVER)
+TYPED_SFIELD(sfIndexes,                  VECTOR256,  1, SField::kSmdNever)
 TYPED_SFIELD(sfHashes,                   VECTOR256,  2)
 TYPED_SFIELD(sfAmendments,               VECTOR256,  3)
 TYPED_SFIELD(sfNFTokenOffers,            VECTOR256,  4)
@@ -387,13 +387,13 @@ UNTYPED_SFIELD(sfCredential,             OBJECT,    33)
 UNTYPED_SFIELD(sfRawTransaction,         OBJECT,    34)
 UNTYPED_SFIELD(sfBatchSigner,            OBJECT,    35)
 UNTYPED_SFIELD(sfBook,                   OBJECT,    36)
-UNTYPED_SFIELD(sfCounterpartySignature,  OBJECT,    37, SField::kSMD_DEFAULT, SField::kNOT_SIGNING)
+UNTYPED_SFIELD(sfCounterpartySignature,  OBJECT,    37, SField::kSmdDefault, SField::kNotSigning)
 
 // array of objects (common)
 // ARRAY/1 is reserved for end of array
 // sfSigningAccounts has never been used.
 //UNTYPED_SFIELD(sfSigningAccounts,        ARRAY,      2)
-UNTYPED_SFIELD(sfSigners,                ARRAY,      3, SField::kSMD_DEFAULT, SField::kNOT_SIGNING)
+UNTYPED_SFIELD(sfSigners,                ARRAY,      3, SField::kSmdDefault, SField::kNotSigning)
 UNTYPED_SFIELD(sfSignerEntries,          ARRAY,      4)
 UNTYPED_SFIELD(sfTemplate,               ARRAY,      5)
 UNTYPED_SFIELD(sfNecessary,              ARRAY,      6)
@@ -421,4 +421,4 @@ UNTYPED_SFIELD(sfUnauthorizeCredentials, ARRAY,     27)
 UNTYPED_SFIELD(sfAcceptedCredentials,    ARRAY,     28)
 UNTYPED_SFIELD(sfPermissions,            ARRAY,     29)
 UNTYPED_SFIELD(sfRawTransactions,        ARRAY,     30)
-UNTYPED_SFIELD(sfBatchSigners,           ARRAY,     31, SField::kSMD_DEFAULT, SField::kNOT_SIGNING)
+UNTYPED_SFIELD(sfBatchSigners,           ARRAY,     31, SField::kSmdDefault, SField::kNotSigning)
diff --git a/include/xrpl/protocol/digest.h b/include/xrpl/protocol/digest.h
index 6564237771..50bf2735fb 100644
--- a/include/xrpl/protocol/digest.h
+++ b/include/xrpl/protocol/digest.h
@@ -27,7 +27,7 @@ namespace xrpl {
 struct OpensslRipemd160Hasher
 {
 public:
-    static constexpr auto const kENDIAN = boost::endian::order::native;
+    static constexpr auto kEndian = boost::endian::order::native;
 
     using result_type = std::array<std::uint8_t, 20>;
 
@@ -50,7 +50,7 @@ private:
 struct OpensslSha512Hasher
 {
 public:
-    static constexpr auto const kENDIAN = boost::endian::order::native;
+    static constexpr auto kEndian = boost::endian::order::native;
 
     using result_type = std::array<std::uint8_t, 64>;
 
@@ -73,7 +73,7 @@ private:
 struct OpensslSha256Hasher
 {
 public:
-    static constexpr auto const kENDIAN = boost::endian::order::native;
+    static constexpr auto kEndian = boost::endian::order::native;
 
     using result_type = std::array<std::uint8_t, 32>;
 
@@ -118,7 +118,7 @@ private:
     sha256_hasher h_;
 
 public:
-    static constexpr auto const kENDIAN = boost::endian::order::native;
+    static constexpr auto kEndian = boost::endian::order::native;
 
     using result_type = std::array<std::uint8_t, 20>;
 
@@ -154,7 +154,7 @@ private:
     sha512_hasher h_;
 
 public:
-    static constexpr auto const kENDIAN = boost::endian::order::big;
+    static constexpr auto kEndian = boost::endian::order::big;
 
     using result_type = uint256;
 
diff --git a/include/xrpl/protocol/nft.h b/include/xrpl/protocol/nft.h
index ce73e244c1..1e79b3f285 100644
--- a/include/xrpl/protocol/nft.h
+++ b/include/xrpl/protocol/nft.h
@@ -29,11 +29,11 @@ toUInt32(Taxon t)
     return static_cast<std::uint32_t>(t);
 }
 
-constexpr std::uint16_t const kFLAG_BURNABLE = 0x0001;
-constexpr std::uint16_t const kFLAG_ONLY_XRP = 0x0002;
-constexpr std::uint16_t const kFLAG_CREATE_TRUST_LINES = 0x0004;
-constexpr std::uint16_t const kFLAG_TRANSFERABLE = 0x0008;
-constexpr std::uint16_t const kFLAG_MUTABLE = 0x0010;
+constexpr std::uint16_t const kFlagBurnable = 0x0001;
+constexpr std::uint16_t const kFlagOnlyXrp = 0x0002;
+constexpr std::uint16_t const kFlagCreateTrustLines = 0x0004;
+constexpr std::uint16_t const kFlagTransferable = 0x0008;
+constexpr std::uint16_t const kFlagMutable = 0x0010;
 
 inline std::uint16_t
 getFlags(uint256 const& id)
diff --git a/include/xrpl/protocol/nftPageMask.h b/include/xrpl/protocol/nftPageMask.h
index d679c319fa..827df34cf3 100644
--- a/include/xrpl/protocol/nftPageMask.h
+++ b/include/xrpl/protocol/nftPageMask.h
@@ -8,7 +8,7 @@ namespace xrpl::nft {
 
 // NFT directory pages order their contents based only on the low 96 bits of
 // the NFToken value.  This mask provides easy access to the necessary mask.
-uint256 constexpr kPAGE_MASK(
+constexpr uint256 kPageMask(
     std::string_view("0000000000000000000000000000000000000000ffffffffffffffffffffffff"));
 
 }  // namespace xrpl::nft
diff --git a/include/xrpl/rdb/DBInit.h b/include/xrpl/rdb/DBInit.h
index 59806b2e85..10b04905f2 100644
--- a/include/xrpl/rdb/DBInit.h
+++ b/include/xrpl/rdb/DBInit.h
@@ -9,20 +9,20 @@ namespace xrpl {
 
 // These pragmas are built at startup and applied to all database
 // connections, unless otherwise noted.
-inline constexpr char const* kCOMMON_DB_PRAGMA_JOURNAL{"PRAGMA journal_mode=%s;"};
-inline constexpr char const* kCOMMON_DB_PRAGMA_SYNC{"PRAGMA synchronous=%s;"};
-inline constexpr char const* kCOMMON_DB_PRAGMA_TEMP{"PRAGMA temp_store=%s;"};
+inline constexpr char const* kCommonDbPragmaJournal{"PRAGMA journal_mode=%s;"};
+inline constexpr char const* kCommonDbPragmaSync{"PRAGMA synchronous=%s;"};
+inline constexpr char const* kCommonDbPragmaTemp{"PRAGMA temp_store=%s;"};
 // A warning will be logged if any lower-safety sqlite tuning settings
 // are used and at least this much ledger history is configured. This
 // includes full history nodes. This is because such a large amount of
 // data will be more difficult to recover if a rare failure occurs,
 // which are more likely with some of the other available tuning settings.
-inline constexpr std::uint32_t kSQLITE_TUNING_CUTOFF = 10'000'000;
+inline constexpr std::uint32_t kSqliteTuningCutoff = 10'000'000;
 
 // Ledger database holds ledgers and ledger confirmations
-inline constexpr auto kLGR_DB_NAME{"ledger.db"};
+inline constexpr auto kLgrDbName{"ledger.db"};
 
-inline constexpr std::array<char const*, 5> kLGR_DB_INIT{
+inline constexpr std::array<char const*, 5> kLgrDbInit{
     {"BEGIN TRANSACTION;",
 
      "CREATE TABLE IF NOT EXISTS Ledgers (           \
@@ -47,9 +47,9 @@ inline constexpr std::array<char const*, 5> kLGR_DB_INIT{
 ////////////////////////////////////////////////////////////////////////////////
 
 // Transaction database holds transactions and public keys
-inline constexpr auto kTX_DB_NAME{"transaction.db"};
+inline constexpr auto kTxDbName{"transaction.db"};
 
-inline constexpr std::array<char const*, 8> kTX_DB_INIT{
+inline constexpr std::array<char const*, 8> kTxDbInit{
     {"BEGIN TRANSACTION;",
 
      "CREATE TABLE IF NOT EXISTS Transactions (          \
@@ -82,9 +82,9 @@ inline constexpr std::array<char const*, 8> kTX_DB_INIT{
 
 ////////////////////////////////////////////////////////////////////////////////
 
-inline constexpr auto kWALLET_DB_NAME{"wallet.db"};
+inline constexpr auto kWalletDbName{"wallet.db"};
 
-inline constexpr std::array<char const*, 6> kWALLET_DB_INIT{
+inline constexpr std::array<char const*, 6> kWalletDbInit{
     {"BEGIN TRANSACTION;",
 
      // A node's identity must be persisted, including
diff --git a/include/xrpl/resource/Fees.h b/include/xrpl/resource/Fees.h
index dc14e3bd4d..55d539ac6a 100644
--- a/include/xrpl/resource/Fees.h
+++ b/include/xrpl/resource/Fees.h
@@ -6,28 +6,27 @@ namespace xrpl::Resource {
 
 /** Schedule of fees charged for imposing load on the server. */
 /** @{ */
-extern Charge const kFEE_MALFORMED_REQUEST;  // A request that we can immediately tell is invalid.
-extern Charge const kFEE_REQUEST_NO_REPLY;   // A request that we cannot satisfy.
-extern Charge const
-    kFEE_INVALID_SIGNATURE;             // An object whose signature we had to check that failed.
-extern Charge const kFEE_USELESS_DATA;  // Data we have no use for.
-extern Charge const kFEE_INVALID_DATA;  // Data we have to verify before rejecting.
+extern Charge const kFeeMalformedRequest;  // A request that we can immediately tell is invalid.
+extern Charge const kFeeRequestNoReply;    // A request that we cannot satisfy.
+extern Charge const kFeeInvalidSignature;  // An object whose signature we had to check that failed.
+extern Charge const kFeeUselessData;       // Data we have no use for.
+extern Charge const kFeeInvalidData;       // Data we have to verify before rejecting.
 
 // RPC loads
-extern Charge const kFEE_MALFORMED_RPC;  // An RPC request that we can immediately tell is invalid.
-extern Charge const kFEE_REFERENCE_RPC;  // A default "reference" unspecified load.
-extern Charge const kFEE_EXCEPTION_RPC;  // RPC load that causes an exception.
-extern Charge const kFEE_MEDIUM_BURDEN_RPC;  // A somewhat burdensome RPC load.
-extern Charge const kFEE_HEAVY_BURDEN_RPC;   // A very burdensome RPC load.
+extern Charge const kFeeMalformedRpc;     // An RPC request that we can immediately tell is invalid.
+extern Charge const kFeeReferenceRpc;     // A default "reference" unspecified load.
+extern Charge const kFeeExceptionRpc;     // RPC load that causes an exception.
+extern Charge const kFeeMediumBurdenRpc;  // A somewhat burdensome RPC load.
+extern Charge const kFeeHeavyBurdenRpc;   // A very burdensome RPC load.
 
 // Peer loads
-extern Charge const kFEE_TRIVIAL_PEER;          // Requires no reply.
-extern Charge const kFEE_MODERATE_BURDEN_PEER;  // Requires some work.
-extern Charge const kFEE_HEAVY_BURDEN_PEER;     // Extensive work.
+extern Charge const kFeeTrivialPeer;         // Requires no reply.
+extern Charge const kFeeModerateBurdenPeer;  // Requires some work.
+extern Charge const kFeeHeavyBurdenPeer;     // Extensive work.
 
 // Administrative
-extern Charge const kFEE_WARNING;  // The cost of receiving a warning.
-extern Charge const kFEE_DROP;     // The cost of being dropped for excess load.
+extern Charge const kFeeWarning;  // The cost of receiving a warning.
+extern Charge const kFeeDrop;     // The cost of being dropped for excess load.
 /** @} */
 
 }  // namespace xrpl::Resource
diff --git a/include/xrpl/resource/detail/Entry.h b/include/xrpl/resource/detail/Entry.h
index 8d9eb89a60..b12bbf36ae 100644
--- a/include/xrpl/resource/detail/Entry.h
+++ b/include/xrpl/resource/detail/Entry.h
@@ -67,7 +67,7 @@ struct Entry : public beast::List<Entry>::Node
     int refcount;
 
     // Exponentially decaying balance of resource consumption
-    DecayingSample<kDECAY_WINDOW_SECONDS, clock_type> local_balance;
+    DecayingSample<kDecayWindowSeconds, clock_type> local_balance;
 
     // Normalized balance contribution from imports
     int remote_balance;
diff --git a/include/xrpl/resource/detail/Logic.h b/include/xrpl/resource/detail/Logic.h
index a1b94433df..7e63baca6c 100644
--- a/include/xrpl/resource/detail/Logic.h
+++ b/include/xrpl/resource/detail/Logic.h
@@ -180,7 +180,7 @@ public:
     json::Value
     getJson()
     {
-        return getJson(kWARNING_THRESHOLD);
+        return getJson(kWarningThreshold);
     }
 
     /** Returns a json::ValueType::Object. */
@@ -243,7 +243,7 @@ public:
         {
             Gossip::Item item;
             item.balance = inboundEntry.local_balance.value(now);
-            if (item.balance >= kMINIMUM_GOSSIP_BALANCE)
+            if (item.balance >= kMinimumGossipBalance)
             {
                 item.address = inboundEntry.key->address;
                 gossip.items.push_back(item);
@@ -270,7 +270,7 @@ public:
             {
                 // This is a new import
                 Import& next(resultIt->second);
-                next.whenExpires = elapsed + kGOSSIP_EXPIRATION_SECONDS;
+                next.whenExpires = elapsed + kGossipExpirationSeconds;
                 next.items.reserve(gossip.items.size());
 
                 for (auto const& gossipItem : gossip.items)
@@ -288,7 +288,7 @@ public:
                 // balances and then deduct the old remote balances.
 
                 Import next;
-                next.whenExpires = elapsed + kGOSSIP_EXPIRATION_SECONDS;
+                next.whenExpires = elapsed + kGossipExpirationSeconds;
                 next.items.reserve(gossip.items.size());
                 for (auto const& gossipItem : gossip.items)
                 {
@@ -363,10 +363,10 @@ public:
     static Disposition
     disposition(int balance)
     {
-        if (balance >= kDROP_THRESHOLD)
+        if (balance >= kDropThreshold)
             return Disposition::Drop;
 
-        if (balance >= kWARNING_THRESHOLD)
+        if (balance >= kWarningThreshold)
             return Disposition::Warn;
 
         return Disposition::Ok;
@@ -417,26 +417,25 @@ public:
                     // LCOV_EXCL_STOP
             }
             inactive_.pushBack(entry);
-            entry.whenExpires = clock_.now() + kSECONDS_UNTIL_EXPIRATION;
+            entry.whenExpires = clock_.now() + kSecondsUntilExpiration;
         }
     }
 
     Disposition
     charge(Entry& entry, Charge const& fee, std::string context = {})
     {
-        static constexpr Charge::value_type kFEE_LOG_AS_WARN = 3000;
-        static constexpr Charge::value_type kFEE_LOG_AS_INFO = 1000;
-        static constexpr Charge::value_type kFEE_LOG_AS_DEBUG = 100;
+        static constexpr Charge::value_type kFeeLogAsWarn = 3000;
+        static constexpr Charge::value_type kFeeLogAsInfo = 1000;
+        static constexpr Charge::value_type kFeeLogAsDebug = 100;
         static_assert(
-            kFEE_LOG_AS_WARN > kFEE_LOG_AS_INFO && kFEE_LOG_AS_INFO > kFEE_LOG_AS_DEBUG &&
-            kFEE_LOG_AS_DEBUG > 10);
+            kFeeLogAsWarn > kFeeLogAsInfo && kFeeLogAsInfo > kFeeLogAsDebug && kFeeLogAsDebug > 10);
 
-        static auto kGET_STREAM = [](Resource::Charge::value_type cost, beast::Journal& journal) {
-            if (cost >= kFEE_LOG_AS_WARN)
+        static auto kGetStream = [](Resource::Charge::value_type cost, beast::Journal& journal) {
+            if (cost >= kFeeLogAsWarn)
                 return journal.warn();
-            if (cost >= kFEE_LOG_AS_INFO)
+            if (cost >= kFeeLogAsInfo)
                 return journal.info();
-            if (cost >= kFEE_LOG_AS_DEBUG)
+            if (cost >= kFeeLogAsDebug)
                 return journal.debug();
             return journal.trace();
         };
@@ -447,8 +446,7 @@ public:
         std::scoped_lock const _(lock_);
         clock_type::time_point const now(clock_.now());
         int const balance(entry.add(fee.cost(), now));
-        JLOG(kGET_STREAM(fee.cost(), journal_))
-            << "Charging " << entry << " for " << fee << context;
+        JLOG(kGetStream(fee.cost(), journal_)) << "Charging " << entry << " for " << fee << context;
         return disposition(balance);
     }
 
@@ -461,9 +459,9 @@ public:
         std::scoped_lock const _(lock_);
         bool notify(false);
         auto const elapsed = clock_.now();
-        if (entry.balance(clock_.now()) >= kWARNING_THRESHOLD && elapsed != entry.lastWarningTime)
+        if (entry.balance(clock_.now()) >= kWarningThreshold && elapsed != entry.lastWarningTime)
         {
-            charge(entry, kFEE_WARNING);
+            charge(entry, kFeeWarning);
             notify = true;
             entry.lastWarningTime = elapsed;
         }
@@ -485,15 +483,15 @@ public:
         bool drop(false);
         clock_type::time_point const now(clock_.now());
         int const balance(entry.balance(now));
-        if (balance >= kDROP_THRESHOLD)
+        if (balance >= kDropThreshold)
         {
             JLOG(journal_.warn()) << "Consumer entry " << entry << " dropped with balance "
-                                  << balance << " at or above drop threshold " << kDROP_THRESHOLD;
+                                  << balance << " at or above drop threshold " << kDropThreshold;
 
             // Adding feeDrop at this point keeps the dropped connection
             // from re-connecting for at least a little while after it is
             // dropped.
-            charge(entry, kFEE_DROP);
+            charge(entry, kFeeDrop);
             ++stats_.drop;
             drop = true;
         }
diff --git a/include/xrpl/resource/detail/Tuning.h b/include/xrpl/resource/detail/Tuning.h
index 2678b8a1ca..7b2046f45c 100644
--- a/include/xrpl/resource/detail/Tuning.h
+++ b/include/xrpl/resource/detail/Tuning.h
@@ -7,21 +7,21 @@ namespace xrpl::Resource {
 /** Tunable constants. */
 
 // balance at which a warning is issued
-static constexpr auto kWARNING_THRESHOLD = 5000;
+static constexpr auto kWarningThreshold = 5000;
 
 // balance at which the consumer is disconnected
-static constexpr auto kDROP_THRESHOLD = 25000;
+static constexpr auto kDropThreshold = 25000;
 
 // seconds in exponential decay window (power of two)
-static constexpr auto kDECAY_WINDOW_SECONDS = 32;
+static constexpr auto kDecayWindowSeconds = 32;
 
 // minimum balance to include a load source in gossip
-static constexpr auto kMINIMUM_GOSSIP_BALANCE = 1000;
+static constexpr auto kMinimumGossipBalance = 1000;
 
 // The number of seconds until an inactive table item is removed
-static constexpr std::chrono::seconds kSECONDS_UNTIL_EXPIRATION{300};
+static constexpr std::chrono::seconds kSecondsUntilExpiration{300};
 
 // Number of seconds until imported gossip expires
-static constexpr std::chrono::seconds kGOSSIP_EXPIRATION_SECONDS{30};
+static constexpr std::chrono::seconds kGossipExpirationSeconds{30};
 
 }  // namespace xrpl::Resource
diff --git a/include/xrpl/server/LoadFeeTrack.h b/include/xrpl/server/LoadFeeTrack.h
index 5ad3972836..aa32e70ac8 100644
--- a/include/xrpl/server/LoadFeeTrack.h
+++ b/include/xrpl/server/LoadFeeTrack.h
@@ -63,7 +63,7 @@ public:
     static std::uint32_t
     getLoadBase()
     {
-        return kLFT_NORMAL_FEE;
+        return kLftNormalFee;
     }
 
     std::uint32_t
@@ -100,29 +100,29 @@ public:
     isLoadedLocal() const
     {
         std::scoped_lock const sl(lock_);
-        return (raiseCount_ != 0) || (localTxnLoadFee_ != kLFT_NORMAL_FEE);
+        return (raiseCount_ != 0) || (localTxnLoadFee_ != kLftNormalFee);
     }
 
     bool
     isLoadedCluster() const
     {
         std::scoped_lock const sl(lock_);
-        return (raiseCount_ != 0) || (localTxnLoadFee_ != kLFT_NORMAL_FEE) ||
-            (clusterTxnLoadFee_ != kLFT_NORMAL_FEE);
+        return (raiseCount_ != 0) || (localTxnLoadFee_ != kLftNormalFee) ||
+            (clusterTxnLoadFee_ != kLftNormalFee);
     }
 
 private:
-    static std::uint32_t constexpr kLFT_NORMAL_FEE = 256;  // 256 is the minimum/normal load factor
-    static std::uint32_t constexpr kLFT_FEE_INC_FRACTION = 4;  // increase fee by 1/4
-    static std::uint32_t constexpr kLFT_FEE_DEC_FRACTION = 4;  // decrease fee by 1/4
-    static std::uint32_t constexpr kLFT_FEE_MAX = kLFT_NORMAL_FEE * 1000000;
+    static constexpr std::uint32_t kLftNormalFee = 256;     // 256 is the minimum/normal load factor
+    static constexpr std::uint32_t kLftFeeIncFraction = 4;  // increase fee by 1/4
+    static constexpr std::uint32_t kLftFeeDecFraction = 4;  // decrease fee by 1/4
+    static constexpr std::uint32_t kLftFeeMax = kLftNormalFee * 1000000;
 
     beast::Journal const j_;
     std::mutex mutable lock_;
 
-    std::uint32_t localTxnLoadFee_{kLFT_NORMAL_FEE};    // Scale factor, lftNormalFee = normal fee
-    std::uint32_t remoteTxnLoadFee_{kLFT_NORMAL_FEE};   // Scale factor, lftNormalFee = normal fee
-    std::uint32_t clusterTxnLoadFee_{kLFT_NORMAL_FEE};  // Scale factor, lftNormalFee = normal fee
+    std::uint32_t localTxnLoadFee_{kLftNormalFee};    // Scale factor, lftNormalFee = normal fee
+    std::uint32_t remoteTxnLoadFee_{kLftNormalFee};   // Scale factor, lftNormalFee = normal fee
+    std::uint32_t clusterTxnLoadFee_{kLftNormalFee};  // Scale factor, lftNormalFee = normal fee
     std::uint32_t raiseCount_{0};
 };
 
diff --git a/include/xrpl/server/detail/BaseHTTPPeer.h b/include/xrpl/server/detail/BaseHTTPPeer.h
index 2cb1156cbb..04ec4862c6 100644
--- a/include/xrpl/server/detail/BaseHTTPPeer.h
+++ b/include/xrpl/server/detail/BaseHTTPPeer.h
@@ -38,9 +38,9 @@ protected:
     using endpoint_type = boost::asio::ip::tcp::endpoint;
     using yield_context = boost::asio::yield_context;
 
-    static constexpr auto kBUFFER_SIZE = 4 * 1024;     // size of read/write buffer
-    static constexpr auto kTIMEOUT_SECONDS = 30;       // max seconds without completing a message
-    static constexpr auto kTIMEOUT_SECONDS_LOCAL = 3;  // used for localhost clients
+    static constexpr auto kBufferSize = 4 * 1024;    // size of read/write buffer
+    static constexpr auto kTimeoutSeconds = 30;      // max seconds without completing a message
+    static constexpr auto kTimeoutSecondsLocal = 3;  // used for localhost clients
 
     struct Buffer
     {
@@ -196,8 +196,8 @@ BaseHTTPPeer<Handler, Impl>::BaseHTTPPeer(
 {
     read_buf_.commit(
         boost::asio::buffer_copy(read_buf_.prepare(boost::asio::buffer_size(buffers)), buffers));
-    static std::atomic<int> kSID;
-    nid_ = ++kSID;
+    static std::atomic<int> kSid;
+    nid_ = ++kSid;
     id_ = std::string("#") + std::to_string(nid_) + " ";
     JLOG(journal_.trace()) << id_ << "accept:    " << remote_address_.address();
 }
@@ -245,8 +245,7 @@ BaseHTTPPeer<Handler, Impl>::startTimer()
     boost::beast::get_lowest_layer(impl().stream_)
         .expires_after(
             std::chrono::seconds(
-                remote_address_.address().is_loopback() ? kTIMEOUT_SECONDS_LOCAL
-                                                        : kTIMEOUT_SECONDS));
+                remote_address_.address().is_loopback() ? kTimeoutSecondsLocal : kTimeoutSeconds));
 }
 
 // Convenience for discarding the error code
@@ -358,7 +357,7 @@ BaseHTTPPeer<Handler, Impl>::doWriter(
 
     for (;;)
     {
-        if (!writer->prepare(kBUFFER_SIZE, resume))
+        if (!writer->prepare(kBufferSize, resume))
             return;
         error_code ec;
         auto const bytesTransferred = boost::asio::async_write(
diff --git a/include/xrpl/server/detail/BaseWSPeer.h b/include/xrpl/server/detail/BaseWSPeer.h
index 0d592ff09f..181cf41f81 100644
--- a/include/xrpl/server/detail/BaseWSPeer.h
+++ b/include/xrpl/server/detail/BaseWSPeer.h
@@ -368,12 +368,12 @@ void
 BaseWSPeer<Handler, Impl>::startTimer()
 {
     // Max seconds without completing a message
-    static constexpr std::chrono::seconds kTIMEOUT{30};
-    static constexpr std::chrono::seconds kTIMEOUT_LOCAL{3};
+    static constexpr std::chrono::seconds kTimeout{30};
+    static constexpr std::chrono::seconds kTimeoutLocal{3};
 
     try
     {
-        timer_.expires_after(remoteEndpoint().address().is_loopback() ? kTIMEOUT_LOCAL : kTIMEOUT);
+        timer_.expires_after(remoteEndpoint().address().is_loopback() ? kTimeoutLocal : kTimeout);
     }
     catch (boost::system::system_error const& e)
     {
diff --git a/include/xrpl/server/detail/Door.h b/include/xrpl/server/detail/Door.h
index f1a622b173..d3fff8b476 100644
--- a/include/xrpl/server/detail/Door.h
+++ b/include/xrpl/server/detail/Door.h
@@ -95,11 +95,11 @@ private:
     bool plain_{
         port_.protocol.count("http") > 0 || port_.protocol.count("ws") > 0 ||
         (port_.protocol.count("ws2") != 0u)};
-    static constexpr std::chrono::milliseconds kINITIAL_ACCEPT_DELAY{50};
-    static constexpr std::chrono::milliseconds kMAX_ACCEPT_DELAY{2000};
-    std::chrono::milliseconds accept_delay_{kINITIAL_ACCEPT_DELAY};
+    static constexpr std::chrono::milliseconds kInitialAcceptDelay{50};
+    static constexpr std::chrono::milliseconds kMaxAcceptDelay{2000};
+    std::chrono::milliseconds accept_delay_{kInitialAcceptDelay};
     boost::asio::steady_timer backoff_timer_;
-    static constexpr double kFREE_FD_THRESHOLD = 0.70;
+    static constexpr double kFreeFdThreshold = 0.70;
 
     struct FDStats
     {
@@ -341,7 +341,7 @@ Door<Handler>::doAccept(boost::asio::yield_context doYield)
             backoff_timer_.expires_after(accept_delay_);
             boost::system::error_code tec;
             backoff_timer_.async_wait(doYield[tec]);
-            accept_delay_ = std::min(accept_delay_ * 2, kMAX_ACCEPT_DELAY);
+            accept_delay_ = std::min(accept_delay_ * 2, kMaxAcceptDelay);
             JLOG(j_.warn()) << "Throttling do_accept for " << accept_delay_.count() << "ms.";
             continue;
         }
@@ -366,7 +366,7 @@ Door<Handler>::doAccept(boost::asio::yield_context doYield)
                 boost::system::error_code tec;
                 backoff_timer_.async_wait(doYield[tec]);
 
-                accept_delay_ = std::min(accept_delay_ * 2, kMAX_ACCEPT_DELAY);
+                accept_delay_ = std::min(accept_delay_ * 2, kMaxAcceptDelay);
             }
             else
             {
@@ -375,7 +375,7 @@ Door<Handler>::doAccept(boost::asio::yield_context doYield)
             continue;
         }
 
-        accept_delay_ = kINITIAL_ACCEPT_DELAY;
+        accept_delay_ = kInitialAcceptDelay;
 
         if (ssl_ && plain_)
         {
@@ -403,11 +403,11 @@ Door<Handler>::queryFdStats() const
         return std::nullopt;
     s.limit = static_cast<std::uint64_t>(rl.rlim_cur);
 #if BOOST_OS_LINUX
-    constexpr char const* kFD_DIR = "/proc/self/fd";
+    static constexpr char const* kFdDir = "/proc/self/fd";
 #else
-    constexpr char const* kFD_DIR = "/dev/fd";
+    static constexpr char const* kFdDir = "/dev/fd";
 #endif
-    if (DIR* d = ::opendir(kFD_DIR))
+    if (DIR* d = ::opendir(kFdDir))
     {
         std::uint64_t cnt = 0;
         while (::readdir(d) != nullptr)
@@ -435,7 +435,7 @@ Door<Handler>::shouldThrottleForFds()
     auto const& s = *stats;
     auto const free = (s.limit > s.used) ? (s.limit - s.used) : 0ull;
     double const freeRatio = static_cast<double>(free) / static_cast<double>(s.limit);
-    return freeRatio < kFREE_FD_THRESHOLD;
+    return freeRatio < kFreeFdThreshold;
 #endif
 }
 
diff --git a/include/xrpl/server/detail/ServerImpl.h b/include/xrpl/server/detail/ServerImpl.h
index 6eca1de6f2..df9a2dd3e8 100644
--- a/include/xrpl/server/detail/ServerImpl.h
+++ b/include/xrpl/server/detail/ServerImpl.h
@@ -62,7 +62,7 @@ class ServerImpl : public Server
 private:
     using clock_type = std::chrono::system_clock;
 
-    static constexpr auto kHISTORY_SIZE = 100;
+    static constexpr auto kHistorySize = 100;
 
     Handler& handler_;
     beast::Journal const j_;
diff --git a/include/xrpl/server/detail/Spawn.h b/include/xrpl/server/detail/Spawn.h
index 50760be761..2560a2718b 100644
--- a/include/xrpl/server/detail/Spawn.h
+++ b/include/xrpl/server/detail/Spawn.h
@@ -25,7 +25,7 @@ concept IsStrand = std::
  *
  * @param ePtr The exception that was caught on the coroutine
  */
-inline constexpr auto kPROPAGATE_EXCEPTIONS = [](std::exception_ptr ePtr) {
+inline constexpr auto kPropagateExceptions = [](std::exception_ptr ePtr) {
     if (ePtr)
     {
         try
@@ -50,7 +50,7 @@ inline constexpr auto kPROPAGATE_EXCEPTIONS = [](std::exception_ptr ePtr) {
 /**
  * @brief Spawns a coroutine using `boost::asio::spawn`
  *
- * @note This uses kPROPAGATE_EXCEPTIONS to force asio to propagate exceptions
+ * @note This uses kPropagateExceptions to force asio to propagate exceptions
  * through `io_context`
  * @note Since implicit strand was removed from boost::asio::spawn this helper
  * function adds the strand back
@@ -68,14 +68,14 @@ spawn(Ctx&& ctx, F&& func)
     if constexpr (impl::IsStrand<Ctx>)
     {
         boost::asio::spawn(
-            std::forward<Ctx>(ctx), std::forward<F>(func), impl::kPROPAGATE_EXCEPTIONS);
+            std::forward<Ctx>(ctx), std::forward<F>(func), impl::kPropagateExceptions);
     }
     else
     {
         boost::asio::spawn(
             boost::asio::make_strand(boost::asio::get_associated_executor(std::forward<Ctx>(ctx))),
             std::forward<F>(func),
-            impl::kPROPAGATE_EXCEPTIONS);
+            impl::kPropagateExceptions);
     }
 }
 
diff --git a/include/xrpl/shamap/FullBelowCache.h b/include/xrpl/shamap/FullBelowCache.h
index c52434ca05..07290dfbd1 100644
--- a/include/xrpl/shamap/FullBelowCache.h
+++ b/include/xrpl/shamap/FullBelowCache.h
@@ -22,7 +22,7 @@ private:
     using CacheType = KeyCache;
 
 public:
-    static constexpr auto kDEFAULT_CACHE_TARGET_SIZE = 0;
+    static constexpr auto kDefaultCacheTargetSize = 0;
 
     using key_type = uint256;
     using clock_type = typename CacheType::clock_type;
@@ -39,7 +39,7 @@ public:
         clock_type& clock,
         beast::Journal j,
         beast::insight::Collector::ptr const& collector = beast::insight::NullCollector::make(),
-        std::size_t targetSize = kDEFAULT_CACHE_TARGET_SIZE,
+        std::size_t targetSize = kDefaultCacheTargetSize,
         std::chrono::seconds expiration = std::chrono::minutes{2})
         : cache_(name, targetSize, expiration, clock, j, collector), gen_(1)
     {
diff --git a/include/xrpl/shamap/SHAMap.h b/include/xrpl/shamap/SHAMap.h
index cca800fa40..f63fc95b27 100644
--- a/include/xrpl/shamap/SHAMap.h
+++ b/include/xrpl/shamap/SHAMap.h
@@ -94,10 +94,10 @@ private:
 public:
     /** Number of children each non-leaf node has (the 'radix tree' part of the
      * map) */
-    static constexpr unsigned int kBRANCH_FACTOR = SHAMapInnerNode::kBRANCH_FACTOR;
+    static constexpr unsigned int kBranchFactor = SHAMapInnerNode::kBranchFactor;
 
     /** The depth of the hash map: data is only present in the leaves */
-    static constexpr unsigned int kLEAF_DEPTH = 64;
+    static constexpr unsigned int kLeafDepth = 64;
 
     using DeltaItem =
         std::pair<boost::intrusive_ptr<SHAMapItem const>, boost::intrusive_ptr<SHAMapItem const>>;
@@ -390,7 +390,7 @@ private:
     lastBelow(
         intr_ptr::SharedPtr<SHAMapTreeNode> node,
         SharedPtrNodeStack& stack,
-        int branch = kBRANCH_FACTOR) const;
+        int branch = kBranchFactor) const;
 
     // helper function for firstBelow and lastBelow
     SHAMapLeafNode*
diff --git a/include/xrpl/shamap/SHAMapAccountStateLeafNode.h b/include/xrpl/shamap/SHAMapAccountStateLeafNode.h
index c006b2de37..c67b32d4e7 100644
--- a/include/xrpl/shamap/SHAMapAccountStateLeafNode.h
+++ b/include/xrpl/shamap/SHAMapAccountStateLeafNode.h
@@ -50,7 +50,7 @@ public:
     {
         s.addRaw(item_->slice());
         s.addBitString(item_->key());
-        s.add8(kWIRE_TYPE_ACCOUNT_STATE);
+        s.add8(kWireTypeAccountState);
     }
 
     void
diff --git a/include/xrpl/shamap/SHAMapInnerNode.h b/include/xrpl/shamap/SHAMapInnerNode.h
index ee2a18bf03..48416a93e6 100644
--- a/include/xrpl/shamap/SHAMapInnerNode.h
+++ b/include/xrpl/shamap/SHAMapInnerNode.h
@@ -15,7 +15,7 @@ class SHAMapInnerNode final : public SHAMapTreeNode, public CountedObject<SHAMap
 {
 public:
     /** Each inner node has 16 children (the 'radix tree' part of the map) */
-    static constexpr unsigned int kBRANCH_FACTOR = 16;
+    static constexpr unsigned int kBranchFactor = 16;
 
 private:
     /** Opaque type that contains the `hashes` array (array of type
diff --git a/include/xrpl/shamap/SHAMapTreeNode.h b/include/xrpl/shamap/SHAMapTreeNode.h
index ac48df8d46..ee74155ac4 100644
--- a/include/xrpl/shamap/SHAMapTreeNode.h
+++ b/include/xrpl/shamap/SHAMapTreeNode.h
@@ -15,14 +15,14 @@ namespace xrpl {
 
 // These are wire-protocol identifiers used during serialization to encode the
 // type of a node. They should not be arbitrarily be changed.
-static constexpr unsigned char const kWIRE_TYPE_TRANSACTION = 0;
-static constexpr unsigned char const kWIRE_TYPE_ACCOUNT_STATE = 1;
-static constexpr unsigned char const kWIRE_TYPE_INNER = 2;
-static constexpr unsigned char const kWIRE_TYPE_COMPRESSED_INNER = 3;
-static constexpr unsigned char const kWIRE_TYPE_TRANSACTION_WITH_META = 4;
+static constexpr unsigned char const kWireTypeTransaction = 0;
+static constexpr unsigned char const kWireTypeAccountState = 1;
+static constexpr unsigned char const kWireTypeInner = 2;
+static constexpr unsigned char const kWireTypeCompressedInner = 3;
+static constexpr unsigned char const kWireTypeTransactionWithMeta = 4;
 
 // Lower bound on SHAMap leaf item payload size, in bytes.
-inline constexpr std::size_t kMIN_SHA_MAP_ITEM_BYTES = 12;
+inline constexpr std::size_t kMinShaMapItemBytes = 12;
 
 enum class SHAMapNodeType {
     TnInner = 1,
diff --git a/include/xrpl/shamap/SHAMapTxLeafNode.h b/include/xrpl/shamap/SHAMapTxLeafNode.h
index eaac104c7e..72be5b1962 100644
--- a/include/xrpl/shamap/SHAMapTxLeafNode.h
+++ b/include/xrpl/shamap/SHAMapTxLeafNode.h
@@ -48,7 +48,7 @@ public:
     serializeForWire(Serializer& s) const final
     {
         s.addRaw(item_->slice());
-        s.add8(kWIRE_TYPE_TRANSACTION);
+        s.add8(kWireTypeTransaction);
     }
 
     void
diff --git a/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h b/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
index 5cf5b723b0..44562aeaba 100644
--- a/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
+++ b/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
@@ -50,7 +50,7 @@ public:
     {
         s.addRaw(item_->slice());
         s.addBitString(item_->key());
-        s.add8(kWIRE_TYPE_TRANSACTION_WITH_META);
+        s.add8(kWireTypeTransactionWithMeta);
     }
 
     void
diff --git a/include/xrpl/shamap/detail/TaggedPointer.h b/include/xrpl/shamap/detail/TaggedPointer.h
index d3c0a6542f..94dbe95284 100644
--- a/include/xrpl/shamap/detail/TaggedPointer.h
+++ b/include/xrpl/shamap/detail/TaggedPointer.h
@@ -47,9 +47,9 @@ private:
     */
     std::uintptr_t tp_ = 0;
     /** bit-and with this mask to get the tag bits (lowest two bits) */
-    static constexpr std::uintptr_t kTAG_MASK = 3;
+    static constexpr std::uintptr_t kTagMask = 3;
     /** bit-and with this mask to get the pointer bits (mask out the tag) */
-    static constexpr std::uintptr_t kPTR_MASK = ~kTAG_MASK;
+    static constexpr std::uintptr_t kPtrMask = ~kTagMask;
 
     /** Deallocate memory and run destructors */
     void
@@ -205,7 +205,7 @@ popcnt16(std::uint16_t a)
     return __builtin_popcount(a);
 #else
     // fallback to table lookup
-    static auto constexpr const tbl = []() {
+    static constexpr auto tbl = []() {
         std::array<std::uint8_t, 256> ret{};
         for (int i = 0; i != 256; ++i)
         {
diff --git a/include/xrpl/shamap/detail/TaggedPointer.ipp b/include/xrpl/shamap/detail/TaggedPointer.ipp
index d4b5ca3365..2e6e31fed8 100644
--- a/include/xrpl/shamap/detail/TaggedPointer.ipp
+++ b/include/xrpl/shamap/detail/TaggedPointer.ipp
@@ -14,130 +14,130 @@ namespace {
 // Given n children, an array of size `*std::lower_bound(boundaries.begin(),
 // boundaries.end(), n);` is used to store the children. Note that the last
 // element must be the number of children in a dense array.
-constexpr std::array<std::uint8_t, 4> kBOUNDARIES{2, 4, 6, SHAMapInnerNode::kBRANCH_FACTOR};
+constexpr std::array<std::uint8_t, 4> kBoundaries{2, 4, 6, SHAMapInnerNode::kBranchFactor};
 static_assert(
-    kBOUNDARIES.size() <= 4,
+    kBoundaries.size() <= 4,
     "The hashesAndChildren member uses a tagged array format with two bits "
     "reserved for the tag. This supports at most 4 values.");
 static_assert(
-    kBOUNDARIES.back() == SHAMapInnerNode::kBRANCH_FACTOR,
+    kBoundaries.back() == SHAMapInnerNode::kBranchFactor,
     "Last element of boundaries must be number of children in a dense array");
 
 // Terminology: A chunk is the memory being allocated from a block. A block
 // contains multiple chunks. This is the terminology the boost documentation
 // uses. Pools use "Simple Segregated Storage" as their storage format.
-constexpr size_t kELEMENT_SIZE_BYTES =
+constexpr size_t kElementSizeBytes =
     (sizeof(SHAMapHash) + sizeof(intr_ptr::SharedPtr<SHAMapTreeNode>));
 
-constexpr size_t kBLOCK_SIZE_BYTES = kilobytes(512);
+constexpr size_t kBlockSizeBytes = kilobytes(512);
 
 template <std::size_t... I>
-constexpr std::array<size_t, kBOUNDARIES.size()>
+constexpr std::array<size_t, kBoundaries.size()>
 initArrayChunkSizeBytes(std::index_sequence<I...>)
 {
-    return std::array<size_t, kBOUNDARIES.size()>{
-        kBOUNDARIES[I] * kELEMENT_SIZE_BYTES...,
+    return std::array<size_t, kBoundaries.size()>{
+        kBoundaries[I] * kElementSizeBytes...,
     };
 }
-constexpr auto kARRAY_CHUNK_SIZE_BYTES =
-    initArrayChunkSizeBytes(std::make_index_sequence<kBOUNDARIES.size()>{});
+constexpr auto kArrayChunkSizeBytes =
+    initArrayChunkSizeBytes(std::make_index_sequence<kBoundaries.size()>{});
 
 template <std::size_t... I>
-constexpr std::array<size_t, kBOUNDARIES.size()>
+constexpr std::array<size_t, kBoundaries.size()>
 initArrayChunksPerBlock(std::index_sequence<I...>)
 {
-    return std::array<size_t, kBOUNDARIES.size()>{
-        kBLOCK_SIZE_BYTES / kARRAY_CHUNK_SIZE_BYTES[I]...,
+    return std::array<size_t, kBoundaries.size()>{
+        kBlockSizeBytes / kArrayChunkSizeBytes[I]...,
     };
 }
-constexpr auto kCHUNKS_PER_BLOCK =
-    initArrayChunksPerBlock(std::make_index_sequence<kBOUNDARIES.size()>{});
+constexpr auto kChunksPerBlock =
+    initArrayChunksPerBlock(std::make_index_sequence<kBoundaries.size()>{});
 
 [[nodiscard]] inline std::uint8_t
 numAllocatedChildren(std::uint8_t n)
 {
-    XRPL_ASSERT(n <= SHAMapInnerNode::kBRANCH_FACTOR, "xrpl::numAllocatedChildren : valid input");
-    return *std::ranges::lower_bound(kBOUNDARIES, n);
+    XRPL_ASSERT(n <= SHAMapInnerNode::kBranchFactor, "xrpl::numAllocatedChildren : valid input");
+    return *std::ranges::lower_bound(kBoundaries, n);
 }
 
 [[nodiscard]] inline std::size_t
 boundariesIndex(std::uint8_t numChildren)
 {
     XRPL_ASSERT(
-        numChildren <= SHAMapInnerNode::kBRANCH_FACTOR, "xrpl::boundariesIndex : valid input");
-    return std::distance(kBOUNDARIES.begin(), std::ranges::lower_bound(kBOUNDARIES, numChildren));
+        numChildren <= SHAMapInnerNode::kBranchFactor, "xrpl::boundariesIndex : valid input");
+    return std::distance(kBoundaries.begin(), std::ranges::lower_bound(kBoundaries, numChildren));
 }
 
 template <std::size_t... I>
-std::array<std::function<void*()>, kBOUNDARIES.size()>
+std::array<std::function<void*()>, kBoundaries.size()>
 initAllocateArrayFuns(std::index_sequence<I...>)
 {
-    return std::array<std::function<void*()>, kBOUNDARIES.size()>{
+    return std::array<std::function<void*()>, kBoundaries.size()>{
         boost::singleton_pool<
             boost::fast_pool_allocator_tag,
-            kARRAY_CHUNK_SIZE_BYTES[I],
+            kArrayChunkSizeBytes[I],
             boost::default_user_allocator_new_delete,
             std::mutex,
-            kCHUNKS_PER_BLOCK[I],
-            kCHUNKS_PER_BLOCK[I]>::malloc...,
+            kChunksPerBlock[I],
+            kChunksPerBlock[I]>::malloc...,
     };
 }
-std::array<std::function<void*()>, kBOUNDARIES.size()> const kALLOCATE_ARRAY_FUNS =
-    initAllocateArrayFuns(std::make_index_sequence<kBOUNDARIES.size()>{});
+std::array<std::function<void*()>, kBoundaries.size()> const kAllocateArrayFuns =
+    initAllocateArrayFuns(std::make_index_sequence<kBoundaries.size()>{});
 
 template <std::size_t... I>
-std::array<std::function<void(void*)>, kBOUNDARIES.size()>
+std::array<std::function<void(void*)>, kBoundaries.size()>
 initFreeArrayFuns(std::index_sequence<I...>)
 {
-    return std::array<std::function<void(void*)>, kBOUNDARIES.size()>{
+    return std::array<std::function<void(void*)>, kBoundaries.size()>{
         static_cast<void (*)(void*)>(boost::singleton_pool<
                                      boost::fast_pool_allocator_tag,
-                                     kARRAY_CHUNK_SIZE_BYTES[I],
+                                     kArrayChunkSizeBytes[I],
                                      boost::default_user_allocator_new_delete,
                                      std::mutex,
-                                     kCHUNKS_PER_BLOCK[I],
-                                     kCHUNKS_PER_BLOCK[I]>::free)...,
+                                     kChunksPerBlock[I],
+                                     kChunksPerBlock[I]>::free)...,
     };
 }
-std::array<std::function<void(void*)>, kBOUNDARIES.size()> const kFREE_ARRAY_FUNS =
-    initFreeArrayFuns(std::make_index_sequence<kBOUNDARIES.size()>{});
+std::array<std::function<void(void*)>, kBoundaries.size()> const kFreeArrayFuns =
+    initFreeArrayFuns(std::make_index_sequence<kBoundaries.size()>{});
 
 template <std::size_t... I>
-std::array<std::function<bool(void*)>, kBOUNDARIES.size()>
+std::array<std::function<bool(void*)>, kBoundaries.size()>
 initIsFromArrayFuns(std::index_sequence<I...>)
 {
-    return std::array<std::function<bool(void*)>, kBOUNDARIES.size()>{
+    return std::array<std::function<bool(void*)>, kBoundaries.size()>{
         boost::singleton_pool<
             boost::fast_pool_allocator_tag,
-            kARRAY_CHUNK_SIZE_BYTES[I],
+            kArrayChunkSizeBytes[I],
             boost::default_user_allocator_new_delete,
             std::mutex,
-            kCHUNKS_PER_BLOCK[I],
-            kCHUNKS_PER_BLOCK[I]>::is_from...,
+            kChunksPerBlock[I],
+            kChunksPerBlock[I]>::is_from...,
     };
 }
-std::array<std::function<bool(void*)>, kBOUNDARIES.size()> const kIS_FROM_ARRAY_FUNS =
-    initIsFromArrayFuns(std::make_index_sequence<kBOUNDARIES.size()>{});
+std::array<std::function<bool(void*)>, kBoundaries.size()> const kIsFromArrayFuns =
+    initIsFromArrayFuns(std::make_index_sequence<kBoundaries.size()>{});
 
 // This function returns an untagged pointer
 [[nodiscard]] inline std::pair<std::uint8_t, void*>
 allocateArrays(std::uint8_t numChildren)
 {
     auto const i = boundariesIndex(numChildren);
-    return {i, kALLOCATE_ARRAY_FUNS[i]()};
+    return {i, kAllocateArrayFuns[i]()};
 }
 
 // This function takes an untagged pointer
 inline void
 deallocateArrays(std::uint8_t boundaryIndex, void* p)
 {
-    XRPL_ASSERT(kIS_FROM_ARRAY_FUNS[boundaryIndex](p), "xrpl::deallocateArrays : valid inputs");
-    kFREE_ARRAY_FUNS[boundaryIndex](p);
+    XRPL_ASSERT(kIsFromArrayFuns[boundaryIndex](p), "xrpl::deallocateArrays : valid inputs");
+    kFreeArrayFuns[boundaryIndex](p);
 }
 
 // Used in `iterChildren` and elsewhere as the hash value for sparse arrays when
 // the hash isn't actually stored in the array.
-SHAMapHash const kZERO_SHA_MAP_HASH;
+SHAMapHash const kZeroShaMapHash;
 
 }  // namespace
 
@@ -146,17 +146,17 @@ void
 TaggedPointer::iterChildren(std::uint16_t isBranch, F&& f) const
 {
     auto [numAllocated, hashes, _] = getHashesAndChildren();
-    if (numAllocated == SHAMapInnerNode::kBRANCH_FACTOR)
+    if (numAllocated == SHAMapInnerNode::kBranchFactor)
     {
         // dense case
-        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBranchFactor; ++i)
             f(hashes[i]);
     }
     else
     {
         // sparse case
         int curHashI = 0;
-        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBranchFactor; ++i)
         {
             if ((1 << i) & isBranch)
             {
@@ -164,7 +164,7 @@ TaggedPointer::iterChildren(std::uint16_t isBranch, F&& f) const
             }
             else
             {
-                f(kZERO_SHA_MAP_HASH);
+                f(kZeroShaMapHash);
             }
         }
     }
@@ -174,10 +174,10 @@ template <class F>
 void
 TaggedPointer::iterNonEmptyChildIndexes(std::uint16_t isBranch, F&& f) const
 {
-    if (capacity() == SHAMapInnerNode::kBRANCH_FACTOR)
+    if (capacity() == SHAMapInnerNode::kBranchFactor)
     {
         // dense case
-        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBranchFactor; ++i)
         {
             if ((1 << i) & isBranch)
             {
@@ -189,7 +189,7 @@ TaggedPointer::iterNonEmptyChildIndexes(std::uint16_t isBranch, F&& f) const
     {
         // sparse case
         int curHashI = 0;
-        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBranchFactor; ++i)
         {
             if ((1 << i) & isBranch)
             {
@@ -247,11 +247,11 @@ inline TaggedPointer::TaggedPointer(RawAllocateTag, std::uint8_t numChildren)
 {
     auto [tag, p] = allocateArrays(numChildren);
     XRPL_ASSERT(
-        tag < kBOUNDARIES.size(),
+        tag < kBoundaries.size(),
         "xrpl::TaggedPointer::TaggedPointer(RawAllocateTag, std::uint8_t) : "
         "maximum tag");
     XRPL_ASSERT(
-        (reinterpret_cast<std::uintptr_t>(p) & kPTR_MASK) == reinterpret_cast<std::uintptr_t>(p),
+        (reinterpret_cast<std::uintptr_t>(p) & kPtrMask) == reinterpret_cast<std::uintptr_t>(p),
         "xrpl::TaggedPointer::TaggedPointer(RawAllocateTag, std::uint8_t) : "
         "valid pointer");
     tp_ = reinterpret_cast<std::uintptr_t>(p) + tag;
@@ -275,7 +275,7 @@ inline TaggedPointer::TaggedPointer(
         auto [srcDstNumAllocated, srcDstHashes, srcDstChildren] = getHashesAndChildren();
         bool const srcDstIsDense = isDense();
         int srcDstIndex = 0;
-        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBranchFactor; ++i)
         {
             auto const mask = (1 << i);
             bool const inSrc = (srcBranches & mask) != 0;
@@ -354,7 +354,7 @@ inline TaggedPointer::TaggedPointer(
         bool const srcIsDense = src.isDense();
         bool const dstIsDense = dst.isDense();
         int srcIndex = 0, dstIndex = 0;
-        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBranchFactor; ++i)
         {
             auto const mask = (1 << i);
             bool const inSrc = (srcBranches & mask) != 0;
@@ -440,7 +440,7 @@ inline TaggedPointer::TaggedPointer(
     std::tie(newNumAllocated, newHashes, newChildren) = newHashesAndChildren.getHashesAndChildren();
     std::tie(std::ignore, oldHashes, oldChildren) = getHashesAndChildren();
 
-    if (newNumAllocated == SHAMapInnerNode::kBRANCH_FACTOR)
+    if (newNumAllocated == SHAMapInnerNode::kBranchFactor)
     {
         // new arrays are dense, old arrays are sparse
         iterNonEmptyChildIndexes(isBranch, [&](auto branchNum, auto indexNum) {
@@ -449,7 +449,7 @@ inline TaggedPointer::TaggedPointer(
                 intr_ptr::SharedPtr<SHAMapTreeNode>{std::move(oldChildren[indexNum])};
         });
         // Run the constructors for the remaining elements
-        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBranchFactor; ++i)
         {
             if (((1 << i) & isBranch) != 0)
                 continue;
@@ -508,19 +508,19 @@ TaggedPointer::operator=(TaggedPointer&& other)
 [[nodiscard]] inline std::pair<std::uint8_t, void*>
 TaggedPointer::decode() const
 {
-    return {tp_ & kTAG_MASK, reinterpret_cast<void*>(tp_ & kPTR_MASK)};
+    return {tp_ & kTagMask, reinterpret_cast<void*>(tp_ & kPtrMask)};
 }
 
 [[nodiscard]] inline std::uint8_t
 TaggedPointer::capacity() const
 {
-    return kBOUNDARIES[tp_ & kTAG_MASK];
+    return kBoundaries[tp_ & kTagMask];
 }
 
 [[nodiscard]] inline bool
 TaggedPointer::isDense() const
 {
-    return (tp_ & kTAG_MASK) == kBOUNDARIES.size() - 1;
+    return (tp_ & kTagMask) == kBoundaries.size() - 1;
 }
 
 [[nodiscard]] inline std::tuple<std::uint8_t, SHAMapHash*, intr_ptr::SharedPtr<SHAMapTreeNode>*>
@@ -528,7 +528,7 @@ TaggedPointer::getHashesAndChildren() const
 {
     auto const [tag, ptr] = decode();
     auto const hashes = reinterpret_cast<SHAMapHash*>(ptr);
-    std::uint8_t const numAllocated = kBOUNDARIES[tag];
+    std::uint8_t const numAllocated = kBoundaries[tag];
     auto const children =
         reinterpret_cast<intr_ptr::SharedPtr<SHAMapTreeNode>*>(hashes + numAllocated);
     return {numAllocated, hashes, children};
@@ -537,7 +537,7 @@ TaggedPointer::getHashesAndChildren() const
 [[nodiscard]] inline SHAMapHash*
 TaggedPointer::getHashes() const
 {
-    return reinterpret_cast<SHAMapHash*>(tp_ & kPTR_MASK);
+    return reinterpret_cast<SHAMapHash*>(tp_ & kPtrMask);
 };
 
 [[nodiscard]] inline intr_ptr::SharedPtr<SHAMapTreeNode>*
diff --git a/include/xrpl/tx/invariants/VaultInvariant.h b/include/xrpl/tx/invariants/VaultInvariant.h
index 7ca67f546d..ab55cd086a 100644
--- a/include/xrpl/tx/invariants/VaultInvariant.h
+++ b/include/xrpl/tx/invariants/VaultInvariant.h
@@ -35,15 +35,15 @@ namespace xrpl {
  */
 class ValidVault
 {
-    Number static constexpr kZERO{};
+    static constexpr Number kZero{};
 
     struct Vault final
     {
-        uint256 key = beast::kZERO;
+        uint256 key = beast::kZero;
         Asset asset;
         AccountID pseudoId;
         AccountID owner;
-        uint192 shareMPTID = beast::kZERO;
+        uint192 shareMPTID = beast::kZero;
         Number assetsTotal = 0;
         Number assetsAvailable = 0;
         Number assetsMaximum = 0;
@@ -64,7 +64,7 @@ class ValidVault
 public:
     struct DeltaInfo final
     {
-        Number delta = kNUM_ZERO;
+        Number delta = kNumZero;
         std::optional<int> scale;
 
         // Compute the delta between two Numbers, taking the coarsest scale
diff --git a/include/xrpl/tx/paths/AMMLiquidity.h b/include/xrpl/tx/paths/AMMLiquidity.h
index 3211d0caa7..9abe37f868 100644
--- a/include/xrpl/tx/paths/AMMLiquidity.h
+++ b/include/xrpl/tx/paths/AMMLiquidity.h
@@ -31,7 +31,7 @@ template <typename TIn, typename TOut>
 class AMMLiquidity
 {
 private:
-    inline static Number const kINITIAL_FIB_SEQ_PCT = Number(5) / 20000;
+    inline static Number const kInitialFibSeqPct = Number(5) / 20000;
     AMMContext& ammContext_;
     AccountID const ammAccountID_;
     std::uint32_t const tradingFee_;
diff --git a/include/xrpl/tx/paths/Offer.h b/include/xrpl/tx/paths/Offer.h
index 0a551f4c2d..bbed179bc7 100644
--- a/include/xrpl/tx/paths/Offer.h
+++ b/include/xrpl/tx/paths/Offer.h
@@ -69,9 +69,9 @@ public:
     [[nodiscard]] bool
     fullyConsumed() const
     {
-        if (amounts_.in <= beast::kZERO)
+        if (amounts_.in <= beast::kZero)
             return true;
-        if (amounts_.out <= beast::kZERO)
+        if (amounts_.out <= beast::kZero)
             return true;
         return false;
     }
diff --git a/include/xrpl/tx/paths/detail/Steps.h b/include/xrpl/tx/paths/detail/Steps.h
index db9d3a6f3a..9909c4bdcd 100644
--- a/include/xrpl/tx/paths/detail/Steps.h
+++ b/include/xrpl/tx/paths/detail/Steps.h
@@ -460,7 +460,7 @@ public:
     [[nodiscard]] bool
     isZero(EitherAmount const& out) const override
     {
-        return get<TOut>(out) == beast::kZERO;
+        return get<TOut>(out) == beast::kZero;
     }
 
     [[nodiscard]] bool
diff --git a/include/xrpl/tx/paths/detail/StrandFlow.h b/include/xrpl/tx/paths/detail/StrandFlow.h
index f69e10e99a..31f0182258 100644
--- a/include/xrpl/tx/paths/detail/StrandFlow.h
+++ b/include/xrpl/tx/paths/detail/StrandFlow.h
@@ -28,8 +28,8 @@ template <class TInAmt, class TOutAmt>
 struct StrandResult
 {
     bool success = false;                          ///< Strand succeeded
-    TInAmt in = beast::kZERO;                      ///< Currency amount in
-    TOutAmt out = beast::kZERO;                    ///< Currency amount out
+    TInAmt in = beast::kZero;                      ///< Currency amount in
+    TOutAmt out = beast::kZero;                    ///< Currency amount out
     std::optional<PaymentSandbox> sandbox;         ///< Resulting Sandbox state
     boost::container::flat_set<uint256> ofrsToRm;  ///< Offers to remove
     // Num offers consumed or partially consumed (includes expired and unfunded
@@ -284,8 +284,8 @@ flow(
 template <class TInAmt, class TOutAmt>
 struct FlowResult
 {
-    TInAmt in = beast::kZERO;
-    TOutAmt out = beast::kZERO;
+    TInAmt in = beast::kZero;
+    TOutAmt out = beast::kZero;
     std::optional<PaymentSandbox> sandbox;
     boost::container::flat_set<uint256> removableOffers;
     TER ter = temUNKNOWN;
@@ -325,7 +325,7 @@ struct FlowResult
 inline std::optional<Quality>
 qualityUpperBound(ReadView const& v, Strand const& strand)
 {
-    Quality q{STAmount::kU_RATE_ONE};
+    Quality q{STAmount::kURateOne};
     std::optional<Quality> stepQ;
     DebtDirection dir = DebtDirection::Issues;
     for (auto const& step : strand)
@@ -595,9 +595,9 @@ flow(
     // values if `remainingIn` is initialized through a copy constructor. We can
     // get similar warnings for `sendMax` if it is initialized in the most
     // natural way. Using `make_optional`, allows us to work around this bug.
-    TInAmt const sendMaxInit = sendMaxST ? toAmount<TInAmt>(*sendMaxST) : TInAmt{beast::kZERO};
+    TInAmt const sendMaxInit = sendMaxST ? toAmount<TInAmt>(*sendMaxST) : TInAmt{beast::kZero};
     std::optional<TInAmt> const sendMax =
-        (sendMaxST && sendMaxInit >= beast::kZERO) ? std::make_optional(sendMaxInit) : std::nullopt;
+        (sendMaxST && sendMaxInit >= beast::kZero) ? std::make_optional(sendMaxInit) : std::nullopt;
     std::optional<TInAmt> remainingIn = !!sendMax ? std::make_optional(sendMaxInit) : std::nullopt;
     // std::optional<TInAmt> remainingIn{sendMax};
 
@@ -619,7 +619,7 @@ flow(
     auto sum = [](auto const& col) {
         using TResult = std::decay_t<decltype(*col.begin())>;
         if (col.empty())
-            return TResult{beast::kZERO};
+            return TResult{beast::kZero};
         return std::accumulate(col.begin() + 1, col.end(), *col.begin());
     };
 
@@ -627,7 +627,7 @@ flow(
     // successful
     boost::container::flat_set<uint256> ofrsToRmOnFail;
 
-    while (remainingOut > beast::kZERO && (!remainingIn || *remainingIn > beast::kZERO))
+    while (remainingOut > beast::kZero && (!remainingIn || *remainingIn > beast::kZero))
     {
         ++curTry;
         if (curTry >= maxTries)
@@ -679,7 +679,7 @@ flow(
 
             offersConsidered += f.ofrsUsed;
 
-            if (!f.success || f.out == beast::kZERO)
+            if (!f.success || f.out == beast::kZero)
                 continue;
 
             if (flowDebugInfo)
@@ -800,7 +800,7 @@ flow(
                 return {tecPATH_PARTIAL, actualIn, actualOut, std::move(ofrsToRmOnFail)};
             }
         }
-        else if (actualOut == beast::kZERO)
+        else if (actualOut == beast::kZero)
         {
             return {tecPATH_DRY, std::move(ofrsToRmOnFail)};
         }
@@ -816,7 +816,7 @@ flow(
         // fixFillOrKill amendment:
         //   Handles 2. 1. is handled above and falls through for tfSell.
         XRPL_ASSERT(remainingIn, "xrpl::flow : nonzero remainingIn");
-        if (remainingIn && *remainingIn != beast::kZERO)
+        if (remainingIn && *remainingIn != beast::kZero)
             return {tecPATH_PARTIAL, actualIn, actualOut, std::move(ofrsToRmOnFail)};
     }
 
diff --git a/include/xrpl/tx/transactors/account/AccountDelete.h b/include/xrpl/tx/transactors/account/AccountDelete.h
index 0e0ad1c33a..d2cbfa5ad2 100644
--- a/include/xrpl/tx/transactors/account/AccountDelete.h
+++ b/include/xrpl/tx/transactors/account/AccountDelete.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class AccountDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Blocker;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
 
     explicit AccountDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/account/AccountSet.h b/include/xrpl/tx/transactors/account/AccountSet.h
index 69eff6d005..002779db64 100644
--- a/include/xrpl/tx/transactors/account/AccountSet.h
+++ b/include/xrpl/tx/transactors/account/AccountSet.h
@@ -8,7 +8,7 @@ namespace xrpl {
 class AccountSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Custom;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
 
     explicit AccountSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/account/SetRegularKey.h b/include/xrpl/tx/transactors/account/SetRegularKey.h
index 6ea6375b1d..a9f1ce715d 100644
--- a/include/xrpl/tx/transactors/account/SetRegularKey.h
+++ b/include/xrpl/tx/transactors/account/SetRegularKey.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class SetRegularKey : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Blocker;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
 
     explicit SetRegularKey(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/account/SignerListSet.h b/include/xrpl/tx/transactors/account/SignerListSet.h
index a2c75a27d8..760f6e9358 100644
--- a/include/xrpl/tx/transactors/account/SignerListSet.h
+++ b/include/xrpl/tx/transactors/account/SignerListSet.h
@@ -24,7 +24,7 @@ private:
     std::vector<SignerEntries::SignerEntry> signers_;
 
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Blocker;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
 
     explicit SignerListSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/bridge/XChainBridge.h b/include/xrpl/tx/transactors/bridge/XChainBridge.h
index a98ef58238..1033dee188 100644
--- a/include/xrpl/tx/transactors/bridge/XChainBridge.h
+++ b/include/xrpl/tx/transactors/bridge/XChainBridge.h
@@ -5,14 +5,14 @@
 
 namespace xrpl {
 
-constexpr size_t kXBRIDGE_MAX_ACCOUNT_CREATE_CLAIMS = 128;
+constexpr size_t kXbridgeMaxAccountCreateClaims = 128;
 
 // Attach a new bridge to a door account. Once this is done, the cross-chain
 // transfer transactions may be used to transfer funds from this account.
 class XChainCreateBridge : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit XChainCreateBridge(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -45,7 +45,7 @@ public:
 class BridgeModify : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit BridgeModify(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -95,7 +95,7 @@ class XChainClaim : public Transactor
 {
 public:
     // Blocker since we cannot accurately calculate the consequences
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Blocker;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
 
     explicit XChainClaim(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -133,7 +133,7 @@ public:
 class XChainCommit : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Custom;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
 
     static TxConsequences
     makeTxConsequences(PreflightContext const& ctx);
@@ -179,7 +179,7 @@ public:
 class XChainCreateClaimID : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit XChainCreateClaimID(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -222,7 +222,7 @@ class XChainAddClaimAttestation : public Transactor
 {
 public:
     // Blocker since we cannot accurately calculate the consequences
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Blocker;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
 
     explicit XChainAddClaimAttestation(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -256,7 +256,7 @@ class XChainAddAccountCreateAttestation : public Transactor
 {
 public:
     // Blocker since we cannot accurately calculate the consequences
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Blocker;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Blocker;
 
     explicit XChainAddAccountCreateAttestation(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -314,7 +314,7 @@ public:
 class XChainCreateAccountCommit : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit XChainCreateAccountCommit(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/check/CheckCancel.h b/include/xrpl/tx/transactors/check/CheckCancel.h
index 787ce516e3..5fdaa7e527 100644
--- a/include/xrpl/tx/transactors/check/CheckCancel.h
+++ b/include/xrpl/tx/transactors/check/CheckCancel.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class CheckCancel : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit CheckCancel(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/check/CheckCash.h b/include/xrpl/tx/transactors/check/CheckCash.h
index 6141c93bc0..ad9de1e4c3 100644
--- a/include/xrpl/tx/transactors/check/CheckCash.h
+++ b/include/xrpl/tx/transactors/check/CheckCash.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class CheckCash : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit CheckCash(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/check/CheckCreate.h b/include/xrpl/tx/transactors/check/CheckCreate.h
index dc3ece3446..e03677e5f5 100644
--- a/include/xrpl/tx/transactors/check/CheckCreate.h
+++ b/include/xrpl/tx/transactors/check/CheckCreate.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class CheckCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit CheckCreate(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/credentials/CredentialAccept.h b/include/xrpl/tx/transactors/credentials/CredentialAccept.h
index ac76384142..97838f8a0a 100644
--- a/include/xrpl/tx/transactors/credentials/CredentialAccept.h
+++ b/include/xrpl/tx/transactors/credentials/CredentialAccept.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class CredentialAccept : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit CredentialAccept(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/credentials/CredentialCreate.h b/include/xrpl/tx/transactors/credentials/CredentialCreate.h
index b6476ec460..7493aa4dc5 100644
--- a/include/xrpl/tx/transactors/credentials/CredentialCreate.h
+++ b/include/xrpl/tx/transactors/credentials/CredentialCreate.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class CredentialCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit CredentialCreate(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/credentials/CredentialDelete.h b/include/xrpl/tx/transactors/credentials/CredentialDelete.h
index bcae90cefa..4d9b4ddd18 100644
--- a/include/xrpl/tx/transactors/credentials/CredentialDelete.h
+++ b/include/xrpl/tx/transactors/credentials/CredentialDelete.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class CredentialDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit CredentialDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/delegate/DelegateSet.h b/include/xrpl/tx/transactors/delegate/DelegateSet.h
index b0fcbfea22..c93c48e970 100644
--- a/include/xrpl/tx/transactors/delegate/DelegateSet.h
+++ b/include/xrpl/tx/transactors/delegate/DelegateSet.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class DelegateSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit DelegateSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/AMMBid.h b/include/xrpl/tx/transactors/dex/AMMBid.h
index 38fb1a57fe..9328c48e79 100644
--- a/include/xrpl/tx/transactors/dex/AMMBid.h
+++ b/include/xrpl/tx/transactors/dex/AMMBid.h
@@ -45,7 +45,7 @@ namespace xrpl {
 class AMMBid : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit AMMBid(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/AMMClawback.h b/include/xrpl/tx/transactors/dex/AMMClawback.h
index 9a6dd36791..7ac03ebb28 100644
--- a/include/xrpl/tx/transactors/dex/AMMClawback.h
+++ b/include/xrpl/tx/transactors/dex/AMMClawback.h
@@ -7,7 +7,7 @@ class Sandbox;
 class AMMClawback : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit AMMClawback(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/AMMContext.h b/include/xrpl/tx/transactors/dex/AMMContext.h
index 3d13547b52..92de3f7b97 100644
--- a/include/xrpl/tx/transactors/dex/AMMContext.h
+++ b/include/xrpl/tx/transactors/dex/AMMContext.h
@@ -18,7 +18,7 @@ public:
     // Restrict number of AMM offers. If this restriction is removed
     // then need to restrict in some other way because AMM offers are
     // not counted in the BookStep offer counter.
-    constexpr static std::uint8_t kMAX_ITERATIONS = 30;
+    static constexpr std::uint8_t kMaxIterations = 30;
 
 private:
     // Tx account owner is required to get the AMM trading fee in BookStep
@@ -68,7 +68,7 @@ public:
     [[nodiscard]] bool
     maxItersReached() const
     {
-        return ammIters_ >= kMAX_ITERATIONS;
+        return ammIters_ >= kMaxIterations;
     }
 
     [[nodiscard]] std::uint16_t
diff --git a/include/xrpl/tx/transactors/dex/AMMCreate.h b/include/xrpl/tx/transactors/dex/AMMCreate.h
index 35e3a951b4..04d6fe6f60 100644
--- a/include/xrpl/tx/transactors/dex/AMMCreate.h
+++ b/include/xrpl/tx/transactors/dex/AMMCreate.h
@@ -37,7 +37,7 @@ namespace xrpl {
 class AMMCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit AMMCreate(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/AMMDelete.h b/include/xrpl/tx/transactors/dex/AMMDelete.h
index 57fdfebf94..ff5776e3b7 100644
--- a/include/xrpl/tx/transactors/dex/AMMDelete.h
+++ b/include/xrpl/tx/transactors/dex/AMMDelete.h
@@ -13,7 +13,7 @@ namespace xrpl {
 class AMMDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit AMMDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/AMMDeposit.h b/include/xrpl/tx/transactors/dex/AMMDeposit.h
index 8afe957e60..9be53167f2 100644
--- a/include/xrpl/tx/transactors/dex/AMMDeposit.h
+++ b/include/xrpl/tx/transactors/dex/AMMDeposit.h
@@ -42,7 +42,7 @@ class Sandbox;
 class AMMDeposit : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit AMMDeposit(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/AMMVote.h b/include/xrpl/tx/transactors/dex/AMMVote.h
index 70e75144c4..1b5946aae1 100644
--- a/include/xrpl/tx/transactors/dex/AMMVote.h
+++ b/include/xrpl/tx/transactors/dex/AMMVote.h
@@ -30,7 +30,7 @@ namespace xrpl {
 class AMMVote : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit AMMVote(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/AMMWithdraw.h b/include/xrpl/tx/transactors/dex/AMMWithdraw.h
index 17ebe4e2be..9e6eb62d51 100644
--- a/include/xrpl/tx/transactors/dex/AMMWithdraw.h
+++ b/include/xrpl/tx/transactors/dex/AMMWithdraw.h
@@ -50,7 +50,7 @@ enum class WithdrawAll : bool { No = false, Yes };
 class AMMWithdraw : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit AMMWithdraw(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/OfferCancel.h b/include/xrpl/tx/transactors/dex/OfferCancel.h
index c16550f87d..b2641049e6 100644
--- a/include/xrpl/tx/transactors/dex/OfferCancel.h
+++ b/include/xrpl/tx/transactors/dex/OfferCancel.h
@@ -8,7 +8,7 @@ namespace xrpl {
 class OfferCancel : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit OfferCancel(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/dex/OfferCreate.h b/include/xrpl/tx/transactors/dex/OfferCreate.h
index 4ee69313e0..d1ac8b5626 100644
--- a/include/xrpl/tx/transactors/dex/OfferCreate.h
+++ b/include/xrpl/tx/transactors/dex/OfferCreate.h
@@ -12,7 +12,7 @@ class Sandbox;
 class OfferCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Custom;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
 
     /** Construct a Transactor subclass that creates an offer in the ledger. */
     explicit OfferCreate(ApplyContext& ctx) : Transactor(ctx)
diff --git a/include/xrpl/tx/transactors/did/DIDDelete.h b/include/xrpl/tx/transactors/did/DIDDelete.h
index 4e19a6664f..c750d4c95e 100644
--- a/include/xrpl/tx/transactors/did/DIDDelete.h
+++ b/include/xrpl/tx/transactors/did/DIDDelete.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class DIDDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit DIDDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/did/DIDSet.h b/include/xrpl/tx/transactors/did/DIDSet.h
index 972f3a9579..b2c3d97c81 100644
--- a/include/xrpl/tx/transactors/did/DIDSet.h
+++ b/include/xrpl/tx/transactors/did/DIDSet.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class DIDSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit DIDSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/escrow/EscrowCancel.h b/include/xrpl/tx/transactors/escrow/EscrowCancel.h
index 628fd2e61f..92b55374d5 100644
--- a/include/xrpl/tx/transactors/escrow/EscrowCancel.h
+++ b/include/xrpl/tx/transactors/escrow/EscrowCancel.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class EscrowCancel : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit EscrowCancel(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/escrow/EscrowCreate.h b/include/xrpl/tx/transactors/escrow/EscrowCreate.h
index b3b04b71b6..8682ed7369 100644
--- a/include/xrpl/tx/transactors/escrow/EscrowCreate.h
+++ b/include/xrpl/tx/transactors/escrow/EscrowCreate.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class EscrowCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Custom;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
 
     explicit EscrowCreate(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/escrow/EscrowFinish.h b/include/xrpl/tx/transactors/escrow/EscrowFinish.h
index 420f5f7324..806f947b8b 100644
--- a/include/xrpl/tx/transactors/escrow/EscrowFinish.h
+++ b/include/xrpl/tx/transactors/escrow/EscrowFinish.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class EscrowFinish : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit EscrowFinish(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h b/include/xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h
index 73781fa4bd..1b86ac41e7 100644
--- a/include/xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h
+++ b/include/xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LoanBrokerCoverClawback : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanBrokerCoverClawback(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h b/include/xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h
index 4ced4747bb..63e96457dc 100644
--- a/include/xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h
+++ b/include/xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LoanBrokerCoverDeposit : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanBrokerCoverDeposit(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.h b/include/xrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.h
index 8dc370283a..e3182c0851 100644
--- a/include/xrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.h
+++ b/include/xrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LoanBrokerCoverWithdraw : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanBrokerCoverWithdraw(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanBrokerDelete.h b/include/xrpl/tx/transactors/lending/LoanBrokerDelete.h
index 9f40986909..464a43e398 100644
--- a/include/xrpl/tx/transactors/lending/LoanBrokerDelete.h
+++ b/include/xrpl/tx/transactors/lending/LoanBrokerDelete.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LoanBrokerDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanBrokerDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanBrokerSet.h b/include/xrpl/tx/transactors/lending/LoanBrokerSet.h
index adbb3217ba..72a339951b 100644
--- a/include/xrpl/tx/transactors/lending/LoanBrokerSet.h
+++ b/include/xrpl/tx/transactors/lending/LoanBrokerSet.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LoanBrokerSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanBrokerSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanDelete.h b/include/xrpl/tx/transactors/lending/LoanDelete.h
index 6f14530101..8dd9c4601b 100644
--- a/include/xrpl/tx/transactors/lending/LoanDelete.h
+++ b/include/xrpl/tx/transactors/lending/LoanDelete.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LoanDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanManage.h b/include/xrpl/tx/transactors/lending/LoanManage.h
index b21f618b19..08c873a5e7 100644
--- a/include/xrpl/tx/transactors/lending/LoanManage.h
+++ b/include/xrpl/tx/transactors/lending/LoanManage.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LoanManage : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanManage(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanPay.h b/include/xrpl/tx/transactors/lending/LoanPay.h
index 59f4f20149..561550e889 100644
--- a/include/xrpl/tx/transactors/lending/LoanPay.h
+++ b/include/xrpl/tx/transactors/lending/LoanPay.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LoanPay : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanPay(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/lending/LoanSet.h b/include/xrpl/tx/transactors/lending/LoanSet.h
index 6517212a18..304c077f3d 100644
--- a/include/xrpl/tx/transactors/lending/LoanSet.h
+++ b/include/xrpl/tx/transactors/lending/LoanSet.h
@@ -8,7 +8,7 @@ namespace xrpl {
 class LoanSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LoanSet(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -53,16 +53,16 @@ public:
         beast::Journal const& j) override;
 
 public:
-    static std::uint32_t constexpr kMIN_PAYMENT_TOTAL = 1;
-    static std::uint32_t constexpr kDEFAULT_PAYMENT_TOTAL = 1;
-    static_assert(kDEFAULT_PAYMENT_TOTAL >= kMIN_PAYMENT_TOTAL);
+    static constexpr std::uint32_t kMinPaymentTotal = 1;
+    static constexpr std::uint32_t kDefaultPaymentTotal = 1;
+    static_assert(kDefaultPaymentTotal >= kMinPaymentTotal);
 
-    static std::uint32_t constexpr kMIN_PAYMENT_INTERVAL = 60;
-    static std::uint32_t constexpr kDEFAULT_PAYMENT_INTERVAL = 60;
-    static_assert(kDEFAULT_PAYMENT_INTERVAL >= kMIN_PAYMENT_INTERVAL);
+    static constexpr std::uint32_t kMinPaymentInterval = 60;
+    static constexpr std::uint32_t kDefaultPaymentInterval = 60;
+    static_assert(kDefaultPaymentInterval >= kMinPaymentInterval);
 
-    static std::uint32_t constexpr kDEFAULT_GRACE_PERIOD = 60;
-    static_assert(kDEFAULT_GRACE_PERIOD >= kMIN_PAYMENT_INTERVAL);
+    static constexpr std::uint32_t kDefaultGracePeriod = 60;
+    static_assert(kDefaultGracePeriod >= kMinPaymentInterval);
 };
 
 //------------------------------------------------------------------------------
diff --git a/include/xrpl/tx/transactors/nft/NFTokenAcceptOffer.h b/include/xrpl/tx/transactors/nft/NFTokenAcceptOffer.h
index 9cdb609ad8..3c98d55141 100644
--- a/include/xrpl/tx/transactors/nft/NFTokenAcceptOffer.h
+++ b/include/xrpl/tx/transactors/nft/NFTokenAcceptOffer.h
@@ -20,7 +20,7 @@ private:
     transferNFToken(AccountID const& buyer, AccountID const& seller, uint256 const& nfTokenID);
 
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit NFTokenAcceptOffer(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/nft/NFTokenBurn.h b/include/xrpl/tx/transactors/nft/NFTokenBurn.h
index e8341cf26a..4665a17aa7 100644
--- a/include/xrpl/tx/transactors/nft/NFTokenBurn.h
+++ b/include/xrpl/tx/transactors/nft/NFTokenBurn.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class NFTokenBurn : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit NFTokenBurn(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/nft/NFTokenCancelOffer.h b/include/xrpl/tx/transactors/nft/NFTokenCancelOffer.h
index faa6c0c029..3eae44b389 100644
--- a/include/xrpl/tx/transactors/nft/NFTokenCancelOffer.h
+++ b/include/xrpl/tx/transactors/nft/NFTokenCancelOffer.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class NFTokenCancelOffer : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit NFTokenCancelOffer(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/nft/NFTokenCreateOffer.h b/include/xrpl/tx/transactors/nft/NFTokenCreateOffer.h
index cedb680bb1..20ccefc2cb 100644
--- a/include/xrpl/tx/transactors/nft/NFTokenCreateOffer.h
+++ b/include/xrpl/tx/transactors/nft/NFTokenCreateOffer.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class NFTokenCreateOffer : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit NFTokenCreateOffer(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/nft/NFTokenMint.h b/include/xrpl/tx/transactors/nft/NFTokenMint.h
index 43beb47179..1a0deae29d 100644
--- a/include/xrpl/tx/transactors/nft/NFTokenMint.h
+++ b/include/xrpl/tx/transactors/nft/NFTokenMint.h
@@ -9,7 +9,7 @@ namespace xrpl {
 class NFTokenMint : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit NFTokenMint(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/nft/NFTokenModify.h b/include/xrpl/tx/transactors/nft/NFTokenModify.h
index d7f5f031b1..5b197d72b4 100644
--- a/include/xrpl/tx/transactors/nft/NFTokenModify.h
+++ b/include/xrpl/tx/transactors/nft/NFTokenModify.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class NFTokenModify : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit NFTokenModify(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/oracle/OracleDelete.h b/include/xrpl/tx/transactors/oracle/OracleDelete.h
index 5acc365fa5..e83a334b87 100644
--- a/include/xrpl/tx/transactors/oracle/OracleDelete.h
+++ b/include/xrpl/tx/transactors/oracle/OracleDelete.h
@@ -16,7 +16,7 @@ namespace xrpl {
 class OracleDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit OracleDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/oracle/OracleSet.h b/include/xrpl/tx/transactors/oracle/OracleSet.h
index 3cad859dce..12c022470b 100644
--- a/include/xrpl/tx/transactors/oracle/OracleSet.h
+++ b/include/xrpl/tx/transactors/oracle/OracleSet.h
@@ -16,7 +16,7 @@ namespace xrpl {
 class OracleSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit OracleSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/payment/DepositPreauth.h b/include/xrpl/tx/transactors/payment/DepositPreauth.h
index 9eaf94989a..fbf22f8ca8 100644
--- a/include/xrpl/tx/transactors/payment/DepositPreauth.h
+++ b/include/xrpl/tx/transactors/payment/DepositPreauth.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class DepositPreauth : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit DepositPreauth(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/payment/Payment.h b/include/xrpl/tx/transactors/payment/Payment.h
index 23a46f0766..ef42b67fa4 100644
--- a/include/xrpl/tx/transactors/payment/Payment.h
+++ b/include/xrpl/tx/transactors/payment/Payment.h
@@ -7,13 +7,13 @@ namespace xrpl {
 class Payment : public Transactor
 {
     /* The largest number of paths we allow */
-    static std::size_t const kMAX_PATH_SIZE = 6;
+    static std::size_t const kMaxPathSize = 6;
 
     /* The longest path we allow */
-    static std::size_t const kMAX_PATH_LENGTH = 8;
+    static std::size_t const kMaxPathLength = 8;
 
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Custom;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
 
     explicit Payment(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/payment_channel/PaymentChannelClaim.h b/include/xrpl/tx/transactors/payment_channel/PaymentChannelClaim.h
index 444832b1dc..98d4638e51 100644
--- a/include/xrpl/tx/transactors/payment_channel/PaymentChannelClaim.h
+++ b/include/xrpl/tx/transactors/payment_channel/PaymentChannelClaim.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class PaymentChannelClaim : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit PaymentChannelClaim(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/payment_channel/PaymentChannelCreate.h b/include/xrpl/tx/transactors/payment_channel/PaymentChannelCreate.h
index 800cfcdb91..73059a7e46 100644
--- a/include/xrpl/tx/transactors/payment_channel/PaymentChannelCreate.h
+++ b/include/xrpl/tx/transactors/payment_channel/PaymentChannelCreate.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class PaymentChannelCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Custom;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
 
     explicit PaymentChannelCreate(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/payment_channel/PaymentChannelFund.h b/include/xrpl/tx/transactors/payment_channel/PaymentChannelFund.h
index ee26d34dce..587ee9f778 100644
--- a/include/xrpl/tx/transactors/payment_channel/PaymentChannelFund.h
+++ b/include/xrpl/tx/transactors/payment_channel/PaymentChannelFund.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class PaymentChannelFund : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Custom;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
 
     explicit PaymentChannelFund(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.h b/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.h
index 1ac96be2eb..77834f7683 100644
--- a/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.h
+++ b/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class PermissionedDomainDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit PermissionedDomainDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.h b/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.h
index f5725e7660..47c35800dd 100644
--- a/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.h
+++ b/include/xrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class PermissionedDomainSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit PermissionedDomainSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/system/Batch.h b/include/xrpl/tx/transactors/system/Batch.h
index 82e5bf8f78..e190714725 100644
--- a/include/xrpl/tx/transactors/system/Batch.h
+++ b/include/xrpl/tx/transactors/system/Batch.h
@@ -9,7 +9,7 @@ namespace xrpl {
 class Batch : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit Batch(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -47,7 +47,7 @@ public:
         ReadView const& view,
         beast::Journal const& j) override;
 
-    static constexpr auto kDISABLED_TX_TYPES = std::to_array<TxType>({
+    static constexpr auto kDisabledTxTypes = std::to_array<TxType>({
         ttVAULT_CREATE,
         ttVAULT_SET,
         ttVAULT_DELETE,
diff --git a/include/xrpl/tx/transactors/system/Change.h b/include/xrpl/tx/transactors/system/Change.h
index c3a3ff81ff..33df426593 100644
--- a/include/xrpl/tx/transactors/system/Change.h
+++ b/include/xrpl/tx/transactors/system/Change.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class Change : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit Change(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/system/LedgerStateFix.h b/include/xrpl/tx/transactors/system/LedgerStateFix.h
index 7e6a89ea0b..8d704467eb 100644
--- a/include/xrpl/tx/transactors/system/LedgerStateFix.h
+++ b/include/xrpl/tx/transactors/system/LedgerStateFix.h
@@ -11,7 +11,7 @@ public:
         NfTokenPageLink = 1,
     };
 
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit LedgerStateFix(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/system/TicketCreate.h b/include/xrpl/tx/transactors/system/TicketCreate.h
index 9c9289e1b5..4991d1d08b 100644
--- a/include/xrpl/tx/transactors/system/TicketCreate.h
+++ b/include/xrpl/tx/transactors/system/TicketCreate.h
@@ -7,9 +7,9 @@ namespace xrpl {
 class TicketCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Custom;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Custom;
 
-    constexpr static std::uint32_t kMIN_VALID_COUNT = 1;
+    static constexpr std::uint32_t kMinValidCount = 1;
 
     // A note on how the maxValidCount was determined.  The goal is for
     // a single TicketCreate transaction to not use more compute power than
@@ -31,7 +31,7 @@ public:
     // about the same compute time as a single compute-intensive payment.
     //
     // October 2018.
-    constexpr static std::uint32_t kMAX_VALID_COUNT = 250;
+    static constexpr std::uint32_t kMaxValidCount = 250;
 
     // The maximum number of Tickets an account may hold.  If a
     // TicketCreate would cause an account to own more than this many
@@ -39,7 +39,7 @@ public:
     //
     // The number was chosen arbitrarily and is an effort toward avoiding
     // ledger-stuffing with Tickets.
-    constexpr static std::uint32_t kMAX_TICKET_THRESHOLD = 250;
+    static constexpr std::uint32_t kMaxTicketThreshold = 250;
 
     explicit TicketCreate(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/token/Clawback.h b/include/xrpl/tx/transactors/token/Clawback.h
index 6a5927fb02..7c99cef0d2 100644
--- a/include/xrpl/tx/transactors/token/Clawback.h
+++ b/include/xrpl/tx/transactors/token/Clawback.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class Clawback : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit Clawback(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/token/MPTokenAuthorize.h b/include/xrpl/tx/transactors/token/MPTokenAuthorize.h
index 29d80c5d9d..b2cfa74f6e 100644
--- a/include/xrpl/tx/transactors/token/MPTokenAuthorize.h
+++ b/include/xrpl/tx/transactors/token/MPTokenAuthorize.h
@@ -16,7 +16,7 @@ struct MPTAuthorizeArgs
 class MPTokenAuthorize : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit MPTokenAuthorize(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/token/MPTokenIssuanceCreate.h b/include/xrpl/tx/transactors/token/MPTokenIssuanceCreate.h
index 2cb871550a..3861c19afc 100644
--- a/include/xrpl/tx/transactors/token/MPTokenIssuanceCreate.h
+++ b/include/xrpl/tx/transactors/token/MPTokenIssuanceCreate.h
@@ -27,7 +27,7 @@ struct MPTCreateArgs
 class MPTokenIssuanceCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit MPTokenIssuanceCreate(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/token/MPTokenIssuanceDestroy.h b/include/xrpl/tx/transactors/token/MPTokenIssuanceDestroy.h
index 2f18a501e9..65682c8f5e 100644
--- a/include/xrpl/tx/transactors/token/MPTokenIssuanceDestroy.h
+++ b/include/xrpl/tx/transactors/token/MPTokenIssuanceDestroy.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class MPTokenIssuanceDestroy : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit MPTokenIssuanceDestroy(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/token/MPTokenIssuanceSet.h b/include/xrpl/tx/transactors/token/MPTokenIssuanceSet.h
index 2e8c8a7a41..7397183bbf 100644
--- a/include/xrpl/tx/transactors/token/MPTokenIssuanceSet.h
+++ b/include/xrpl/tx/transactors/token/MPTokenIssuanceSet.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class MPTokenIssuanceSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit MPTokenIssuanceSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/token/TrustSet.h b/include/xrpl/tx/transactors/token/TrustSet.h
index 5eee05889a..d439b676b5 100644
--- a/include/xrpl/tx/transactors/token/TrustSet.h
+++ b/include/xrpl/tx/transactors/token/TrustSet.h
@@ -8,7 +8,7 @@ namespace xrpl {
 class TrustSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit TrustSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/vault/VaultClawback.h b/include/xrpl/tx/transactors/vault/VaultClawback.h
index bd9fb2abec..4b9e283571 100644
--- a/include/xrpl/tx/transactors/vault/VaultClawback.h
+++ b/include/xrpl/tx/transactors/vault/VaultClawback.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class VaultClawback : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit VaultClawback(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/vault/VaultCreate.h b/include/xrpl/tx/transactors/vault/VaultCreate.h
index 1b05f80c06..bbe80b49c1 100644
--- a/include/xrpl/tx/transactors/vault/VaultCreate.h
+++ b/include/xrpl/tx/transactors/vault/VaultCreate.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class VaultCreate : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit VaultCreate(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/vault/VaultDelete.h b/include/xrpl/tx/transactors/vault/VaultDelete.h
index dc610cc089..d8fccd6024 100644
--- a/include/xrpl/tx/transactors/vault/VaultDelete.h
+++ b/include/xrpl/tx/transactors/vault/VaultDelete.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class VaultDelete : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit VaultDelete(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/vault/VaultDeposit.h b/include/xrpl/tx/transactors/vault/VaultDeposit.h
index fbaf987082..f1a81c928e 100644
--- a/include/xrpl/tx/transactors/vault/VaultDeposit.h
+++ b/include/xrpl/tx/transactors/vault/VaultDeposit.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class VaultDeposit : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit VaultDeposit(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/vault/VaultSet.h b/include/xrpl/tx/transactors/vault/VaultSet.h
index 719b828766..48178f5048 100644
--- a/include/xrpl/tx/transactors/vault/VaultSet.h
+++ b/include/xrpl/tx/transactors/vault/VaultSet.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class VaultSet : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit VaultSet(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/include/xrpl/tx/transactors/vault/VaultWithdraw.h b/include/xrpl/tx/transactors/vault/VaultWithdraw.h
index fd3739bc2f..7461752ff2 100644
--- a/include/xrpl/tx/transactors/vault/VaultWithdraw.h
+++ b/include/xrpl/tx/transactors/vault/VaultWithdraw.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class VaultWithdraw : public Transactor
 {
 public:
-    static constexpr auto kCONSEQUENCES_FACTORY = ConsequencesFactoryType::Normal;
+    static constexpr auto kConsequencesFactory = ConsequencesFactoryType::Normal;
 
     explicit VaultWithdraw(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/src/libxrpl/basics/BasicConfig.cpp b/src/libxrpl/basics/BasicConfig.cpp
index c1997eb713..9fe79bdf4e 100644
--- a/src/libxrpl/basics/BasicConfig.cpp
+++ b/src/libxrpl/basics/BasicConfig.cpp
@@ -28,7 +28,7 @@ void
 Section::append(std::vector<std::string> const& lines)
 {
     // <key> '=' <value>
-    static boost::regex const kRE1(
+    static boost::regex const kRe1(
         "^"                        // start of line
         "(?:\\s*)"                 // whitespace (optional)
         "([a-zA-Z][_a-zA-Z0-9]*)"  // <key>
@@ -82,7 +82,7 @@ Section::append(std::vector<std::string> const& lines)
             continue;
 
         boost::smatch match;
-        if (boost::regex_match(line, match, kRE1))
+        if (boost::regex_match(line, match, kRe1))
         {
             set(match[1], match[2]);
         }
@@ -126,10 +126,10 @@ BasicConfig::section(std::string const& name)
 Section const&
 BasicConfig::section(std::string const& name) const
 {
-    static Section const kNONE("");
+    static Section const kNone("");
     auto const iter = map_.find(name);
     if (iter == map_.end())
-        return kNONE;
+        return kNone;
     return iter->second;
 }
 
diff --git a/src/libxrpl/basics/CountedObject.cpp b/src/libxrpl/basics/CountedObject.cpp
index 1bf88687f8..f5b98354dc 100644
--- a/src/libxrpl/basics/CountedObject.cpp
+++ b/src/libxrpl/basics/CountedObject.cpp
@@ -7,9 +7,9 @@ namespace xrpl {
 CountedObjects&
 CountedObjects::getInstance() noexcept
 {
-    static CountedObjects kINSTANCE;
+    static CountedObjects kInstance;
 
-    return kINSTANCE;
+    return kInstance;
 }
 
 CountedObjects::CountedObjects() noexcept : count_(0), head_(nullptr)
diff --git a/src/libxrpl/basics/Log.cpp b/src/libxrpl/basics/Log.cpp
index 43f9ee4b67..1079f91280 100644
--- a/src/libxrpl/basics/Log.cpp
+++ b/src/libxrpl/basics/Log.cpp
@@ -293,9 +293,9 @@ Logs::format(
     output += message;
 
     // Limit the maximum length of the output
-    if (output.size() > kMAXIMUM_MESSAGE_CHARACTERS)
+    if (output.size() > kMaximumMessageCharacters)
     {
-        output.resize(kMAXIMUM_MESSAGE_CHARACTERS - 3);
+        output.resize(kMaximumMessageCharacters - 3);
         output += "...";
     }
 
@@ -384,8 +384,8 @@ public:
 static DebugSink&
 debugSink()
 {
-    static DebugSink kINST;
-    return kINST;
+    static DebugSink kInst;
+    return kInst;
 }
 
 std::unique_ptr<beast::Journal::Sink>
diff --git a/src/libxrpl/basics/MallocTrim.cpp b/src/libxrpl/basics/MallocTrim.cpp
index 6fb9ab611b..3831c8adae 100644
--- a/src/libxrpl/basics/MallocTrim.cpp
+++ b/src/libxrpl/basics/MallocTrim.cpp
@@ -86,7 +86,7 @@ mallocTrim(std::string_view tag, beast::Journal journal)
     // Keep glibc malloc_trim padding at 0 (default): 12h Mainnet tests across 0/256KB/1MB/16MB
     // showed no clear, consistent benefit from custom padding—0 provided the best overall balance
     // of RSS reduction and trim-latency stability without adding a tuning surface.
-    constexpr static std::size_t kTRIM_PAD = 0;
+    static constexpr std::size_t kTrimPad = 0;
 
     report.supported = true;
 
@@ -114,7 +114,7 @@ mallocTrim(std::string_view tag, beast::Journal journal)
 
         auto const t0 = std::chrono::steady_clock::now();
 
-        report.trimResult = detail::mallocTrimWithPad(kTRIM_PAD);
+        report.trimResult = detail::mallocTrimWithPad(kTrimPad);
 
         auto const t1 = std::chrono::steady_clock::now();
 
@@ -140,7 +140,7 @@ mallocTrim(std::string_view tag, beast::Journal journal)
             : (static_cast<std::int64_t>(rssAfterKB) - static_cast<std::int64_t>(rssBeforeKB));
 
         JLOG(journal.debug()) << "malloc_trim tag=" << tagStr << " result=" << report.trimResult
-                              << " pad=" << kTRIM_PAD << " bytes"
+                              << " pad=" << kTrimPad << " bytes"
                               << " rss_before=" << rssBeforeKB << "kB"
                               << " rss_after=" << rssAfterKB << "kB"
                               << " delta=" << deltaKB << "kB"
@@ -150,7 +150,7 @@ mallocTrim(std::string_view tag, beast::Journal journal)
     }
     else
     {
-        report.trimResult = detail::mallocTrimWithPad(kTRIM_PAD);
+        report.trimResult = detail::mallocTrimWithPad(kTrimPad);
     }
 
 #endif
diff --git a/src/libxrpl/basics/Number.cpp b/src/libxrpl/basics/Number.cpp
index 08ead182bf..06bd78d8b0 100644
--- a/src/libxrpl/basics/Number.cpp
+++ b/src/libxrpl/basics/Number.cpp
@@ -28,7 +28,7 @@ using int128_t = __int128_t;
 namespace xrpl {
 
 thread_local Number::RoundingMode Number::mode = Number::RoundingMode::ToNearest;
-thread_local std::reference_wrapper<MantissaRange const> Number::kRANGE = kLARGE_RANGE;
+thread_local std::reference_wrapper<MantissaRange const> Number::kRange = kLargeRange;
 
 Number::RoundingMode
 Number::getround()
@@ -45,7 +45,7 @@ Number::setround(RoundingMode inMode)
 MantissaRange::MantissaScale
 Number::getMantissaScale()
 {
-    return kRANGE.get().scale;
+    return kRange.get().scale;
 }
 
 void
@@ -54,7 +54,7 @@ Number::setMantissaScale(MantissaRange::MantissaScale scale)
     if (scale != MantissaRange::MantissaScale::Small &&
         scale != MantissaRange::MantissaScale::Large)
         logicError("Unknown mantissa scale");
-    kRANGE = scale == MantissaRange::MantissaScale::Small ? kSMALL_RANGE : kLARGE_RANGE;
+    kRange = scale == MantissaRange::MantissaScale::Small ? kSmallRange : kLargeRange;
 }
 
 // Guard
@@ -224,13 +224,13 @@ Number::Guard::bringIntoRange(
         mantissa *= 10;
         --exponent;
     }
-    if (exponent < kMIN_EXPONENT)
+    if (exponent < kMinExponent)
     {
-        constexpr Number kZERO = Number{};
+        static constexpr Number kZero = Number{};
 
-        negative = kZERO.negative_;
-        mantissa = kZERO.mantissa_;
-        exponent = kZERO.exponent_;
+        negative = kZero.negative_;
+        mantissa = kZero.mantissa_;
+        exponent = kZero.exponent_;
     }
 }
 
@@ -250,14 +250,14 @@ Number::Guard::doRoundUp(
         ++mantissa;
         // Ensure mantissa after incrementing fits within both the
         // min/maxMantissa range and is a valid "rep".
-        if (mantissa > maxMantissa || mantissa > kMAX_REP)
+        if (mantissa > maxMantissa || mantissa > kMaxRep)
         {
             mantissa /= 10;
             ++exponent;
         }
     }
     bringIntoRange(negative, mantissa, exponent, minMantissa);
-    if (exponent > kMAX_EXPONENT)
+    if (exponent > kMaxExponent)
         Throw<std::overflow_error>(std::string(location));
 }
 
@@ -289,7 +289,7 @@ Number::Guard::doRound(rep& drops, std::string location) const
     auto r = round();
     if (r == 1 || (r == 0 && (drops & 1) == 1))
     {
-        if (drops >= kMAX_REP)
+        if (drops >= kMaxRep)
         {
             static_assert(sizeof(internalrep) == sizeof(rep));
             // This should be impossible, because it's impossible to represent
@@ -334,26 +334,26 @@ Number::externalToInternal(rep mantissa)
 constexpr Number
 Number::oneSmall()
 {
-    return Number{false, Number::kSMALL_RANGE.min, -Number::kSMALL_RANGE.log, Number::Unchecked{}};
+    return Number{false, Number::kSmallRange.min, -Number::kSmallRange.log, Number::Unchecked{}};
 };
 
-constexpr Number kONE_SML = Number::oneSmall();
+constexpr Number kOneSml = Number::oneSmall();
 
 constexpr Number
 Number::oneLarge()
 {
-    return Number{false, Number::kLARGE_RANGE.min, -Number::kLARGE_RANGE.log, Number::Unchecked{}};
+    return Number{false, Number::kLargeRange.min, -Number::kLargeRange.log, Number::Unchecked{}};
 };
 
-constexpr Number kONE_LRG = Number::oneLarge();
+constexpr Number kOneLrg = Number::oneLarge();
 
 Number
 Number::one()
 {
-    if (&kRANGE.get() == &kSMALL_RANGE)
-        return kONE_SML;
-    XRPL_ASSERT(&kRANGE.get() == &kLARGE_RANGE, "Number::one() : valid range");
-    return kONE_LRG;
+    if (&kRange.get() == &kSmallRange)
+        return kOneSml;
+    XRPL_ASSERT(&kRange.get() == &kLargeRange, "Number::one() : valid range");
+    return kOneLrg;
 }
 
 // Use the member names in this static function for now so the diff is cleaner
@@ -367,22 +367,22 @@ doNormalize(
     MantissaRange::rep const& minMantissa,
     MantissaRange::rep const& maxMantissa)
 {
-    auto constexpr kMIN_EXPONENT = Number::kMIN_EXPONENT;
-    auto constexpr kMAX_EXPONENT = Number::kMAX_EXPONENT;
-    auto constexpr kMAX_REP = Number::kMAX_REP;
+    static constexpr auto kMinExponent = Number::kMinExponent;
+    static constexpr auto kMaxExponent = Number::kMaxExponent;
+    static constexpr auto kMaxRep = Number::kMaxRep;
 
     using Guard = Number::Guard;
 
-    constexpr Number kZERO = Number{};
+    static constexpr Number kZero = Number{};
     if (mantissa == 0)
     {
-        mantissa = kZERO.mantissa_;
-        exponent = kZERO.exponent_;
-        negative = kZERO.negative_;
+        mantissa = kZero.mantissa_;
+        exponent = kZero.exponent_;
+        negative = kZero.negative_;
         return;
     }
     auto m = mantissa;
-    while ((m < minMantissa) && (exponent > kMIN_EXPONENT))
+    while ((m < minMantissa) && (exponent > kMinExponent))
     {
         m *= 10;
         --exponent;
@@ -392,17 +392,17 @@ doNormalize(
         g.setNegative();
     while (m > maxMantissa)
     {
-        if (exponent >= kMAX_EXPONENT)
+        if (exponent >= kMaxExponent)
             throw std::overflow_error("Number::normalize 1");
         g.push(m % 10);
         m /= 10;
         ++exponent;
     }
-    if ((exponent < kMIN_EXPONENT) || (m < minMantissa))
+    if ((exponent < kMinExponent) || (m < minMantissa))
     {
-        mantissa = kZERO.mantissa_;
-        exponent = kZERO.exponent_;
-        negative = kZERO.negative_;
+        mantissa = kZero.mantissa_;
+        exponent = kZero.exponent_;
+        negative = kZero.negative_;
         return;
     }
 
@@ -419,9 +419,9 @@ doNormalize(
     //      9,900,000,000,000,123,450 or 9,900,000,000,000,123,460.
     // mantissa() will return mantissa_ / 10, and exponent() will return
     // exponent_ + 1.
-    if (m > kMAX_REP)
+    if (m > kMaxRep)
     {
-        if (exponent >= kMAX_EXPONENT)
+        if (exponent >= kMaxExponent)
             throw std::overflow_error("Number::normalize 1.5");
         g.push(m % 10);
         m /= 10;
@@ -431,7 +431,7 @@ doNormalize(
     // modification, it must be less than maxRep. In other words, the original
     // value should have been no more than maxRep * 10.
     // (maxRep * 10 > maxMantissa)
-    XRPL_ASSERT_PARTS(m <= kMAX_REP, "xrpl::doNormalize", "intermediate mantissa fits in int64");
+    XRPL_ASSERT_PARTS(m <= kMaxRep, "xrpl::doNormalize", "intermediate mantissa fits in int64");
     mantissa = m;
 
     g.doRoundUp(negative, mantissa, exponent, minMantissa, maxMantissa, "Number::normalize 2");
@@ -480,7 +480,7 @@ Number::normalize<unsigned long>(
 void
 Number::normalize()
 {
-    auto const& range = kRANGE.get();
+    auto const& range = kRange.get();
     normalize(negative_, mantissa_, exponent_, range.min, range.max);
 }
 
@@ -492,9 +492,9 @@ Number::shiftExponent(int exponentDelta) const
 {
     XRPL_ASSERT_PARTS(isnormal(), "xrpl::Number::shiftExponent", "normalized");
     auto const newExponent = exponent_ + exponentDelta;
-    if (newExponent >= kMAX_EXPONENT)
+    if (newExponent >= kMaxExponent)
         throw std::overflow_error("Number::shiftExponent");
-    if (newExponent < kMIN_EXPONENT)
+    if (newExponent < kMinExponent)
     {
         return Number{};
     }
@@ -506,17 +506,17 @@ Number::shiftExponent(int exponentDelta) const
 Number&
 Number::operator+=(Number const& y)
 {
-    constexpr Number kZERO = Number{};
-    if (y == kZERO)
+    static constexpr Number kZero = Number{};
+    if (y == kZero)
         return *this;
-    if (*this == kZERO)
+    if (*this == kZero)
     {
         *this = y;
         return *this;
     }
     if (*this == -y)
     {
-        *this = kZERO;
+        *this = kZero;
         return *this;
     }
 
@@ -559,14 +559,14 @@ Number::operator+=(Number const& y)
         } while (xe > ye);
     }
 
-    auto const& range = kRANGE.get();
+    auto const& range = kRange.get();
     auto const& minMantissa = range.min;
     auto const& maxMantissa = range.max;
 
     if (xn == yn)
     {
         xm += ym;
-        if (xm > maxMantissa || xm > kMAX_REP)
+        if (xm > maxMantissa || xm > kMaxRep)
         {
             g.push(xm % 10);
             xm /= 10;
@@ -586,7 +586,7 @@ Number::operator+=(Number const& y)
             xe = ye;
             xn = yn;
         }
-        while (xm < minMantissa && xm * 10 <= kMAX_REP)
+        while (xm < minMantissa && xm * 10 <= kMaxRep)
         {
             xm *= 10;
             xm -= g.pop();
@@ -633,10 +633,10 @@ divu10(uint128_t& u)
 Number&
 Number::operator*=(Number const& y)
 {
-    constexpr Number kZERO = Number{};
-    if (*this == kZERO)
+    static constexpr Number kZero = Number{};
+    if (*this == kZero)
         return *this;
-    if (y == kZERO)
+    if (y == kZero)
     {
         *this = y;
         return *this;
@@ -664,11 +664,11 @@ Number::operator*=(Number const& y)
     if (zn)
         g.setNegative();
 
-    auto const& range = kRANGE.get();
+    auto const& range = kRange.get();
     auto const& minMantissa = range.min;
     auto const& maxMantissa = range.max;
 
-    while (zm > maxMantissa || zm > kMAX_REP)
+    while (zm > maxMantissa || zm > kMaxRep)
     {
         // The following is optimization for:
         // g.push(static_cast<unsigned>(zm % 10));
@@ -696,10 +696,10 @@ Number::operator*=(Number const& y)
 Number&
 Number::operator/=(Number const& y)
 {
-    constexpr Number kZERO = Number{};
-    if (y == kZERO)
+    static constexpr Number kZero = Number{};
+    if (y == kZero)
         throw std::overflow_error("Number: divide by 0");
-    if (*this == kZERO)
+    if (*this == kZero)
         return *this;
     // n* = numerator
     // d* = denominator
@@ -718,7 +718,7 @@ Number::operator/=(Number const& y)
     auto dm = y.mantissa_;
     auto de = y.exponent_;
 
-    auto const& range = kRANGE.get();
+    auto const& range = kRange.get();
     auto const& minMantissa = range.min;
     auto const& maxMantissa = range.max;
 
@@ -728,8 +728,8 @@ Number::operator/=(Number const& y)
     // log(2^128,10) ~ 38.5
     // largeRange.log = 18, fits in 10^19
     // f can be up to 10^(38-19) = 10^19 safely
-    static_assert(kSMALL_RANGE.log == 15);
-    static_assert(kLARGE_RANGE.log == 18);
+    static_assert(kSmallRange.log == 15);
+    static_assert(kLargeRange.log == 18);
     bool const small = Number::getMantissaScale() == MantissaRange::MantissaScale::Small;
     uint128_t const f = small ? 100'000'000'000'000'000 : 10'000'000'000'000'000'000ULL;
     XRPL_ASSERT_PARTS(f >= minMantissa * 10, "Number::operator/=", "factor expected size");
@@ -808,7 +808,7 @@ operator rep() const
         }
         for (; offset > 0; --offset)
         {
-            if (drops > kMAX_REP / 10)
+            if (drops > kMaxRep / 10)
                 throw std::overflow_error("Number::operator rep() overflow");
             drops *= 10;
         }
@@ -839,8 +839,8 @@ std::string
 to_string(Number const& amount)
 {
     // keep full internal accuracy, but make more human friendly if possible
-    constexpr Number kZERO = Number{};
-    if (amount == kZERO)
+    static constexpr Number kZero = Number{};
+    if (amount == kZero)
         return "0";
 
     auto exponent = amount.exponent_;
@@ -851,7 +851,7 @@ to_string(Number const& amount)
     auto const rangeLog = Number::mantissaLog();
     if (((exponent != 0) && ((exponent < -(rangeLog + 10)) || (exponent > -(rangeLog - 10)))))
     {
-        while (mantissa != 0 && mantissa % 10 == 0 && exponent < Number::kMAX_EXPONENT)
+        while (mantissa != 0 && mantissa % 10 == 0 && exponent < Number::kMaxExponent)
         {
             mantissa /= 10;
             ++exponent;
@@ -959,7 +959,7 @@ power(Number const& f, unsigned n)
 Number
 root(Number f, unsigned d)
 {
-    constexpr Number kZERO = Number{};
+    static constexpr Number kZero = Number{};
     auto const one = Number::one();
 
     if (f == one || d == 1)
@@ -969,12 +969,12 @@ root(Number f, unsigned d)
         if (f == -one)
             return one;
         if (abs(f) < one)
-            return kZERO;
+            return kZero;
         throw std::overflow_error("Number::root infinity");
     }
-    if (f < kZERO && d % 2 == 0)
+    if (f < kZero && d % 2 == 0)
         throw std::overflow_error("Number::root nan");
-    if (f == kZERO)
+    if (f == kZero)
         return f;
 
     // Scale f into the range (0, 1) such that f's exponent is a multiple of d
@@ -993,7 +993,7 @@ root(Number f, unsigned d)
 
     XRPL_ASSERT_PARTS(f.isnormal(), "xrpl::root(Number, unsigned)", "f is normalized");
     bool neg = false;
-    if (f < kZERO)
+    if (f < kZero)
     {
         neg = true;
         f = -f;
@@ -1031,14 +1031,14 @@ root(Number f, unsigned d)
 Number
 root2(Number f)
 {
-    constexpr Number kZERO = Number{};
+    static constexpr Number kZero = Number{};
     auto const one = Number::one();
 
     if (f == one)
         return f;
-    if (f < kZERO)
+    if (f < kZero)
         throw std::overflow_error("Number::root nan");
-    if (f == kZERO)
+    if (f == kZero)
         return f;
 
     // Scale f into the range (0, 1) such that f's exponent is a multiple of d
@@ -1078,7 +1078,7 @@ root2(Number f)
 Number
 power(Number const& f, unsigned n, unsigned d)
 {
-    constexpr Number kZERO = Number{};
+    static constexpr Number kZero = Number{};
     auto const one = Number::one();
 
     if (f == one)
@@ -1091,7 +1091,7 @@ power(Number const& f, unsigned n, unsigned d)
         if (f == -one)
             return one;
         if (abs(f) < one)
-            return kZERO;
+            return kZero;
         // abs(f) > one
         throw std::overflow_error("Number::power infinity");
     }
@@ -1099,7 +1099,7 @@ power(Number const& f, unsigned n, unsigned d)
         return one;
     n /= g;
     d /= g;
-    if ((n % 2) == 1 && (d % 2) == 0 && f < kZERO)
+    if ((n % 2) == 1 && (d % 2) == 0 && f < kZero)
         throw std::overflow_error("Number::power nan");
     return root(power(f, n), d);
 }
diff --git a/src/libxrpl/basics/StringUtilities.cpp b/src/libxrpl/basics/StringUtilities.cpp
index fa35f7f740..f4edaf5aca 100644
--- a/src/libxrpl/basics/StringUtilities.cpp
+++ b/src/libxrpl/basics/StringUtilities.cpp
@@ -37,7 +37,7 @@ bool
 parseUrl(ParsedUrl& pUrl, std::string const& strUrl)
 {
     // scheme://username:password@hostname:port/rest
-    static boost::regex const kRE_URL(
+    static boost::regex const kReUrl(
         "(?i)\\`\\s*"
         // required scheme
         "([[:alpha:]][-+.[:alpha:][:digit:]]*?):"
@@ -58,7 +58,7 @@ parseUrl(ParsedUrl& pUrl, std::string const& strUrl)
     // Bail if there is no match.
     try
     {
-        if (!boost::regex_match(strUrl, smMatch, kRE_URL))
+        if (!boost::regex_match(strUrl, smMatch, kReUrl))
             return false;
     }
     catch (...)
diff --git a/src/libxrpl/basics/UptimeClock.cpp b/src/libxrpl/basics/UptimeClock.cpp
index 5b92617098..0ae5f6bfe9 100644
--- a/src/libxrpl/basics/UptimeClock.cpp
+++ b/src/libxrpl/basics/UptimeClock.cpp
@@ -7,15 +7,15 @@
 
 namespace xrpl {
 
-std::atomic<UptimeClock::rep> UptimeClock::kNOW{0};  // seconds since start
-std::atomic<bool> UptimeClock::kSTOP{false};         // stop update thread
+std::atomic<UptimeClock::rep> UptimeClock::kNow{0};  // seconds since start
+std::atomic<bool> UptimeClock::kStop{false};         // stop update thread
 
 // On xrpld shutdown, cancel and wait for the update thread
 UptimeClock::UpdateThread::~UpdateThread()
 {
     if (joinable())
     {
-        kSTOP = true;
+        kStop = true;
         // This join() may take up to a 1s, but happens only
         // once at xrpld shutdown.
         join();
@@ -30,13 +30,13 @@ UptimeClock::startClock()
         using namespace std;
         using namespace std::chrono;
 
-        // Wake up every second and update kNOW
+        // Wake up every second and update kNow
         auto next = system_clock::now() + 1s;
-        while (!kSTOP)
+        while (!kStop)
         {
             this_thread::sleep_until(next);
             next += 1s;
-            ++kNOW;
+            ++kNow;
         }
     }};
 }
@@ -49,10 +49,10 @@ UptimeClock::time_point
 UptimeClock::now()
 {
     // start the update thread on first use
-    static auto const kINIT = startClock();
+    static auto const kInit = startClock();
 
     // Return the number of seconds since xrpld start
-    return time_point{duration{kNOW}};
+    return time_point{duration{kNow}};
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/basics/base64.cpp b/src/libxrpl/basics/base64.cpp
index 7a649a8c3a..541ddd0839 100644
--- a/src/libxrpl/basics/base64.cpp
+++ b/src/libxrpl/basics/base64.cpp
@@ -47,15 +47,15 @@ namespace base64 {
 inline char const*
 getAlphabet()
 {
-    static char constexpr kTAB[] = {
+    static constexpr char kTab[] = {
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"};
-    return &kTAB[0];
+    return &kTab[0];
 }
 
 inline signed char const*
 getInverse()
 {
-    static signed char constexpr kTAB[] = {
+    static constexpr signed char kTab[] = {
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  //   0-15
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  //  16-31
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,  //  32-47
@@ -73,17 +73,19 @@ getInverse()
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,  // 224-239
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1   // 240-255
     };
-    return &kTAB[0];
+    return &kTab[0];
 }
 
 /// Returns max chars needed to encode a base64 string
-std::size_t constexpr encodedSize(std::size_t n)
+constexpr std::size_t
+encodedSize(std::size_t n)
 {
     return 4 * ((n + 2) / 3);
 }
 
 /// Returns max bytes needed to decode a base64 string
-std::size_t constexpr decodedSize(std::size_t n)
+constexpr std::size_t
+decodedSize(std::size_t n)
 {
     return ((n / 4) * 3) + 2;
 }
diff --git a/src/libxrpl/basics/make_SSLContext.cpp b/src/libxrpl/basics/make_SSLContext.cpp
index 89da14333a..165d36076b 100644
--- a/src/libxrpl/basics/make_SSLContext.cpp
+++ b/src/libxrpl/basics/make_SSLContext.cpp
@@ -60,7 +60,7 @@ int gDefaultRsaKeyBits = 2048;
     @note If you increase the number of bits you need to update
           defaultRSAKeyBits accordingly.
  */
-static constexpr char const kDEFAULT_DH[] =
+static constexpr char kDefaultDh[] =
     "-----BEGIN DH PARAMETERS-----\n"
     "MIIBCAKCAQEApKSWfR7LKy0VoZ/SDCObCvJ5HKX2J93RJ+QN8kJwHh+uuA8G+t8Q\n"
     "MDRjL5HanlV/sKN9HXqBc7eqHmmbqYwIXKUt9MUZTLNheguddxVlc2IjdP5i9Ps8\n"
@@ -84,14 +84,14 @@ static constexpr char const kDEFAULT_DH[] =
           global or per-port basis, using the `ssl_ciphers` directive in the
           config file.
  */
-std::string const kDEFAULT_CIPHER_LIST = "TLSv1.2:!CBC:!DSS:!PSK:!eNULL:!aNULL";
+std::string const kDefaultCipherList = "TLSv1.2:!CBC:!DSS:!PSK:!eNULL:!aNULL";
 
 static void
 initAnonymous(boost::asio::ssl::context& context)
 {
     using namespace openssl;
 
-    static auto kDEFAULT_RSA = []() {
+    static auto kDefaultRsa = []() {
         BIGNUM* bn = BN_new();
         BN_set_word(bn, RSA_F4);
 
@@ -108,7 +108,7 @@ initAnonymous(boost::asio::ssl::context& context)
         return rsa;
     }();
 
-    static auto kDEFAULT_EPHEMERAL_PRIVATE_KEY = []() {
+    static auto kDefaultEphemeralPrivateKey = []() {
         auto pkey = EVP_PKEY_new();
 
         if (!pkey)
@@ -116,16 +116,16 @@ initAnonymous(boost::asio::ssl::context& context)
 
         // We need to up the reference count of here, since we are retaining a
         // copy of the key for (potential) reuse.
-        if (RSA_up_ref(kDEFAULT_RSA) != 1)
+        if (RSA_up_ref(kDefaultRsa) != 1)
             logicError("EVP_PKEY_assign_RSA: incrementing reference count failed");
 
-        if (!EVP_PKEY_assign_RSA(pkey, kDEFAULT_RSA))
+        if (!EVP_PKEY_assign_RSA(pkey, kDefaultRsa))
             logicError("EVP_PKEY_assign_RSA failed");
 
         return pkey;
     }();
 
-    static auto kDEFAULT_CERT = []() {
+    static auto kDefaultCert = []() {
         auto x509 = X509_new();
 
         if (x509 == nullptr)
@@ -205,9 +205,9 @@ initAnonymous(boost::asio::ssl::context& context)
         }
 
         // And a private key
-        X509_set_pubkey(x509, kDEFAULT_EPHEMERAL_PRIVATE_KEY);
+        X509_set_pubkey(x509, kDefaultEphemeralPrivateKey);
 
-        if (!X509_sign(x509, kDEFAULT_EPHEMERAL_PRIVATE_KEY, EVP_sha256()))
+        if (!X509_sign(x509, kDefaultEphemeralPrivateKey, EVP_sha256()))
             logicError("X509_sign failed");
 
         return x509;
@@ -215,10 +215,10 @@ initAnonymous(boost::asio::ssl::context& context)
 
     SSL_CTX* const ctx = context.native_handle();
 
-    if (SSL_CTX_use_certificate(ctx, kDEFAULT_CERT) <= 0)
+    if (SSL_CTX_use_certificate(ctx, kDefaultCert) <= 0)
         logicError("SSL_CTX_use_certificate failed");
 
-    if (SSL_CTX_use_PrivateKey(ctx, kDEFAULT_EPHEMERAL_PRIVATE_KEY) <= 0)
+    if (SSL_CTX_use_PrivateKey(ctx, kDefaultEphemeralPrivateKey) <= 0)
         logicError("SSL_CTX_use_PrivateKey failed");
 }
 
@@ -330,12 +330,12 @@ getContext(std::string cipherList)
         boost::asio::ssl::context::no_compression);
 
     if (cipherList.empty())
-        cipherList = kDEFAULT_CIPHER_LIST;
+        cipherList = kDefaultCipherList;
 
     if (auto result = SSL_CTX_set_cipher_list(c->native_handle(), cipherList.c_str()); result != 1)
         logicError("SSL_CTX_set_cipher_list failed");
 
-    c->use_tmp_dh({std::addressof(detail::kDEFAULT_DH), sizeof(kDEFAULT_DH)});
+    c->use_tmp_dh({std::addressof(detail::kDefaultDh), sizeof(kDefaultDh)});
 
     // Disable all renegotiation support in TLS v1.2. This can help prevent
     // exploitation of the bug described in CVE-2021-3499 (for details see
diff --git a/src/libxrpl/basics/mulDiv.cpp b/src/libxrpl/basics/mulDiv.cpp
index 64d37a35c3..b5e6304738 100644
--- a/src/libxrpl/basics/mulDiv.cpp
+++ b/src/libxrpl/basics/mulDiv.cpp
@@ -15,7 +15,7 @@ mulDiv(std::uint64_t value, std::uint64_t mul, std::uint64_t div)
 
     result /= div;
 
-    if (result > xrpl::kMULDIV_MAX)
+    if (result > xrpl::kMuldivMax)
         return std::nullopt;
 
     return static_cast<std::uint64_t>(result);
diff --git a/src/libxrpl/beast/clock/basic_seconds_clock.cpp b/src/libxrpl/beast/clock/basic_seconds_clock.cpp
index 886887dd97..ec003ffb1f 100644
--- a/src/libxrpl/beast/clock/basic_seconds_clock.cpp
+++ b/src/libxrpl/beast/clock/basic_seconds_clock.cpp
@@ -81,8 +81,8 @@ SecondsClockThread::run()
 BasicSecondsClock::time_point
 BasicSecondsClock::now()
 {
-    static SecondsClockThread kCLK;
-    return kCLK.now();
+    static SecondsClockThread kClk;
+    return kClk.now();
 }
 
 }  // namespace beast
diff --git a/src/libxrpl/beast/core/CurrentThreadName.cpp b/src/libxrpl/beast/core/CurrentThreadName.cpp
index 39daa286c6..52d9063179 100644
--- a/src/libxrpl/beast/core/CurrentThreadName.cpp
+++ b/src/libxrpl/beast/core/CurrentThreadName.cpp
@@ -80,20 +80,19 @@ inline void
 setCurrentThreadNameImpl(std::string_view name)
 {
     // truncate and set the thread name.
-    char boundedName[kMAX_THREAD_NAME_LENGTH + 1];
+    char boundedName[kMaxThreadNameLength + 1];
     auto const boundedSize =
-        name.size() < kMAX_THREAD_NAME_LENGTH ? name.size() : kMAX_THREAD_NAME_LENGTH;
+        name.size() < kMaxThreadNameLength ? name.size() : kMaxThreadNameLength;
     name.copy(boundedName, boundedSize);
     boundedName[boundedSize] = '\0';
 
     pthread_setname_np(pthread_self(), boundedName);
 
 #ifdef TRUNCATED_THREAD_NAME_LOGS
-    if (name.size() > kMAX_THREAD_NAME_LENGTH)
+    if (name.size() > kMaxThreadNameLength)
     {
         std::cerr << "WARNING: Thread name \"" << name << "\" (length " << name.size()
-                  << ") exceeds maximum of " << kMAX_THREAD_NAME_LENGTH
-                  << " characters on Linux.\n";
+                  << ") exceeds maximum of " << kMaxThreadNameLength << " characters on Linux.\n";
     }
 #endif
 }
diff --git a/src/libxrpl/beast/insight/StatsDCollector.cpp b/src/libxrpl/beast/insight/StatsDCollector.cpp
index 55042b1bf4..7d460d54ef 100644
--- a/src/libxrpl/beast/insight/StatsDCollector.cpp
+++ b/src/libxrpl/beast/insight/StatsDCollector.cpp
@@ -204,7 +204,7 @@ class StatsDCollectorImp : public StatsDCollector,
                            public std::enable_shared_from_this<StatsDCollectorImp>
 {
 private:
-    static constexpr auto kMAX_PACKET_SIZE = 1472;
+    static constexpr auto kMaxPacketSize = 1472;
 
     Journal journal_;
     IP::Endpoint address_;
@@ -387,7 +387,7 @@ public:
                 !s.empty(),
                 "beast::insight::detail::StatsDCollectorImp::sendBuffers : "
                 "non-empty payload");
-            if (!buffers.empty() && (size + length) > kMAX_PACKET_SIZE)
+            if (!buffers.empty() && (size + length) > kMaxPacketSize)
             {
                 log(buffers);
                 socket_.async_send(
diff --git a/src/libxrpl/beast/net/IPAddressV4.cpp b/src/libxrpl/beast/net/IPAddressV4.cpp
index e087da92eb..f9b0c96022 100644
--- a/src/libxrpl/beast/net/IPAddressV4.cpp
+++ b/src/libxrpl/beast/net/IPAddressV4.cpp
@@ -58,8 +58,8 @@ isPublic(AddressV4 const& addr)
 char
 getClass(AddressV4 const& addr)
 {
-    static char const* kTABLE = "AAAABBCD";  // cspell:disable-line
-    return kTABLE[(addr.to_uint() & 0xE0000000) >> 29];
+    static char const* kTable = "AAAABBCD";  // cspell:disable-line
+    return kTable[(addr.to_uint() & 0xE0000000) >> 29];
 }
 
 }  // namespace beast::IP
diff --git a/src/libxrpl/beast/utility/beast_Journal.cpp b/src/libxrpl/beast/utility/beast_Journal.cpp
index 2a8efe3b11..0837dd2392 100644
--- a/src/libxrpl/beast/utility/beast_Journal.cpp
+++ b/src/libxrpl/beast/utility/beast_Journal.cpp
@@ -62,8 +62,8 @@ public:
 Journal::Sink&
 Journal::getNullSink()
 {
-    static NullJournalSink kSINK;
-    return kSINK;
+    static NullJournalSink kSink;
+    return kSink;
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/libxrpl/conditions/Condition.cpp b/src/libxrpl/conditions/Condition.cpp
index 004778bc4e..cb950c9e24 100644
--- a/src/libxrpl/conditions/Condition.cpp
+++ b/src/libxrpl/conditions/Condition.cpp
@@ -52,7 +52,7 @@ namespace detail {
 //      ed25519Sha256    (4)
 //    }
 
-constexpr std::size_t kFINGERPRINT_SIZE = 32;
+constexpr std::size_t kFingerprintSize = 32;
 
 std::unique_ptr<Condition>
 loadSimpleSha256(Type type, Slice s, std::error_code& ec)
@@ -76,7 +76,7 @@ loadSimpleSha256(Type type, Slice s, std::error_code& ec)
         return {};
     }
 
-    if (p.length != kFINGERPRINT_SIZE)
+    if (p.length != kFingerprintSize)
     {
         ec = Error::FingerprintSize;
         return {};
@@ -118,7 +118,7 @@ loadSimpleSha256(Type type, Slice s, std::error_code& ec)
     switch (type)
     {
         case Type::PreimageSha256:
-            if (cost > PreimageSha256::kMAX_PREIMAGE_LENGTH)
+            if (cost > PreimageSha256::kMaxPreimageLength)
             {
                 ec = Error::PreimageTooLong;
                 return {};
@@ -173,7 +173,7 @@ Condition::deserialize(Slice s, std::error_code& ec)
         return {};
     }
 
-    if (s.size() > kMAX_SERIALIZED_CONDITION)
+    if (s.size() > kMaxSerializedCondition)
     {
         ec = Error::LargeSize;
         return {};
diff --git a/src/libxrpl/conditions/Fulfillment.cpp b/src/libxrpl/conditions/Fulfillment.cpp
index 52f89a6150..eaad6b8cdb 100644
--- a/src/libxrpl/conditions/Fulfillment.cpp
+++ b/src/libxrpl/conditions/Fulfillment.cpp
@@ -82,7 +82,7 @@ Fulfillment::deserialize(Slice s, std::error_code& ec)
         return {};
     }
 
-    if (p.length > kMAX_SERIALIZED_FULFILLMENT)
+    if (p.length > kMaxSerializedFulfillment)
     {
         ec = Error::LargeSize;
         return {};
diff --git a/src/libxrpl/conditions/error.cpp b/src/libxrpl/conditions/error.cpp
index a26a153975..48e8ece94f 100644
--- a/src/libxrpl/conditions/error.cpp
+++ b/src/libxrpl/conditions/error.cpp
@@ -101,8 +101,8 @@ public:
 inline std::error_category const&
 getCryptoconditionsErrorCategory()
 {
-    static CryptoconditionsErrorCategory const kCAT{};
-    return kCAT;
+    static CryptoconditionsErrorCategory const kCat{};
+    return kCat;
 }
 
 }  // namespace detail
diff --git a/src/libxrpl/core/detail/Workers.cpp b/src/libxrpl/core/detail/Workers.cpp
index 991c51b77a..0d9c1afd26 100644
--- a/src/libxrpl/core/detail/Workers.cpp
+++ b/src/libxrpl/core/detail/Workers.cpp
@@ -46,7 +46,7 @@ Workers::getNumberOfThreads() const noexcept
 void
 Workers::setNumberOfThreads(int numberOfThreads)
 {
-    static int kINSTANCE{0};
+    static int kInstance{0};
     if (numberOfThreads_ == numberOfThreads)
         return;
 
@@ -72,7 +72,7 @@ Workers::setNumberOfThreads(int numberOfThreads)
             }
             else
             {
-                worker = new Worker(*this, threadNames_, kINSTANCE++);
+                worker = new Worker(*this, threadNames_, kInstance++);
                 everyone_.pushFront(worker);
             }
         }
diff --git a/src/libxrpl/crypto/csprng.cpp b/src/libxrpl/crypto/csprng.cpp
index 897432fcf1..e000786c4a 100644
--- a/src/libxrpl/crypto/csprng.cpp
+++ b/src/libxrpl/crypto/csprng.cpp
@@ -80,8 +80,8 @@ CsprngEngine::operator()()
 CsprngEngine&
 cryptoPrng()
 {
-    static CsprngEngine kENGINE;
-    return kENGINE;
+    static CsprngEngine kEngine;
+    return kEngine;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/git/Git.cpp b/src/libxrpl/git/Git.cpp
index e13b2ef693..d5f3a24b3a 100644
--- a/src/libxrpl/git/Git.cpp
+++ b/src/libxrpl/git/Git.cpp
@@ -11,21 +11,21 @@
 
 namespace xrpl::git {
 
-static constexpr char kGIT_COMMIT_HASH[] = GIT_COMMIT_HASH;
-static constexpr char kGIT_BUILD_BRANCH[] = GIT_BUILD_BRANCH;
+static constexpr char kGitCommitHash[] = GIT_COMMIT_HASH;
+static constexpr char kGitBuildBranch[] = GIT_BUILD_BRANCH;
 
 std::string const&
 getCommitHash()
 {
-    static std::string const kVALUE = kGIT_COMMIT_HASH;
-    return kVALUE;
+    static std::string const kValue = kGitCommitHash;
+    return kValue;
 }
 
 std::string const&
 getBuildBranch()
 {
-    static std::string const kVALUE = kGIT_BUILD_BRANCH;
-    return kVALUE;
+    static std::string const kValue = kGitBuildBranch;
+    return kValue;
 }
 
 }  // namespace xrpl::git
diff --git a/src/libxrpl/json/Writer.cpp b/src/libxrpl/json/Writer.cpp
index 518573ded4..c5c4b3cd31 100644
--- a/src/libxrpl/json/Writer.cpp
+++ b/src/libxrpl/json/Writer.cpp
@@ -26,18 +26,18 @@ std::map<char, char const*> gJsonSpecialCharacterEscape = {
     {'\r', "\\r"},
     {'\t', "\\t"}};
 
-size_t const kJSON_ESCAPE_LENGTH = 2;
+size_t const kJsonEscapeLength = 2;
 
 // All other JSON punctuation.
-char const kCLOSE_BRACE = '}';
-char const kCLOSE_BRACKET = ']';
-char const kCOLON = ':';
-char const kCOMMA = ',';
-char const kOPEN_BRACE = '{';
-char const kOPEN_BRACKET = '[';
-char const kQUOTE = '"';
+char const kCloseBrace = '}';
+char const kCloseBracket = ']';
+char const kColon = ':';
+char const kComma = ',';
+char const kOpenBrace = '{';
+char const kOpenBracket = '[';
+char const kQuote = '"';
 
-auto const kINTEGRAL_FLOATS_BECOME_INTS = false;
+auto const kIntegralFloatsBecomeInts = false;
 
 size_t
 lengthWithoutTrailingZeros(std::string const& s)
@@ -52,7 +52,7 @@ lengthWithoutTrailingZeros(std::string const& s)
     if (hasDecimals)
         return lastNonZero + 1;
 
-    if (kINTEGRAL_FLOATS_BECOME_INTS || lastNonZero + 2 > s.size())
+    if (kIntegralFloatsBecomeInts || lastNonZero + 2 > s.size())
         return lastNonZero;
 
     return lastNonZero + 2;
@@ -81,7 +81,7 @@ public:
     void
     start(CollectionType ct)
     {
-        char const ch = (ct == CollectionType::Array) ? kOPEN_BRACKET : kOPEN_BRACE;
+        char const ch = (ct == CollectionType::Array) ? kOpenBracket : kOpenBrace;
         output({&ch, 1});
         stack_.emplace(Collection{.type = ct});
     }
@@ -99,7 +99,7 @@ public:
         markStarted();
         std::size_t position = 0, writtenUntil = 0;
 
-        output_({&kQUOTE, 1});
+        output_({&kQuote, 1});
         auto data = bytes.data();
         for (; position < bytes.size(); ++position)
         {
@@ -110,13 +110,13 @@ public:
                 {
                     output_({data + writtenUntil, position - writtenUntil});
                 }
-                output_({i->second, kJSON_ESCAPE_LENGTH});
+                output_({i->second, kJsonEscapeLength});
                 writtenUntil = position + 1;
             };
         }
         if (writtenUntil < position)
             output_({data + writtenUntil, position - writtenUntil});
-        output_({&kQUOTE, 1});
+        output_({&kQuote, 1});
     }
 
     void
@@ -144,7 +144,7 @@ public:
         }
         else
         {
-            output_({&kCOMMA, 1});
+            output_({&kComma, 1});
         }
     }
 
@@ -159,7 +159,7 @@ public:
 #endif
 
         stringOutput(tag);
-        output_({&kCOLON, 1});
+        output_({&kColon, 1});
     }
 
     [[nodiscard]] bool
@@ -174,7 +174,7 @@ public:
         check(!empty(), "Empty stack in finish()");
 
         auto isArray = stack_.top().type == CollectionType::Array;
-        auto ch = isArray ? kCLOSE_BRACKET : kCLOSE_BRACE;
+        auto ch = isArray ? kCloseBracket : kCloseBrace;
         output_({&ch, 1});
         stack_.pop();
     }
diff --git a/src/libxrpl/json/json_reader.cpp b/src/libxrpl/json/json_reader.cpp
index 3e8eb1e094..3786f51fdd 100644
--- a/src/libxrpl/json/json_reader.cpp
+++ b/src/libxrpl/json/json_reader.cpp
@@ -117,7 +117,7 @@ Reader::readValue(unsigned depth)
 {
     Token token{};
     skipCommentTokens(token);
-    if (depth > kNEST_LIMIT)
+    if (depth > kNestLimit)
         return addError("Syntax error: maximum nesting depth exceeded", token);
     bool successful = true;
 
@@ -352,7 +352,7 @@ Reader::readCppStyleComment()
 Reader::TokenType
 Reader::readNumber()
 {
-    static char const kEXTENDED_TOKENS[] = {'.', 'e', 'E', '+', '-'};
+    static char const kExtendedTokens[] = {'.', 'e', 'E', '+', '-'};
 
     TokenType type = TokenType::Integer;
 
@@ -365,9 +365,9 @@ Reader::readNumber()
         {
             if (std::isdigit(static_cast<unsigned char>(*current_)) == 0)
             {
-                auto ret = std::ranges::find(kEXTENDED_TOKENS, *current_);
+                auto ret = std::ranges::find(kExtendedTokens, *current_);
 
-                if (ret == std::end(kEXTENDED_TOKENS))
+                if (ret == std::end(kExtendedTokens))
                     break;
 
                 type = TokenType::Double;
@@ -542,10 +542,10 @@ Reader::decodeNumber(Token& token)
     std::int64_t value = 0;
 
     static_assert(
-        sizeof(value) > sizeof(Value::kMAX_UINT),
+        sizeof(value) > sizeof(Value::kMaxUInt),
         "The JSON integer overflow logic will need to be reworked.");
 
-    while (current < token.end && (value <= Value::kMAX_UINT))
+    while (current < token.end && (value <= Value::kMaxUInt))
     {
         Char const c = *current++;
 
@@ -569,7 +569,7 @@ Reader::decodeNumber(Token& token)
     {
         value = -value;
 
-        if (value < Value::kMIN_INT || value > Value::kMAX_INT)
+        if (value < Value::kMinInt || value > Value::kMaxInt)
         {
             return addError(
                 "'" + std::string(token.start, token.end) + "' exceeds the allowable range.",
@@ -580,7 +580,7 @@ Reader::decodeNumber(Token& token)
     }
     else
     {
-        if (value > Value::kMAX_UINT)
+        if (value > Value::kMaxUInt)
         {
             return addError(
                 "'" + std::string(token.start, token.end) + "' exceeds the allowable range.",
@@ -588,7 +588,7 @@ Reader::decodeNumber(Token& token)
         }
 
         // If it's representable as a signed integer, construct it as one.
-        if (value <= Value::kMAX_INT)
+        if (value <= Value::kMaxInt)
         {
             currentValue() = static_cast<Value::Int>(value);
         }
diff --git a/src/libxrpl/json/json_value.cpp b/src/libxrpl/json/json_value.cpp
index b150ea0842..93875f497a 100644
--- a/src/libxrpl/json/json_value.cpp
+++ b/src/libxrpl/json/json_value.cpp
@@ -17,7 +17,7 @@
 
 namespace json {
 
-Value const Value::kNULL;
+Value const Value::kNull;
 
 class DefaultValueAllocator : public ValueAllocator
 {
@@ -37,13 +37,13 @@ public:
     }
 
     char*
-    duplicateStringValue(char const* value, unsigned int length = kUNKNOWN) override
+    duplicateStringValue(char const* value, unsigned int length = kUnknown) override
     {
         //@todo investigate this old optimization
         // if ( !value  ||  value[0] == 0 )
         //   return 0;
 
-        if (length == kUNKNOWN)
+        if (length == kUnknown)
             length = (value != nullptr) ? (unsigned int)strlen(value) : 0;
 
         char* newString = static_cast<char*>(malloc(length + 1));
@@ -64,8 +64,8 @@ public:
 static ValueAllocator*&
 valueAllocator()
 {
-    static ValueAllocator* kVALUE_ALLOCATOR = new DefaultValueAllocator;  // NOLINT TODO
-    return kVALUE_ALLOCATOR;
+    static ValueAllocator* kValueAllocator = new DefaultValueAllocator;  // NOLINT TODO
+    return kValueAllocator;
 }
 
 static struct DummyValueAllocatorInitializer
@@ -528,12 +528,12 @@ Value::asInt() const
 
         case ValueType::UInt:
             JSON_ASSERT_MESSAGE(
-                value_.uintVal < (unsigned)kMAX_INT, "integer out of signed integer range");
+                value_.uintVal < (unsigned)kMaxInt, "integer out of signed integer range");
             return value_.uintVal;
 
         case ValueType::Real:
             JSON_ASSERT_MESSAGE(
-                (value_.realVal >= kMIN_INT && value_.realVal <= kMAX_INT),
+                (value_.realVal >= kMinInt && value_.realVal <= kMaxInt),
                 "Real out of signed integer range");
             return Int(value_.realVal);
 
@@ -581,10 +581,10 @@ Value::asAbsUInt() const
             if (value_.realVal < 0)
             {
                 JSON_ASSERT_MESSAGE(
-                    -1 * value_.realVal <= kMAX_UINT, "Real out of unsigned integer range");
+                    -1 * value_.realVal <= kMaxUInt, "Real out of unsigned integer range");
                 return UInt(-1 * value_.realVal);
             }
-            JSON_ASSERT_MESSAGE(value_.realVal <= kMAX_UINT, "Real out of unsigned integer range");
+            JSON_ASSERT_MESSAGE(value_.realVal <= kMaxUInt, "Real out of unsigned integer range");
             return UInt(value_.realVal);
         }
 
@@ -596,10 +596,10 @@ Value::asAbsUInt() const
             auto const temp = beast::lexicalCastThrow<std::int64_t>(str);
             if (temp < 0)
             {
-                JSON_ASSERT_MESSAGE(-1 * temp <= kMAX_UINT, "String out of unsigned integer range");
+                JSON_ASSERT_MESSAGE(-1 * temp <= kMaxUInt, "String out of unsigned integer range");
                 return -1 * temp;
             }
-            JSON_ASSERT_MESSAGE(temp <= kMAX_UINT, "String out of unsigned integer range");
+            JSON_ASSERT_MESSAGE(temp <= kMaxUInt, "String out of unsigned integer range");
             return temp;
         }
 
@@ -634,7 +634,7 @@ Value::asUInt() const
 
         case ValueType::Real:
             JSON_ASSERT_MESSAGE(
-                (value_.realVal >= 0 && value_.realVal <= kMAX_UINT),
+                (value_.realVal >= 0 && value_.realVal <= kMaxUInt),
                 "Real out of unsigned integer range");
             return UInt(value_.realVal);
 
@@ -742,15 +742,15 @@ Value::isConvertibleTo(ValueType other) const
 
         case ValueType::UInt:
             return (other == ValueType::Null && value_.uintVal == 0) ||
-                (other == ValueType::Int && value_.uintVal <= (unsigned)kMAX_INT) ||
+                (other == ValueType::Int && value_.uintVal <= (unsigned)kMaxInt) ||
                 other == ValueType::UInt || other == ValueType::Real ||
                 other == ValueType::String || other == ValueType::Boolean;
 
         case ValueType::Real:
             return (other == ValueType::Null && value_.realVal == 0.0) ||
-                (other == ValueType::Int && value_.realVal >= kMIN_INT &&
-                 value_.realVal <= kMAX_INT) ||
-                (other == ValueType::UInt && value_.realVal >= 0 && value_.realVal <= kMAX_UINT &&
+                (other == ValueType::Int && value_.realVal >= kMinInt &&
+                 value_.realVal <= kMaxInt) ||
+                (other == ValueType::UInt && value_.realVal >= 0 && value_.realVal <= kMaxUInt &&
                  std::fabs(round(value_.realVal) - value_.realVal) <
                      std::numeric_limits<double>::epsilon()) ||
                 other == ValueType::Real || other == ValueType::String ||
@@ -869,7 +869,7 @@ Value::operator[](UInt index)
     if (it != value_.mapVal->end() && (*it).first == key)
         return (*it).second;
 
-    ObjectValues::value_type const defaultValue(key, kNULL);
+    ObjectValues::value_type const defaultValue(key, kNull);
     it = value_.mapVal->insert(it, defaultValue);
     return (*it).second;
 }
@@ -882,13 +882,13 @@ Value::operator[](UInt index) const
         "json::Value::operator[](UInt) const : valid type");
 
     if (type_ == ValueType::Null)
-        return kNULL;
+        return kNull;
 
     CZString const key(index);
     ObjectValues::const_iterator const it = value_.mapVal->find(key);
 
     if (it == value_.mapVal->end())
-        return kNULL;
+        return kNull;
 
     return (*it).second;
 }
@@ -918,7 +918,7 @@ Value::resolveReference(char const* key, bool isStatic)
     if (it != value_.mapVal->end() && (*it).first == actualKey)
         return (*it).second;
 
-    ObjectValues::value_type const defaultValue(actualKey, kNULL);
+    ObjectValues::value_type const defaultValue(actualKey, kNull);
     it = value_.mapVal->insert(it, defaultValue);
     Value& value = (*it).second;
     return value;
@@ -928,7 +928,7 @@ Value
 Value::get(UInt index, Value const& defaultValue) const
 {
     Value const* value = &((*this)[index]);
-    return value == &kNULL ? defaultValue : *value;
+    return value == &kNull ? defaultValue : *value;
 }
 
 bool
@@ -945,13 +945,13 @@ Value::operator[](char const* key) const
         "json::Value::operator[](const char*) const : valid type");
 
     if (type_ == ValueType::Null)
-        return kNULL;
+        return kNull;
 
     CZString const actualKey(key, CZString::DuplicationPolicy::NoDuplication);
     ObjectValues::const_iterator const it = value_.mapVal->find(actualKey);
 
     if (it == value_.mapVal->end())
-        return kNULL;
+        return kNull;
 
     return (*it).second;
 }
@@ -996,7 +996,7 @@ Value
 Value::get(char const* key, Value const& defaultValue) const
 {
     Value const* value = &((*this)[key]);
-    return value == &kNULL ? defaultValue : *value;
+    return value == &kNull ? defaultValue : *value;
 }
 
 Value
@@ -1013,13 +1013,13 @@ Value::removeMember(char const* key)
         "json::Value::removeMember : valid type");
 
     if (type_ == ValueType::Null)
-        return kNULL;
+        return kNull;
 
     CZString const actualKey(key, CZString::DuplicationPolicy::NoDuplication);
     ObjectValues::iterator const it = value_.mapVal->find(actualKey);
 
     if (it == value_.mapVal->end())
-        return kNULL;
+        return kNull;
 
     Value old(it->second);
     value_.mapVal->erase(it);
@@ -1039,7 +1039,7 @@ Value::isMember(char const* key) const
         return false;
 
     Value const* value = &((*this)[key]);
-    return value != &kNULL;
+    return value != &kNull;
 }
 
 bool
diff --git a/src/libxrpl/ledger/ApplyStateTable.cpp b/src/libxrpl/ledger/ApplyStateTable.cpp
index 608648de12..70fa0aef5d 100644
--- a/src/libxrpl/ledger/ApplyStateTable.cpp
+++ b/src/libxrpl/ledger/ApplyStateTable.cpp
@@ -169,7 +169,7 @@ ApplyStateTable::apply(
                 {
                     // go through the original node for
                     // modified  fields saved on modification
-                    if (obj.getFName().shouldMeta(SField::kSMD_CHANGE_ORIG) &&
+                    if (obj.getFName().shouldMeta(SField::kSmdChangeOrig) &&
                         !curNode->hasMatchingEntry(obj))
                         prevs.emplaceBack(obj);
                 }
@@ -181,7 +181,7 @@ ApplyStateTable::apply(
                 for (auto const& obj : *curNode)
                 {
                     // go through the final node for final fields
-                    if (obj.getFName().shouldMeta(SField::kSMD_ALWAYS | SField::kSMD_DELETE_FINAL))
+                    if (obj.getFName().shouldMeta(SField::kSmdAlways | SField::kSmdDeleteFinal))
                         finals.emplaceBack(obj);
                 }
 
@@ -205,7 +205,7 @@ ApplyStateTable::apply(
                 for (auto const& obj : *origNode)
                 {
                     // search the original node for values saved on modify
-                    if (obj.getFName().shouldMeta(SField::kSMD_CHANGE_ORIG) &&
+                    if (obj.getFName().shouldMeta(SField::kSmdChangeOrig) &&
                         !curNode->hasMatchingEntry(obj))
                         prevs.emplaceBack(obj);
                 }
@@ -217,7 +217,7 @@ ApplyStateTable::apply(
                 for (auto const& obj : *curNode)
                 {
                     // search the final node for values saved always
-                    if (obj.getFName().shouldMeta(SField::kSMD_ALWAYS | SField::kSMD_CHANGE_NEW))
+                    if (obj.getFName().shouldMeta(SField::kSmdAlways | SField::kSmdChangeNew))
                         finals.emplaceBack(obj);
                 }
 
@@ -240,7 +240,7 @@ ApplyStateTable::apply(
                 {
                     // save non-default values
                     if (!obj.isDefault() &&
-                        obj.getFName().shouldMeta(SField::kSMD_CREATE | SField::kSMD_ALWAYS))
+                        obj.getFName().shouldMeta(SField::kSmdCreate | SField::kSmdAlways))
                         news.emplaceBack(obj);
                 }
 
diff --git a/src/libxrpl/ledger/ApplyView.cpp b/src/libxrpl/ledger/ApplyView.cpp
index 3343748a75..2200afecac 100644
--- a/src/libxrpl/ledger/ApplyView.cpp
+++ b/src/libxrpl/ledger/ApplyView.cpp
@@ -125,7 +125,7 @@ insertPage(
     // Check whether we're out of pages.
     if (page == 0)
         return std::nullopt;
-    if (!view.rules().enabled(fixDirectoryLimit) && page >= kDIR_NODE_MAX_PAGES)  // Old pages limit
+    if (!view.rules().enabled(fixDirectoryLimit) && page >= kDirNodeMaxPages)  // Old pages limit
         return std::nullopt;
 
     // We are about to create a new node; we'll link it to
@@ -179,7 +179,7 @@ ApplyView::dirAdd(
     auto [page, node, indexes] = directory::findPreviousPage(*this, directory, root);
 
     // If there's space, we use it:
-    if (indexes.size() < kDIR_NODE_MAX_ENTRIES)
+    if (indexes.size() < kDirNodeMaxEntries)
     {
         return directory::insertKey(*this, node, page, preserveOrder, indexes, key);
     }
@@ -208,19 +208,19 @@ ApplyView::emptyDirDelete(Keylet const& directory)
     if (!node->getFieldV256(sfIndexes).empty())
         return false;
 
-    std::uint64_t constexpr kROOT_PAGE = 0;
+    static constexpr std::uint64_t kRootPage = 0;
     auto prevPage = node->getFieldU64(sfIndexPrevious);
     auto nextPage = node->getFieldU64(sfIndexNext);
 
-    if (nextPage == kROOT_PAGE && prevPage != kROOT_PAGE)
+    if (nextPage == kRootPage && prevPage != kRootPage)
         Throw<std::logic_error>("Directory chain: fwd link broken");  // LCOV_EXCL_LINE
 
-    if (prevPage == kROOT_PAGE && nextPage != kROOT_PAGE)
+    if (prevPage == kRootPage && nextPage != kRootPage)
         Throw<std::logic_error>("Directory chain: rev link broken");  // LCOV_EXCL_LINE
 
     // Older versions of the code would, in some cases, allow the last
     // page to be empty. Remove such pages:
-    if (nextPage == prevPage && nextPage != kROOT_PAGE)
+    if (nextPage == prevPage && nextPage != kRootPage)
     {
         auto last = peek(keylet::page(directory, nextPage));
 
@@ -232,8 +232,8 @@ ApplyView::emptyDirDelete(Keylet const& directory)
 
         // Update the first page's linked list and
         // mark it as updated.
-        node->setFieldU64(sfIndexNext, kROOT_PAGE);
-        node->setFieldU64(sfIndexPrevious, kROOT_PAGE);
+        node->setFieldU64(sfIndexNext, kRootPage);
+        node->setFieldU64(sfIndexPrevious, kRootPage);
         update(node);
 
         // And erase the empty last page:
@@ -241,12 +241,12 @@ ApplyView::emptyDirDelete(Keylet const& directory)
 
         // Make sure our local values reflect the
         // updated information:
-        nextPage = kROOT_PAGE;
-        prevPage = kROOT_PAGE;
+        nextPage = kRootPage;
+        prevPage = kRootPage;
     }
 
     // If there are no other pages, erase the root:
-    if (nextPage == kROOT_PAGE && prevPage == kROOT_PAGE)
+    if (nextPage == kRootPage && prevPage == kRootPage)
         erase(node);
 
     return true;
@@ -260,7 +260,7 @@ ApplyView::dirRemove(Keylet const& directory, std::uint64_t page, uint256 const&
     if (!node)
         return false;
 
-    std::uint64_t constexpr kROOT_PAGE = 0;
+    static constexpr std::uint64_t kRootPage = 0;
 
     {
         auto entries = node->getFieldV256(sfIndexes);
@@ -289,7 +289,7 @@ ApplyView::dirRemove(Keylet const& directory, std::uint64_t page, uint256 const&
     // treated specially: it can never be deleted even if
     // it is empty, unless we plan on removing the entire
     // directory.
-    if (page == kROOT_PAGE)
+    if (page == kRootPage)
     {
         if (nextPage == page && prevPage != page)
             Throw<std::logic_error>("Directory chain: fwd link broken");  // LCOV_EXCL_LINE
@@ -360,30 +360,30 @@ ApplyView::dirRemove(Keylet const& directory, std::uint64_t page, uint256 const&
 
     // Check whether the next page is the last page and, if
     // so, whether it's empty. If it is, delete it.
-    if (nextPage != kROOT_PAGE && next->getFieldU64(sfIndexNext) == kROOT_PAGE &&
+    if (nextPage != kRootPage && next->getFieldU64(sfIndexNext) == kRootPage &&
         next->getFieldV256(sfIndexes).empty())
     {
         // Since next doesn't point to the root, it can't be pointing to prev.
         erase(next);
 
         // The previous page is now the last page:
-        prev->setFieldU64(sfIndexNext, kROOT_PAGE);
+        prev->setFieldU64(sfIndexNext, kRootPage);
         update(prev);
 
         // And the root points to the last page:
-        auto root = peek(keylet::page(directory, kROOT_PAGE));
+        auto root = peek(keylet::page(directory, kRootPage));
         if (!root)
             Throw<std::logic_error>("Directory chain: root link broken.");  // LCOV_EXCL_LINE
 
         root->setFieldU64(sfIndexPrevious, prevPage);
         update(root);
 
-        nextPage = kROOT_PAGE;
+        nextPage = kRootPage;
     }
 
     // If we're not keeping the root, then check to see if
     // it's left empty. If so, delete it as well.
-    if (!keepRoot && nextPage == kROOT_PAGE && prevPage == kROOT_PAGE)
+    if (!keepRoot && nextPage == kRootPage && prevPage == kRootPage)
     {
         if (prev->getFieldV256(sfIndexes).empty())
             erase(prev);
diff --git a/src/libxrpl/ledger/BookDirs.cpp b/src/libxrpl/ledger/BookDirs.cpp
index fbe876669e..f3e41e4f58 100644
--- a/src/libxrpl/ledger/BookDirs.cpp
+++ b/src/libxrpl/ledger/BookDirs.cpp
@@ -15,10 +15,10 @@ BookDirs::BookDirs(ReadView const& view, Book const& book)
     : view_(&view)
     , root_(keylet::page(getBookBase(book)).key)
     , next_quality_(getQualityNext(root_))
-    , key_(view_->succ(root_, next_quality_).value_or(beast::kZERO))
+    , key_(view_->succ(root_, next_quality_).value_or(beast::kZero))
 {
-    XRPL_ASSERT(root_ != beast::kZERO, "xrpl::BookDirs::BookDirs : nonzero root");
-    if (key_ != beast::kZERO)
+    XRPL_ASSERT(root_ != beast::kZero, "xrpl::BookDirs::BookDirs : nonzero root");
+    if (key_ != beast::kZero)
     {
         if (!cdirFirst(*view_, key_, sle_, entry_, index_))
         {
@@ -33,7 +33,7 @@ auto
 BookDirs::begin() const -> BookDirs::const_iterator
 {
     auto it = BookDirs::const_iterator(*view_, root_, key_);
-    if (key_ != beast::kZERO)
+    if (key_ != beast::kZero)
     {
         it.next_quality_ = next_quality_;
         it.sle_ = sle_;
@@ -66,7 +66,7 @@ BookDirs::const_iterator::reference
 BookDirs::const_iterator::operator*() const
 {
     XRPL_ASSERT(
-        index_ != beast::kZERO, "xrpl::BookDirs::const_iterator::operator* : nonzero index");
+        index_ != beast::kZero, "xrpl::BookDirs::const_iterator::operator* : nonzero index");
     if (!cache_)
         cache_ = view_->read(keylet::offer(index_));
     return *cache_;
@@ -75,19 +75,19 @@ BookDirs::const_iterator::operator*() const
 BookDirs::const_iterator&
 BookDirs::const_iterator::operator++()
 {
-    using beast::kZERO;
+    using beast::kZero;
 
-    XRPL_ASSERT(index_ != kZERO, "xrpl::BookDirs::const_iterator::operator++ : nonzero index");
+    XRPL_ASSERT(index_ != kZero, "xrpl::BookDirs::const_iterator::operator++ : nonzero index");
     if (!cdirNext(*view_, cur_key_, sle_, entry_, index_))
     {
         if (index_ == 0)
-            cur_key_ = view_->succ(++cur_key_, next_quality_).value_or(kZERO);
+            cur_key_ = view_->succ(++cur_key_, next_quality_).value_or(kZero);
 
-        if (index_ != 0 || cur_key_ == kZERO)
+        if (index_ != 0 || cur_key_ == kZero)
         {
             cur_key_ = key_;
             entry_ = 0;
-            index_ = kZERO;
+            index_ = kZero;
         }
         else if (!cdirFirst(*view_, cur_key_, sle_, entry_, index_))
         {
@@ -105,7 +105,7 @@ BookDirs::const_iterator
 BookDirs::const_iterator::operator++(int)
 {
     XRPL_ASSERT(
-        index_ != beast::kZERO, "xrpl::BookDirs::const_iterator::operator++(int) : nonzero index");
+        index_ != beast::kZero, "xrpl::BookDirs::const_iterator::operator++(int) : nonzero index");
     const_iterator tmp(*this);
     ++(*this);
     return tmp;
diff --git a/src/libxrpl/ledger/CachedView.cpp b/src/libxrpl/ledger/CachedView.cpp
index 2dc28d67e0..8a6c266b8f 100644
--- a/src/libxrpl/ledger/CachedView.cpp
+++ b/src/libxrpl/ledger/CachedView.cpp
@@ -22,9 +22,9 @@ CachedViewImpl::exists(Keylet const& k) const
 std::shared_ptr<SLE const>
 CachedViewImpl::read(Keylet const& k) const
 {
-    static CountedObjects::Counter kHITS{"CachedView::hit"};
-    static CountedObjects::Counter kHITSEXPIRED{"CachedView::hitExpired"};
-    static CountedObjects::Counter kMISSES{"CachedView::miss"};
+    static CountedObjects::Counter kHits{"CachedView::hit"};
+    static CountedObjects::Counter kHitsExpired{"CachedView::hitExpired"};
+    static CountedObjects::Counter kMisses{"CachedView::miss"};
     bool cacheHit = false;
     bool baseRead = false;
 
@@ -50,15 +50,15 @@ CachedViewImpl::read(Keylet const& k) const
     XRPL_ASSERT(sle || baseRead, "xrpl::CachedView::read : null SLE result from base");
     if (cacheHit && baseRead)
     {
-        kHITSEXPIRED.increment();
+        kHitsExpired.increment();
     }
     else if (cacheHit)
     {
-        kHITS.increment();
+        kHits.increment();
     }
     else
     {
-        kMISSES.increment();
+        kMisses.increment();
     }
 
     if (!cacheHit)
diff --git a/src/libxrpl/ledger/CanonicalTXSet.cpp b/src/libxrpl/ledger/CanonicalTXSet.cpp
index bfa3d811e6..a06576342a 100644
--- a/src/libxrpl/ledger/CanonicalTXSet.cpp
+++ b/src/libxrpl/ledger/CanonicalTXSet.cpp
@@ -33,7 +33,7 @@ operator<(CanonicalTXSet::Key const& lhs, CanonicalTXSet::Key const& rhs)
 uint256
 CanonicalTXSet::accountKey(AccountID const& account)
 {
-    uint256 ret = beast::kZERO;
+    uint256 ret = beast::kZero;
     memcpy(ret.begin(), account.begin(), account.size());
     ret ^= salt_;
     return ret;
@@ -68,7 +68,7 @@ CanonicalTXSet::popAcctTransaction(std::shared_ptr<STTx const> const& tx)
     uint256 const effectiveAccount{accountKey(tx->getAccountID(sfAccount))};
 
     auto const seqProxy = tx->getSeqProxy();
-    Key const after(effectiveAccount, seqProxy, beast::kZERO);
+    Key const after(effectiveAccount, seqProxy, beast::kZero);
     auto const itrNext{map_.lower_bound(after)};
     if (itrNext != map_.end() && itrNext->first.getAccount() == effectiveAccount &&
         (!itrNext->second->getSeqProxy().isSeq() ||
diff --git a/src/libxrpl/ledger/Dir.cpp b/src/libxrpl/ledger/Dir.cpp
index 8744d0bc67..63f41762a4 100644
--- a/src/libxrpl/ledger/Dir.cpp
+++ b/src/libxrpl/ledger/Dir.cpp
@@ -61,7 +61,7 @@ const_iterator::operator==(ConstIterator const& other) const
 const_iterator::reference
 const_iterator::operator*() const
 {
-    XRPL_ASSERT(index_ != beast::kZERO, "xrpl::Dir::ConstIterator::operator* : nonzero index");
+    XRPL_ASSERT(index_ != beast::kZero, "xrpl::Dir::ConstIterator::operator* : nonzero index");
     if (!cache_)
         cache_ = view_->read(keylet::child(index_));
     return *cache_;
@@ -70,7 +70,7 @@ const_iterator::operator*() const
 const_iterator&
 const_iterator::operator++()
 {
-    XRPL_ASSERT(index_ != beast::kZERO, "xrpl::Dir::ConstIterator::operator++ : nonzero index");
+    XRPL_ASSERT(index_ != beast::kZero, "xrpl::Dir::ConstIterator::operator++ : nonzero index");
     if (++it_ != std::end(*indexes_))
     {
         index_ = *it_;
@@ -85,7 +85,7 @@ const_iterator
 const_iterator::operator++(int)
 {
     XRPL_ASSERT(
-        index_ != beast::kZERO, "xrpl::Dir::ConstIterator::operator++(int) : nonzero index");
+        index_ != beast::kZero, "xrpl::Dir::ConstIterator::operator++(int) : nonzero index");
     ConstIterator tmp(*this);
     ++(*this);
     return tmp;
@@ -98,7 +98,7 @@ const_iterator::nextPage()
     if (next == 0)
     {
         page_.key = root_.key;
-        index_ = beast::kZERO;
+        index_ = beast::kZero;
     }
     else
     {
@@ -108,7 +108,7 @@ const_iterator::nextPage()
         indexes_ = &sle_->getFieldV256(sfIndexes);
         if (indexes_->empty())
         {
-            index_ = beast::kZERO;
+            index_ = beast::kZero;
         }
         else
         {
diff --git a/src/libxrpl/ledger/Ledger.cpp b/src/libxrpl/ledger/Ledger.cpp
index 70d49de71e..fe7db9a158 100644
--- a/src/libxrpl/ledger/Ledger.cpp
+++ b/src/libxrpl/ledger/Ledger.cpp
@@ -46,7 +46,7 @@
 
 namespace xrpl {
 
-CreateGenesisT const kCREATE_GENESIS{};
+CreateGenesisT const kCreateGenesis{};
 
 //------------------------------------------------------------------------------
 
@@ -159,8 +159,8 @@ Ledger::Ledger(
     , j_(beast::Journal(beast::Journal::getNullSink()))
 {
     header_.seq = 1;
-    header_.drops = kINITIAL_XRP;
-    header_.closeTimeResolution = kLEDGER_GENESIS_TIME_RESOLUTION;
+    header_.drops = kInitialXrp;
+    header_.closeTimeResolution = kLedgerGenesisTimeResolution;
 
     static auto const kID =
         calcAccountID(generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase")).first);
@@ -196,7 +196,7 @@ Ledger::Ledger(
                 sle->at(sfReserveBase) = *f;
             if (auto const f = fees.increment.dropsAs<std::uint32_t>())
                 sle->at(sfReserveIncrement) = *f;
-            sle->at(sfReferenceFeeUnits) = kFEE_UNITS_DEPRECATED;
+            sle->at(sfReferenceFeeUnits) = kFeeUnitsDeprecated;
         }
         rawInsert(sle);
     }
@@ -304,7 +304,7 @@ Ledger::Ledger(
 {
     header_.seq = ledgerSeq;
     header_.closeTime = closeTime;
-    header_.closeTimeResolution = kLEDGER_DEFAULT_TIME_RESOLUTION;
+    header_.closeTimeResolution = kLedgerDefaultTimeResolution;
     setup();
 }
 
@@ -339,7 +339,7 @@ Ledger::setAccepted(
 
     header_.closeTime = closeTime;
     header_.closeTimeResolution = closeResolution;
-    header_.closeFlags = correctCloseTime ? 0 : kS_LCF_NO_CONSENSUS_TIME;
+    header_.closeFlags = correctCloseTime ? 0 : kSLcfNoConsensusTime;
     setImmutable();
 }
 
@@ -404,7 +404,7 @@ Ledger::succ(uint256 const& key, std::optional<uint256> const& last) const
 std::shared_ptr<SLE const>
 Ledger::read(Keylet const& k) const
 {
-    if (k.key == beast::kZERO)
+    if (k.key == beast::kZero)
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::Ledger::read : zero key");
diff --git a/src/libxrpl/ledger/OpenView.cpp b/src/libxrpl/ledger/OpenView.cpp
index afe826d78d..c5bda2d0c8 100644
--- a/src/libxrpl/ledger/OpenView.cpp
+++ b/src/libxrpl/ledger/OpenView.cpp
@@ -79,7 +79,7 @@ OpenView::OpenView(OpenView const& rhs)
     : ReadView(rhs)
     , TxsRawView(rhs)
     , monotonic_resource_{std::make_unique<boost::container::pmr::monotonic_buffer_resource>(
-          kINITIAL_BUFFER_SIZE)}
+          kInitialBufferSize)}
     , txs_{rhs.txs_, monotonic_resource_.get()}
     , rules_{rhs.rules_}
     , header_{rhs.header_}
@@ -90,7 +90,7 @@ OpenView::OpenView(OpenView const& rhs)
 
 OpenView::OpenView(OpenLedgerT, ReadView const* base, Rules rules, std::shared_ptr<void const> hold)
     : monotonic_resource_{
-          std::make_unique<boost::container::pmr::monotonic_buffer_resource>(kINITIAL_BUFFER_SIZE)}
+          std::make_unique<boost::container::pmr::monotonic_buffer_resource>(kInitialBufferSize)}
     , txs_{monotonic_resource_.get()}
     , rules_(std::move(rules))
     , header_(base->header())
@@ -106,7 +106,7 @@ OpenView::OpenView(OpenLedgerT, ReadView const* base, Rules rules, std::shared_p
 
 OpenView::OpenView(ReadView const* base, std::shared_ptr<void const> hold)
     : monotonic_resource_{
-          std::make_unique<boost::container::pmr::monotonic_buffer_resource>(kINITIAL_BUFFER_SIZE)}
+          std::make_unique<boost::container::pmr::monotonic_buffer_resource>(kInitialBufferSize)}
     , txs_{monotonic_resource_.get()}
     , rules_(base->rules())
     , header_(base->header())
diff --git a/src/libxrpl/ledger/PaymentSandbox.cpp b/src/libxrpl/ledger/PaymentSandbox.cpp
index a730b247ba..97e3e53cbf 100644
--- a/src/libxrpl/ledger/PaymentSandbox.cpp
+++ b/src/libxrpl/ledger/PaymentSandbox.cpp
@@ -321,7 +321,7 @@ PaymentSandbox::balanceHookIOU(
     auto adjustedAmt = std::min({amount, lastBal - delta, minBal});
     adjustedAmt.get<Issue>().account = amount.getIssuer();
 
-    if (isXRP(issuer) && adjustedAmt < beast::kZERO)
+    if (isXRP(issuer) && adjustedAmt < beast::kZero)
     {
         // A calculated negative XRP balance is not an error case. Consider a
         // payment snippet that credits a large XRP amount and then debits the
diff --git a/src/libxrpl/ledger/View.cpp b/src/libxrpl/ledger/View.cpp
index 9fb03a230c..4b67bb9867 100644
--- a/src/libxrpl/ledger/View.cpp
+++ b/src/libxrpl/ledger/View.cpp
@@ -62,7 +62,7 @@ isVaultPseudoAccountFrozen(
     if (!view.rules().enabled(featureSingleAssetVault))
         return false;
 
-    if (depth >= kMAX_ASSET_CHECK_DEPTH)
+    if (depth >= kMaxAssetCheckDepth)
         return true;  // LCOV_EXCL_LINE
 
     auto const mptIssuance = view.read(keylet::mptIssuance(mptShare.getMptID()));
@@ -350,7 +350,7 @@ withdrawToDestExceedsLimit(
         [&](Issue const& issue) -> TER {
             auto const& currency = issue.currency;
             auto const owed = creditBalance(view, to, issuer, currency);
-            if (owed <= beast::kZERO)
+            if (owed <= beast::kZero)
             {
                 auto const limit = creditLimit(view, to, issuer, currency);
                 if (-owed >= limit || amount > (limit + owed))
@@ -463,7 +463,7 @@ cleanupOnAccountDelete(
     // Delete all the entries in the account directory.
     std::shared_ptr<SLE> sleDirNode{};
     unsigned int uDirEntry{0};
-    uint256 dirEntry{beast::kZERO};
+    uint256 dirEntry{beast::kZero};
     std::uint32_t deleted = 0;
 
     if (view.exists(ownerDirKeylet) &&
diff --git a/src/libxrpl/ledger/helpers/AMMHelpers.cpp b/src/libxrpl/ledger/helpers/AMMHelpers.cpp
index cd1796468c..f7aabc8ea5 100644
--- a/src/libxrpl/ledger/helpers/AMMHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/AMMHelpers.cpp
@@ -205,7 +205,7 @@ adjustAmountsByLPTokens(
 
     auto const lpTokensActual = adjustLPTokens(lptAMMBalance, lpTokens, isDeposit);
 
-    if (lpTokensActual == beast::kZERO)
+    if (lpTokensActual == beast::kZero)
     {
         auto const amount2Opt = amount2 ? std::make_optional(STAmount{}) : std::nullopt;
         return std::make_tuple(STAmount{}, amount2Opt, lpTokensActual);
@@ -644,7 +644,7 @@ deleteAMMTrustLines(
             if (nodeType == ltRIPPLE_STATE)
             {
                 // Trustlines must have zero balance
-                if (sleItem->getFieldAmount(sfBalance) != beast::kZERO)
+                if (sleItem->getFieldAmount(sfBalance) != beast::kZero)
                 {
                     // LCOV_EXCL_START
                     JLOG(j.error()) << "deleteAMMObjects: deleting trustline with "
@@ -732,7 +732,7 @@ deleteAMMAccount(Sandbox& sb, Asset const& asset, Asset const& asset2, beast::Jo
         // LCOV_EXCL_STOP
     }
 
-    if (auto const ter = deleteAMMTrustLines(sb, ammAccountID, kMAX_DELETABLE_AMM_TRUST_LINES, j);
+    if (auto const ter = deleteAMMTrustLines(sb, ammAccountID, kMaxDeletableAmmTrustLines, j);
         !isTesSuccess(ter))
         return ter;
 
@@ -779,7 +779,7 @@ initializeFeeAuctionVote(
     STObject voteEntry = STObject::makeInnerObject(sfVoteEntry);
     if (tfee != 0)
         voteEntry.setFieldU16(sfTradingFee, tfee);
-    voteEntry.setFieldU32(sfVoteWeight, kVOTE_WEIGHT_SCALE_FACTOR);
+    voteEntry.setFieldU32(sfVoteWeight, kVoteWeightScaleFactor);
     voteEntry.setAccountID(sfAccount, account);
     voteSlots.pushBack(voteEntry);
     ammSle->setFieldArray(sfVoteSlots, voteSlots);
@@ -797,7 +797,7 @@ initializeFeeAuctionVote(
     auto const expiration = std::chrono::duration_cast<std::chrono::seconds>(
                                 view.header().parentCloseTime.time_since_epoch())
                                 .count() +
-        kTOTAL_TIME_SLOT_SECS;
+        kTotalTimeSlotSecs;
     auctionSlot.setFieldU32(sfExpiration, expiration);
     auctionSlot.setFieldAmount(sfPrice, STAmount{lptAsset, 0});
     // Set the fee
@@ -809,7 +809,7 @@ initializeFeeAuctionVote(
     {
         ammSle->makeFieldAbsent(sfTradingFee);  // LCOV_EXCL_LINE
     }
-    if (auto const dfee = tfee / kAUCTION_SLOT_DISCOUNTED_FEE_FRACTION)
+    if (auto const dfee = tfee / kAuctionSlotDiscountedFeeFraction)
     {
         auctionSlot.setFieldU16(sfDiscountedFee, dfee);
     }
diff --git a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
index 160629d835..029cb5cd92 100644
--- a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
@@ -88,7 +88,7 @@ xrpLiquid(ReadView const& view, AccountID const& id, std::int32_t ownerCountAdj,
 {
     auto const sle = view.read(keylet::account(id));
     if (sle == nullptr)
-        return beast::kZERO;
+        return beast::kZero;
 
     // Return balance minus reserve
     std::uint32_t const ownerCount =
@@ -121,7 +121,7 @@ transferRate(ReadView const& view, AccountID const& issuer)
     if (sle && sle->isFieldPresent(sfTransferRate))
         return Rate{sle->getFieldU32(sfTransferRate)};
 
-    return kPARITY_RATE;
+    return kParityRate;
 }
 
 void
@@ -146,8 +146,8 @@ AccountID
 pseudoAccountAddress(ReadView const& view, uint256 const& pseudoOwnerKey)
 {
     // This number must not be changed without an amendment
-    constexpr std::uint16_t kMAX_ACCOUNT_ATTEMPTS = 256;
-    for (std::uint16_t i = 0; i < kMAX_ACCOUNT_ATTEMPTS; ++i)
+    static constexpr std::uint16_t kMaxAccountAttempts = 256;
+    for (std::uint16_t i = 0; i < kMaxAccountAttempts; ++i)
     {
         RipeshaHasher rsh;
         auto const hash = sha512Half(i, view.header().parentHash, pseudoOwnerKey);
@@ -156,7 +156,7 @@ pseudoAccountAddress(ReadView const& view, uint256 const& pseudoOwnerKey)
         if (!view.read(keylet::account(ret)))
             return ret;
     }
-    return beast::kZERO;
+    return beast::kZero;
 }
 
 // Pseudo-account designator fields MUST be maintained by including the
@@ -168,7 +168,7 @@ pseudoAccountAddress(ReadView const& view, uint256 const& pseudoOwnerKey)
 [[nodiscard]] std::vector<SField const*> const&
 getPseudoAccountFields()
 {
-    static std::vector<SField const*> const kPSEUDO_FIELDS = []() {
+    static std::vector<SField const*> const kPseudoFields = []() {
         auto const ar = LedgerFormats::getInstance().findByType(ltACCOUNT_ROOT);
         if (!ar)
         {
@@ -183,12 +183,12 @@ getPseudoAccountFields()
         std::vector<SField const*> pseudoFields;
         for (auto const& field : soTemplate)
         {
-            if (field.sField().shouldMeta(SField::kSMD_PSEUDO_ACCOUNT))
+            if (field.sField().shouldMeta(SField::kSmdPseudoAccount))
                 pseudoFields.emplace_back(&field.sField());
         }
         return pseudoFields;
     }();
-    return kPSEUDO_FIELDS;
+    return kPseudoFields;
 }
 
 [[nodiscard]] bool
@@ -221,7 +221,7 @@ createPseudoAccount(ApplyView& view, uint256 const& pseudoOwnerKey, SField const
         "xrpl::createPseudoAccount : valid owner field");
 
     auto const accountId = pseudoAccountAddress(view, pseudoOwnerKey);
-    if (accountId == beast::kZERO)
+    if (accountId == beast::kZero)
         return Unexpected(tecDUPLICATE);
 
     // Create pseudo-account.
diff --git a/src/libxrpl/ledger/helpers/CredentialHelpers.cpp b/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
index 8954f3fd5e..838e72d364 100644
--- a/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
@@ -131,7 +131,7 @@ checkFields(STTx const& tx, beast::Journal j)
         return tesSUCCESS;
 
     auto const& credentials = tx.getFieldV256(sfCredentialIDs);
-    if (credentials.empty() || (credentials.size() > kMAX_CREDENTIALS_ARRAY_SIZE))
+    if (credentials.empty() || (credentials.size() > kMaxCredentialsArraySize))
     {
         JLOG(j.trace()) << "Malformed transaction: Credentials array size is invalid: "
                         << credentials.size();
@@ -288,7 +288,7 @@ checkArray(STArray const& credentials, unsigned maxSize, beast::Journal j)
         }
 
         auto const ct = credential[sfCredentialType];
-        if (ct.empty() || (ct.size() > kMAX_CREDENTIAL_TYPE_LENGTH))
+        if (ct.empty() || (ct.size() > kMaxCredentialTypeLength))
         {
             JLOG(j.trace()) << "Malformed transaction: "
                                "Invalid credentialType size: "
diff --git a/src/libxrpl/ledger/helpers/LendingHelpers.cpp b/src/libxrpl/ledger/helpers/LendingHelpers.cpp
index 3bfa18e3e8..26e320c15d 100644
--- a/src/libxrpl/ledger/helpers/LendingHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/LendingHelpers.cpp
@@ -48,15 +48,15 @@ LoanPaymentParts::operator+=(LoanPaymentParts const& other)
 {
     XRPL_ASSERT(
 
-        other.principalPaid >= beast::kZERO,
+        other.principalPaid >= beast::kZero,
         "xrpl::LoanPaymentParts::operator+= : other principal "
         "non-negative");
     XRPL_ASSERT(
-        other.interestPaid >= beast::kZERO,
+        other.interestPaid >= beast::kZero,
         "xrpl::LoanPaymentParts::operator+= : other interest paid "
         "non-negative");
     XRPL_ASSERT(
-        other.feePaid >= beast::kZERO,
+        other.feePaid >= beast::kZero,
         "xrpl::LoanPaymentParts::operator+= : other fee paid "
         "non-negative");
 
@@ -83,7 +83,7 @@ Number
 loanPeriodicRate(TenthBips32 interestRate, std::uint32_t paymentInterval)
 {
     // Need floating point math, since we're dividing by a large number
-    return tenthBipsOfValue(Number(paymentInterval), interestRate) / kSECONDS_IN_YEAR;
+    return tenthBipsOfValue(Number(paymentInterval), interestRate) / kSecondsInYear;
 }
 
 /* Checks if a value is already rounded to the specified scale.
@@ -102,12 +102,12 @@ namespace detail {
 void
 LoanStateDeltas::nonNegative()
 {
-    if (principal < beast::kZERO)
-        principal = kNUM_ZERO;
-    if (interest < beast::kZERO)
-        interest = kNUM_ZERO;
-    if (managementFee < beast::kZERO)
-        managementFee = kNUM_ZERO;
+    if (principal < beast::kZero)
+        principal = kNumZero;
+    if (interest < beast::kZero)
+        interest = kNumZero;
+    if (managementFee < beast::kZero)
+        managementFee = kNumZero;
 }
 
 /* Computes (1 + r)^n - 1 accurately even for near-zero r, where direct
@@ -126,12 +126,12 @@ Number
 computePowerMinusOne(Number const& periodicRate, std::uint32_t paymentsRemaining)
 {
     XRPL_ASSERT_PARTS(
-        periodicRate >= beast::kZERO,
+        periodicRate >= beast::kZero,
         "xrpl::detail::computePowerMinusOne",
         "periodicRate is non-negative");
 
-    if (paymentsRemaining == 0 || periodicRate == beast::kZERO)
-        return kNUM_ZERO;
+    if (paymentsRemaining == 0 || periodicRate == beast::kZero)
+        return kNumZero;
 
     // k = 1 term: C(n, 1) * r = n * r
     Number term = paymentsRemaining * periodicRate;
@@ -165,12 +165,12 @@ Number
 computePowerMinusOneHybrid(Number const& periodicRate, std::uint32_t paymentsRemaining)
 {
     XRPL_ASSERT_PARTS(
-        periodicRate >= beast::kZERO,
+        periodicRate >= beast::kZero,
         "xrpl::detail::computePowerMinusOneHybrid",
         "periodicRate is non-negative");
 
-    if (paymentsRemaining == 0 || periodicRate == beast::kZERO)
-        return kNUM_ZERO;
+    if (paymentsRemaining == 0 || periodicRate == beast::kZero)
+        return kNumZero;
 
     // Threshold 1e-9 retains ~10 sig digits of (1+r)^n - 1 against
     // Number's 19-digit mantissa: the leading "1" of (1+r)^n consumes
@@ -196,10 +196,10 @@ computePaymentFactor(
     std::uint32_t paymentsRemaining)
 {
     if (paymentsRemaining == 0)
-        return kNUM_ZERO;
+        return kNumZero;
 
     // For zero interest, payment factor is simply 1/paymentsRemaining
-    if (periodicRate == beast::kZERO)
+    if (periodicRate == beast::kZero)
         return Number{1} / paymentsRemaining;
 
     if (rules.enabled(fixCleanup3_2_0))
@@ -235,7 +235,7 @@ loanPeriodicPayment(
         return 0;
 
     // Interest-free loans: equal principal payments
-    if (periodicRate == beast::kZERO)
+    if (periodicRate == beast::kZero)
         return principalOutstanding / paymentsRemaining;
 
     return principalOutstanding * computePaymentFactor(rules, periodicRate, paymentsRemaining);
@@ -254,7 +254,7 @@ loanPrincipalFromPeriodicPayment(
     std::uint32_t paymentsRemaining)
 {
     if (paymentsRemaining == 0)
-        return kNUM_ZERO;
+        return kNumZero;
 
     if (periodicRate == 0)
         return periodicPayment * paymentsRemaining;
@@ -291,11 +291,11 @@ loanLatePaymentInterest(
     NetClock::time_point parentCloseTime,
     std::uint32_t nextPaymentDueDate)
 {
-    if (principalOutstanding == beast::kZERO)
-        return kNUM_ZERO;
+    if (principalOutstanding == beast::kZero)
+        return kNumZero;
 
     if (lateInterestRate == TenthBips32{0})
-        return kNUM_ZERO;
+        return kNumZero;
 
     auto const now = parentCloseTime.time_since_epoch().count();
 
@@ -326,11 +326,11 @@ loanAccruedInterest(
     std::uint32_t prevPaymentDate,
     std::uint32_t paymentInterval)
 {
-    if (periodicRate == beast::kZERO)
-        return kNUM_ZERO;
+    if (periodicRate == beast::kZero)
+        return kNumZero;
 
     if (paymentInterval == 0)
-        return kNUM_ZERO;
+        return kNumZero;
 
     auto const lastPaymentDate = std::max(prevPaymentDate, startDate);
     auto const now = parentCloseTime.time_since_epoch().count();
@@ -338,7 +338,7 @@ loanAccruedInterest(
     // If the loan has been paid ahead, then "lastPaymentDate" is in the future,
     // and no interest has accrued.
     if (now <= lastPaymentDate)
-        return kNUM_ZERO;
+        return kNumZero;
 
     // Equation (4) from XLS-66 spec, Section A-2 Equation Glossary
     auto const secondsSinceLastPayment = now - lastPaymentDate;
@@ -447,7 +447,7 @@ doPayment(
     XRPL_ASSERT_PARTS(
         // Use an explicit cast because the template parameter can be
         // ValueProxy<Number> or Number
-        static_cast<Number>(managementFeeOutstandingProxy) >= beast::kZERO,
+        static_cast<Number>(managementFeeOutstandingProxy) >= beast::kZero,
         "xrpl::detail::doPayment",
         "fee outstanding stays valid");
 
@@ -549,7 +549,7 @@ tryOverpayment(
             newTheoreticalState.principalOutstanding,
             loanScale,
             Number::RoundingMode::Upward),
-        kNUM_ZERO,
+        kNumZero,
         roundedOldState.principalOutstanding);
     auto const totalValueOutstanding = std::clamp(
         roundToAsset(
@@ -557,11 +557,11 @@ tryOverpayment(
             principalOutstanding + newTheoreticalState.interestOutstanding(),
             loanScale,
             Number::RoundingMode::Upward),
-        kNUM_ZERO,
+        kNumZero,
         roundedOldState.valueOutstanding);
     auto const managementFeeOutstanding = std::clamp(
         roundToAsset(asset, newTheoreticalState.managementFeeDue, loanScale),
-        kNUM_ZERO,
+        kNumZero,
         roundedOldState.managementFeeDue);
 
     auto const roundedNewState =
@@ -583,7 +583,7 @@ tryOverpayment(
             // small interest amounts, that may have already been paid
             // off. Check what's still outstanding. This should
             // guarantee that the interest checks pass.
-            roundedNewState.interestOutstanding() != beast::kZERO,
+            roundedNewState.interestOutstanding() != beast::kZero,
             paymentRemaining,
             newLoanProperties,
             j))
@@ -1095,7 +1095,7 @@ computePaymentComponents(
     // periodic payment after principal is paid
     deltas.interest = std::min(
         {deltas.interest,
-         std::max(kNUM_ZERO, roundedPeriodicPayment - deltas.principal),
+         std::max(kNumZero, roundedPeriodicPayment - deltas.principal),
          currentLedgerState.interestDue});
 
     XRPL_ASSERT_PARTS(
@@ -1115,14 +1115,14 @@ computePaymentComponents(
     // which indicates that we're not going to take the whole payment amount,
     // but if so, it must be small.
     auto takeFrom = [](Number& component, Number& excess) {
-        if (excess > beast::kZERO)
+        if (excess > beast::kZero)
         {
             auto part = std::min(component, excess);
             component -= part;
             excess -= part;
         }
         XRPL_ASSERT_PARTS(
-            excess >= beast::kZERO,
+            excess >= beast::kZero,
             "xrpl::detail::computePaymentComponents",
             "excess non-negative");
     };
@@ -1140,7 +1140,7 @@ computePaymentComponents(
     // happen due to earlier caps, but handle it defensively.
     Number totalOverpayment = deltas.total() - currentLedgerState.valueOutstanding;
 
-    if (totalOverpayment > beast::kZERO)
+    if (totalOverpayment > beast::kZero)
     {
         // LCOV_EXCL_START
         UNREACHABLE(
@@ -1158,7 +1158,7 @@ computePaymentComponents(
         "xrpl::detail::computePaymentComponents",
         "shortage is rounded");
 
-    if (shortage < beast::kZERO)
+    if (shortage < beast::kZero)
     {
         // Deltas exceed payment amount - reduce them proportionally
         Number excess = -shortage;
@@ -1170,7 +1170,7 @@ computePaymentComponents(
     // periodic payment (due to rounding or component caps).
     // shortage < 0 would mean we're trying to pay more than allowed (bug).
     XRPL_ASSERT_PARTS(
-        shortage >= beast::kZERO,
+        shortage >= beast::kZero,
         "xrpl::detail::computePaymentComponents",
         "no shortage or excess");
 
@@ -1181,33 +1181,33 @@ computePaymentComponents(
         "total value adds up");
 
     XRPL_ASSERT_PARTS(
-        deltas.principal >= beast::kZERO &&
+        deltas.principal >= beast::kZero &&
             deltas.principal <= currentLedgerState.principalOutstanding,
         "xrpl::detail::computePaymentComponents",
         "valid principal result");
     XRPL_ASSERT_PARTS(
-        deltas.interest >= beast::kZERO && deltas.interest <= currentLedgerState.interestDue,
+        deltas.interest >= beast::kZero && deltas.interest <= currentLedgerState.interestDue,
         "xrpl::detail::computePaymentComponents",
         "valid interest result");
     XRPL_ASSERT_PARTS(
-        deltas.managementFee >= beast::kZERO &&
+        deltas.managementFee >= beast::kZero &&
             deltas.managementFee <= currentLedgerState.managementFeeDue,
         "xrpl::detail::computePaymentComponents",
         "valid fee result");
 
     XRPL_ASSERT_PARTS(
-        deltas.principal + deltas.interest + deltas.managementFee > beast::kZERO,
+        deltas.principal + deltas.interest + deltas.managementFee > beast::kZero,
         "xrpl::detail::computePaymentComponents",
         "payment parts add to payment");
 
     // Final safety clamp to ensure no value exceeds its outstanding balance
     return PaymentComponents{
         .trackedValueDelta =
-            std::clamp(deltas.total(), kNUM_ZERO, currentLedgerState.valueOutstanding),
+            std::clamp(deltas.total(), kNumZero, currentLedgerState.valueOutstanding),
         .trackedPrincipalDelta =
-            std::clamp(deltas.principal, kNUM_ZERO, currentLedgerState.principalOutstanding),
+            std::clamp(deltas.principal, kNumZero, currentLedgerState.principalOutstanding),
         .trackedManagementFeeDelta =
-            std::clamp(deltas.managementFee, kNUM_ZERO, currentLedgerState.managementFeeDue),
+            std::clamp(deltas.managementFee, kNumZero, currentLedgerState.managementFeeDue),
     };
 }
 
@@ -1373,7 +1373,7 @@ checkLoanGuards(
     // avoids dividing by 0.
     auto const roundedPayment =
         roundPeriodicPayment(vaultAsset, properties.periodicPayment, properties.loanScale);
-    if (roundedPayment == beast::kZERO)
+    if (roundedPayment == beast::kZero)
     {
         JLOG(j.warn()) << "Loan Periodic payment (" << properties.periodicPayment
                        << ") rounds to 0. ";
@@ -1431,7 +1431,7 @@ computeFullPaymentInterest(
         "interest");
 
     // Equation (28) from XLS-66 spec, Section A-2 Equation Glossary
-    auto const prepaymentPenalty = closeInterestRate == beast::kZERO
+    auto const prepaymentPenalty = closeInterestRate == beast::kZero
         ? Number{}
         : tenthBipsOfValue(theoreticalPrincipalOutstanding, closeInterestRate);
 
@@ -1903,7 +1903,7 @@ loanMakePayment(
     std::size_t numPayments = 0;
 
     while ((amount >= (totalPaid + periodic.totalDue)) && paymentRemainingProxy > 0 &&
-           numPayments < kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION)
+           numPayments < kLoanMaximumPaymentsPerTransaction)
     {
         // Try to make more payments
         XRPL_ASSERT_PARTS(
@@ -1975,7 +1975,7 @@ loanMakePayment(
         : amount;
     if (paymentType == LoanPaymentType::Overpayment && loan->isFlag(lsfLoanOverpayment) &&
         paymentRemainingProxy > 0 && totalPaid < roundedAmount &&
-        numPayments < kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION)
+        numPayments < kLoanMaximumPaymentsPerTransaction)
     {
         TenthBips32 const overpaymentInterestRate{loan->at(sfOverpaymentInterestRate)};
         TenthBips32 const overpaymentFeeRate{loan->at(sfOverpaymentFee)};
@@ -1999,7 +1999,7 @@ loanMakePayment(
         if (overpaymentComponents.trackedPrincipalDelta > 0)
         {
             XRPL_ASSERT_PARTS(
-                overpaymentComponents.untrackedInterest >= beast::kZERO,
+                overpaymentComponents.untrackedInterest >= beast::kZero,
                 "xrpl::loanMakePayment",
                 "overpayment penalty did not reduce value of loan");
             // Can't just use `periodicPayment` here, because it might
@@ -2036,17 +2036,17 @@ loanMakePayment(
     // intermediate steps were rounded.
     XRPL_ASSERT(
         isRounded(asset, totalParts.principalPaid, loanScale) &&
-            totalParts.principalPaid >= beast::kZERO,
+            totalParts.principalPaid >= beast::kZero,
         "xrpl::loanMakePayment : total principal paid is valid");
     XRPL_ASSERT(
         isRounded(asset, totalParts.interestPaid, loanScale) &&
-            totalParts.interestPaid >= beast::kZERO,
+            totalParts.interestPaid >= beast::kZero,
         "xrpl::loanMakePayment : total interest paid is valid");
     XRPL_ASSERT(
         isRounded(asset, totalParts.valueChange, loanScale),
         "xrpl::loanMakePayment : loan value change is valid");
     XRPL_ASSERT(
-        isRounded(asset, totalParts.feePaid, loanScale) && totalParts.feePaid >= beast::kZERO,
+        isRounded(asset, totalParts.feePaid, loanScale) && totalParts.feePaid >= beast::kZero,
         "xrpl::loanMakePayment : fee paid is valid");
     return totalParts;
 }
diff --git a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
index 54a988ff5a..925f37c8ed 100644
--- a/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/MPTokenHelpers.cpp
@@ -96,11 +96,11 @@ transferRate(ReadView const& view, MPTID const& issuanceID)
         sle && sle->isFieldPresent(sfTransferFee))
     {
         auto const fee = sle->getFieldU16(sfTransferFee);
-        XRPL_ASSERT(fee <= kMAX_TRANSFER_FEE, "xrpl::transferRate : fee is too large");
+        XRPL_ASSERT(fee <= kMaxTransferFee, "xrpl::transferRate : fee is too large");
         return Rate{1'000'000'000u + (10'000 * fee)};
     }
 
-    return kPARITY_RATE;
+    return kParityRate;
 }
 
 [[nodiscard]] TER
@@ -194,7 +194,7 @@ authorizeMPToken(
         // items. This is similar to the reserve requirements of trust lines.
         std::uint32_t const uOwnerCount = sleAcct->getFieldU32(sfOwnerCount);
         XRPAmount const reserveCreate(
-            (uOwnerCount < 2) ? XRPAmount(beast::kZERO)
+            (uOwnerCount < 2) ? XRPAmount(beast::kZero)
                               : view.fees().accountReserve(uOwnerCount + 1));
 
         if (priorBalance < reserveCreate)
@@ -320,7 +320,7 @@ requireAuth(
 
     if (featureSAVEnabled)
     {
-        if (depth >= kMAX_ASSET_CHECK_DEPTH)
+        if (depth >= kMaxAssetCheckDepth)
             return tecINTERNAL;  // LCOV_EXCL_LINE
 
         // requireAuth is recursive if the issuer is a vault pseudo-account
@@ -839,7 +839,7 @@ checkCreateMPT(
 std::int64_t
 maxMPTAmount(SLE const& sleIssuance)
 {
-    return sleIssuance[~sfMaximumAmount].value_or(kMAX_MP_TOKEN_AMOUNT);
+    return sleIssuance[~sfMaximumAmount].value_or(kMaxMpTokenAmount);
 }
 
 std::int64_t
diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
index c1fdd403d6..bb784278ba 100644
--- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
@@ -98,7 +98,7 @@ getPageForToken(
     STArray narr = cp->getFieldArray(sfNFTokens);
 
     // The right page still has space: we're good.
-    if (narr.size() != kDIR_MAX_TOKENS_PER_PAGE)
+    if (narr.size() != kDirMaxTokensPerPage)
         return cp;
 
     // We need to split the page in two: the first half of the items in this
@@ -115,13 +115,13 @@ getPageForToken(
         // any additional equivalent NFTs maximum room for expansion.
         // Round up the boundary until there's a non-equivalent entry.
         uint256 const cmp =
-            narr[(kDIR_MAX_TOKENS_PER_PAGE / 2) - 1].getFieldH256(sfNFTokenID) & nft::kPAGE_MASK;
+            narr[(kDirMaxTokensPerPage / 2) - 1].getFieldH256(sfNFTokenID) & nft::kPageMask;
 
         // Note that the calls to find_if_not() and (later) find_if()
         // rely on the fact that narr is kept in sorted order.
         auto splitIter = std::find_if_not(
-            narr.begin() + (kDIR_MAX_TOKENS_PER_PAGE / 2), narr.end(), [&cmp](STObject const& obj) {
-                return (obj.getFieldH256(sfNFTokenID) & nft::kPAGE_MASK) == cmp;
+            narr.begin() + (kDirMaxTokensPerPage / 2), narr.end(), [&cmp](STObject const& obj) {
+                return (obj.getFieldH256(sfNFTokenID) & nft::kPageMask) == cmp;
             });
 
         // If we get all the way from the middle to the end with only
@@ -130,7 +130,7 @@ getPageForToken(
         if (splitIter == narr.end())
         {
             splitIter = std::ranges::find_if(narr, [&cmp](STObject const& obj) {
-                return (obj.getFieldH256(sfNFTokenID) & nft::kPAGE_MASK) == cmp;
+                return (obj.getFieldH256(sfNFTokenID) & nft::kPageMask) == cmp;
             });
         }
 
@@ -143,7 +143,7 @@ getPageForToken(
         // equivalent tokens.  This requires special handling.
         if (splitIter == narr.begin())
         {
-            auto const relation{(id & nft::kPAGE_MASK) <=> cmp};
+            auto const relation{(id & nft::kPageMask) <=> cmp};
             if (relation == 0)
             {
                 // If the passed in id belongs exactly on this (full) page
@@ -178,8 +178,8 @@ getPageForToken(
     // less than the low 96-bits of the enclosing page's index.  In order to
     // accommodate that requirement we use an index one higher than the
     // largest NFT in the page.
-    uint256 const tokenIDForNewPage = narr.size() == kDIR_MAX_TOKENS_PER_PAGE
-        ? narr[kDIR_MAX_TOKENS_PER_PAGE - 1].getFieldH256(sfNFTokenID).next()
+    uint256 const tokenIDForNewPage = narr.size() == kDirMaxTokensPerPage
+        ? narr[kDirMaxTokensPerPage - 1].getFieldH256(sfNFTokenID).next()
         : carr[0].getFieldH256(sfNFTokenID);
 
     auto np = std::make_shared<SLE>(keylet::nftpage(base, tokenIDForNewPage));
@@ -217,7 +217,7 @@ compareTokens(uint256 const& a, uint256 const& b)
     // 96-bits are identical we still need a fully deterministic sort.
     // So we sort on the low 96-bits first. If those are equal we sort on
     // the whole thing.
-    if (auto const lowBitsCmp{(a & nft::kPAGE_MASK) <=> (b & nft::kPAGE_MASK)}; lowBitsCmp != 0)
+    if (auto const lowBitsCmp{(a & nft::kPageMask) <=> (b & nft::kPageMask)}; lowBitsCmp != 0)
         return lowBitsCmp < 0;
 
     return a < b;
@@ -314,7 +314,7 @@ mergePages(ApplyView& view, std::shared_ptr<SLE> const& p1, std::shared_ptr<SLE>
     // this it would mean that one of them can be deleted as a result of
     // the merge.
 
-    if (p1arr.size() + p2arr.size() > kDIR_MAX_TOKENS_PER_PAGE)
+    if (p1arr.size() + p2arr.size() > kDirMaxTokensPerPage)
         return false;
 
     STArray x(p1arr.size() + p2arr.size());
@@ -445,7 +445,7 @@ removeToken(
         //  3. Fix up the owner count.
         //  4. Erase the previous page.
         if (view.rules().enabled(fixNFTokenPageLinks) &&
-            ((curr->key() & nft::kPAGE_MASK) == kPAGE_MASK))
+            ((curr->key() & nft::kPageMask) == kPageMask))
         {
             // Copy all relevant information from prev to curr.
             curr->peekFieldArray(sfNFTokens) = prev->peekFieldArray(sfNFTokens);
@@ -788,7 +788,7 @@ tokenOfferCreatePreflight(
 
     if (!isXRP(amount))
     {
-        if ((nftFlags & nft::kFLAG_ONLY_XRP) != 0)
+        if ((nftFlags & nft::kFlagOnlyXrp) != 0)
             return temBAD_AMOUNT;
 
         if (!amount)
@@ -833,7 +833,7 @@ tokenOfferCreatePreclaim(
     std::optional<AccountID> const& owner,
     std::uint32_t txFlags)
 {
-    if (((nftFlags & nft::kFLAG_CREATE_TRUST_LINES) == 0) && !amount.native() && (xferFee != 0u))
+    if (((nftFlags & nft::kFlagCreateTrustLines) == 0) && !amount.native() && (xferFee != 0u))
     {
         if (!view.exists(keylet::account(nftIssuer)))
             return tecNO_ISSUER;
@@ -855,7 +855,7 @@ tokenOfferCreatePreclaim(
             return tecFROZEN;
     }
 
-    if (nftIssuer != acctID && ((nftFlags & nft::kFLAG_TRANSFERABLE) == 0))
+    if (nftIssuer != acctID && ((nftFlags & nft::kFlagTransferable) == 0))
     {
         auto const root = view.read(keylet::account(nftIssuer));
         XRPL_ASSERT(root, "xrpl::nft::tokenOfferCreatePreclaim : non-null account");
diff --git a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
index e31309a9dd..3b37dff23c 100644
--- a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
@@ -352,9 +352,9 @@ updateTrustLine(
     auto const receiverReserveFlag = bSenderHigh ? lsfLowReserve : lsfHighReserve;
 
     // YYY Could skip this if rippling in reverse.
-    if (before > beast::kZERO
+    if (before > beast::kZero
         // Sender balance was positive.
-        && after <= beast::kZERO
+        && after <= beast::kZero
         // Sender is zero or negative.
         && state->isFlag(senderReserveFlag)
         // Sender reserve is set.
@@ -699,7 +699,7 @@ removeEmptyHolding(
     auto const line = view.peek(keylet::line(accountID, issue));
     if (!line)
         return accountIsIssuer ? (TER)tesSUCCESS : (TER)tecOBJECT_NOT_FOUND;
-    if (!accountIsIssuer && line->at(sfBalance)->iou() != beast::kZERO)
+    if (!accountIsIssuer && line->at(sfBalance)->iou() != beast::kZero)
         return tecHAS_OBLIGATIONS;
 
     // Adjust the owner count(s)
diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
index e57a4c85bb..0c20392f4f 100644
--- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
@@ -257,7 +257,7 @@ accountHolds(
     {
         // If the account is the issuer, then their limit is effectively
         // infinite
-        return STAmount{Issue{currency, issuer}, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET};
+        return STAmount{Issue{currency, issuer}, STAmount::kMaxValue, STAmount::kMaxOffset};
     }
 
     // IOU: Return balance on trust line modulo freeze
@@ -578,9 +578,9 @@ directSendNoFeeIOU(
 
         // FIXME This NEEDS to be cleaned up and simplified. It's impossible
         //       for anyone to understand.
-        if (saBefore > beast::kZERO
+        if (saBefore > beast::kZero
             // Sender balance was positive.
-            && saBalance <= beast::kZERO
+            && saBalance <= beast::kZero
             // Sender is zero or negative.
             && sleRippleState->isFlag(senderReserveFlag)
             // Sender reserve is set.
@@ -797,7 +797,7 @@ accountSendIOU(
 {
     if (view.rules().enabled(fixAMMv1_1))
     {
-        if (saAmount < beast::kZERO || saAmount.holds<MPTIssue>())
+        if (saAmount < beast::kZero || saAmount.holds<MPTIssue>())
         {
             return tecINTERNAL;  // LCOV_EXCL_LINE
         }
@@ -806,7 +806,7 @@ accountSendIOU(
     {
         // LCOV_EXCL_START
         XRPL_ASSERT(
-            saAmount >= beast::kZERO && !saAmount.holds<MPTIssue>(),
+            saAmount >= beast::kZero && !saAmount.holds<MPTIssue>(),
             "xrpl::accountSendIOU : minimum amount and not MPT");
         // LCOV_EXCL_STOP
     }
@@ -835,9 +835,9 @@ accountSendIOU(
     TER terResult(tesSUCCESS);
 
     SLE::pointer const sender =
-        uSenderID != beast::kZERO ? view.peek(keylet::account(uSenderID)) : SLE::pointer();
+        uSenderID != beast::kZero ? view.peek(keylet::account(uSenderID)) : SLE::pointer();
     SLE::pointer const receiver =
-        uReceiverID != beast::kZERO ? view.peek(keylet::account(uReceiverID)) : SLE::pointer();
+        uReceiverID != beast::kZero ? view.peek(keylet::account(uReceiverID)) : SLE::pointer();
 
     if (auto stream = j.trace())
     {
@@ -931,7 +931,7 @@ accountSendMultiIOU(
      */
 
     SLE::pointer const sender =
-        senderID != beast::kZERO ? view.peek(keylet::account(senderID)) : SLE::pointer();
+        senderID != beast::kZero ? view.peek(keylet::account(senderID)) : SLE::pointer();
 
     if (auto stream = j.trace())
     {
@@ -951,7 +951,7 @@ accountSendMultiIOU(
         auto const& receiverID = r.first;
         STAmount const amount{issue, r.second};
 
-        if (amount < beast::kZERO)
+        if (amount < beast::kZero)
         {
             return tecINTERNAL;  // LCOV_EXCL_LINE
         }
@@ -963,7 +963,7 @@ accountSendMultiIOU(
             continue;
 
         SLE::pointer const receiver =
-            receiverID != beast::kZERO ? view.peek(keylet::account(receiverID)) : SLE::pointer();
+            receiverID != beast::kZero ? view.peek(keylet::account(receiverID)) : SLE::pointer();
 
         if (auto stream = j.trace())
         {
@@ -1193,7 +1193,7 @@ directSendNoLimitMultiMPT(
     // small-scale mantissa (~16 digits) can lose precision for values near
     // maxMPTokenAmount (19 digits).
     std::uint64_t totalSendAmount{0};
-    std::uint64_t const maximumAmount = sle->at(~sfMaximumAmount).value_or(kMAX_MP_TOKEN_AMOUNT);
+    std::uint64_t const maximumAmount = sle->at(~sfMaximumAmount).value_or(kMaxMpTokenAmount);
     std::uint64_t const outstandingAmount = sle->getFieldU64(sfOutstandingAmount);
 
     // actual accumulates the total cost to the sender (includes transfer
@@ -1207,7 +1207,7 @@ directSendNoLimitMultiMPT(
     {
         STAmount const amount{mptIssue, amt};
 
-        if (amount < beast::kZERO)
+        if (amount < beast::kZero)
             return tecINTERNAL;  // LCOV_EXCL_LINE
 
         if (!amount || senderID == receiverID)
@@ -1218,7 +1218,7 @@ directSendNoLimitMultiMPT(
             if (senderID == issuer)
             {
                 XRPL_ASSERT_PARTS(
-                    takeFromSender == beast::kZERO,
+                    takeFromSender == beast::kZero,
                     "xrpl::directSendNoLimitMultiMPT",
                     "sender == issuer, takeFromSender == zero");
 
@@ -1300,7 +1300,7 @@ accountSendMPT(
     AllowMPTOverflow allowOverflow)
 {
     XRPL_ASSERT(
-        saAmount >= beast::kZERO && saAmount.holds<MPTIssue>(),
+        saAmount >= beast::kZero && saAmount.holds<MPTIssue>(),
         "xrpl::accountSendMPT : minimum amount and MPT");
 
     /* If we aren't sending anything or if the sender is the same as the
@@ -1402,8 +1402,8 @@ transferXRP(
     STAmount const& amount,
     beast::Journal j)
 {
-    XRPL_ASSERT(from != beast::kZERO, "xrpl::transferXRP : nonzero from account");
-    XRPL_ASSERT(to != beast::kZERO, "xrpl::transferXRP : nonzero to account");
+    XRPL_ASSERT(from != beast::kZero, "xrpl::transferXRP : nonzero from account");
+    XRPL_ASSERT(to != beast::kZero, "xrpl::transferXRP : nonzero to account");
     XRPL_ASSERT(from != to, "xrpl::transferXRP : sender is not receiver");
     XRPL_ASSERT(amount.native(), "xrpl::transferXRP : amount is XRP");
 
diff --git a/src/libxrpl/net/HTTPClient.cpp b/src/libxrpl/net/HTTPClient.cpp
index afdb264916..78ee5eb577 100644
--- a/src/libxrpl/net/HTTPClient.cpp
+++ b/src/libxrpl/net/HTTPClient.cpp
@@ -69,7 +69,7 @@ public:
               ioContext,
               gHttpClientSslContext->context())  // NOLINT(bugprone-unchecked-optional-access)
         , resolver_(ioContext)
-        , header_(kMAX_CLIENT_HEADER_BYTES)
+        , header_(kMaxClientHeaderBytes)
         , port_(port)
         , maxResponseSize_(maxResponseSize)
         , deadline_(ioContext)
@@ -372,14 +372,14 @@ public:
             {std::istreambuf_iterator<char>(&header_)}, std::istreambuf_iterator<char>()};
         JLOG(j_.trace()) << "Header: \"" << strHeader << "\"";
 
-        static boost::regex const kRE_STATUS{"\\`HTTP/1\\S+ (\\d{3}) .*\\'"};  // HTTP/1.1 200 OK
-        static boost::regex const kRE_SIZE{
+        static boost::regex const kReStatus{"\\`HTTP/1\\S+ (\\d{3}) .*\\'"};  // HTTP/1.1 200 OK
+        static boost::regex const kReSize{
             "\\`.*\\r\\nContent-Length:\\s+([0-9]+).*\\'", boost::regex::icase};
-        static boost::regex const kRE_BODY{"\\`.*\\r\\n\\r\\n(.*)\\'"};
+        static boost::regex const kReBody{"\\`.*\\r\\n\\r\\n(.*)\\'"};
 
         boost::smatch smMatch;
         // Match status code.
-        if (!boost::regex_match(strHeader, smMatch, kRE_STATUS))
+        if (!boost::regex_match(strHeader, smMatch, kReStatus))
         {
             // XXX Use our own error code.
             JLOG(j_.trace()) << "No status code";
@@ -391,11 +391,11 @@ public:
 
         status_ = beast::lexicalCastThrow<int>(std::string(smMatch[1]));
 
-        if (boost::regex_match(strHeader, smMatch, kRE_BODY))  // we got some body
+        if (boost::regex_match(strHeader, smMatch, kReBody))  // we got some body
             body_ = smMatch[1];
 
         std::size_t const responseSize = [&] {
-            if (boost::regex_match(strHeader, smMatch, kRE_SIZE))
+            if (boost::regex_match(strHeader, smMatch, kReSize))
                 return beast::lexicalCast<std::size_t>(std::string(smMatch[1]), maxResponseSize_);
             return maxResponseSize_;
         }();
diff --git a/src/libxrpl/nodestore/BatchWriter.cpp b/src/libxrpl/nodestore/BatchWriter.cpp
index cb42b4e92a..e0a1fbf20c 100644
--- a/src/libxrpl/nodestore/BatchWriter.cpp
+++ b/src/libxrpl/nodestore/BatchWriter.cpp
@@ -16,7 +16,7 @@ namespace xrpl::NodeStore {
 BatchWriter::BatchWriter(Callback& callback, Scheduler& scheduler)
     : callback_(callback), scheduler_(scheduler)
 {
-    writeSet_.reserve(kBATCH_WRITE_PREALLOCATION_SIZE);
+    writeSet_.reserve(kBatchWritePreallocationSize);
 }
 
 BatchWriter::~BatchWriter()
@@ -31,7 +31,7 @@ BatchWriter::store(std::shared_ptr<NodeObject> const& object)
 
     // If the batch has reached its limit, we wait
     // until the batch writer is finished
-    while (writeSet_.size() >= kBATCH_WRITE_PREALLOCATION_SIZE)
+    while (writeSet_.size() >= kBatchWritePreallocationSize)
         writeCondition_.wait(sl);
 
     writeSet_.push_back(object);
@@ -65,7 +65,7 @@ BatchWriter::writeBatch()
     {
         std::vector<std::shared_ptr<NodeObject>> set;
 
-        set.reserve(kBATCH_WRITE_PREALLOCATION_SIZE);
+        set.reserve(kBatchWritePreallocationSize);
 
         {
             std::scoped_lock const sl(writeMutex_);
diff --git a/src/libxrpl/nodestore/Database.cpp b/src/libxrpl/nodestore/Database.cpp
index cda3307317..b584aca268 100644
--- a/src/libxrpl/nodestore/Database.cpp
+++ b/src/libxrpl/nodestore/Database.cpp
@@ -38,7 +38,7 @@ Database::Database(
     beast::Journal journal)
     : j_(journal)
     , scheduler_(scheduler)
-    , earliestLedgerSeq_(get<std::uint32_t>(config, "earliest_seq", kXRP_LEDGER_EARLIEST_SEQ))
+    , earliestLedgerSeq_(get<std::uint32_t>(config, "earliest_seq", kXrpLedgerEarliestSeq))
     , requestBundle_(get<int>(config, "rq_bundle", 4))
     , readThreads_(std::max(1, readThreads))
 {
@@ -192,7 +192,7 @@ void
 Database::importInternal(Backend& dstBackend, Database& srcDB)
 {
     Batch batch;
-    batch.reserve(kBATCH_WRITE_PREALLOCATION_SIZE);
+    batch.reserve(kBatchWritePreallocationSize);
     auto storeBatch = [&, fname = __func__]() {
         try
         {
@@ -217,7 +217,7 @@ Database::importInternal(Backend& dstBackend, Database& srcDB)
             return;
 
         batch.emplace_back(std::move(nodeObject));
-        if (batch.size() >= kBATCH_WRITE_PREALLOCATION_SIZE)
+        if (batch.size() >= kBatchWritePreallocationSize)
             storeBatch();
     });
 
diff --git a/src/libxrpl/nodestore/ManagerImp.cpp b/src/libxrpl/nodestore/ManagerImp.cpp
index 0cfda7d86a..5cefbfd357 100644
--- a/src/libxrpl/nodestore/ManagerImp.cpp
+++ b/src/libxrpl/nodestore/ManagerImp.cpp
@@ -26,8 +26,8 @@ namespace xrpl::NodeStore {
 ManagerImp&
 ManagerImp::instance()
 {
-    static ManagerImp k_;
-    return k_;
+    static ManagerImp kInst;
+    return kInst;
 }
 
 void
@@ -77,7 +77,7 @@ ManagerImp::makeBackend(
     }
 
     return factory->createInstance(
-        NodeObject::kKEY_BYTES, parameters, burstSize, scheduler, journal);
+        NodeObject::kKeyBytes, parameters, burstSize, scheduler, journal);
 }
 
 std::unique_ptr<Database>
diff --git a/src/libxrpl/nodestore/backend/MemoryFactory.cpp b/src/libxrpl/nodestore/backend/MemoryFactory.cpp
index 13c82696cb..621ad1357c 100644
--- a/src/libxrpl/nodestore/backend/MemoryFactory.cpp
+++ b/src/libxrpl/nodestore/backend/MemoryFactory.cpp
@@ -74,8 +74,8 @@ MemoryFactory* gMemoryFactory = nullptr;
 void
 registerMemoryFactory(Manager& manager)
 {
-    static MemoryFactory kINSTANCE{manager};
-    gMemoryFactory = &kINSTANCE;
+    static MemoryFactory kInstance{manager};
+    gMemoryFactory = &kInstance;
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/libxrpl/nodestore/backend/NuDBFactory.cpp b/src/libxrpl/nodestore/backend/NuDBFactory.cpp
index db9dbcbec1..d026dc254c 100644
--- a/src/libxrpl/nodestore/backend/NuDBFactory.cpp
+++ b/src/libxrpl/nodestore/backend/NuDBFactory.cpp
@@ -53,7 +53,7 @@ public:
     // NuDB database. We used it to identify shard databases before that code
     // was removed. For now, its only use is a sanity check that the database
     // was created by xrpld.
-    static constexpr std::uint64_t kAPPNUM = 1;
+    static constexpr std::uint64_t kAppNum = 1;
 
     beast::Journal const j;
     size_t const keyBytes;
@@ -161,7 +161,7 @@ public:
         if (ec)
             Throw<nudb::system_error>(ec);
 
-        if (db.appnum() != kAPPNUM)
+        if (db.appnum() != kAppNum)
             Throw<std::runtime_error>("nodestore: unknown appnum");
         db.set_burst(burstSize);
     }
@@ -175,7 +175,7 @@ public:
     void
     open(bool createIfMissing) override
     {
-        open(createIfMissing, kAPPNUM, nudb::make_uid(), nudb::make_salt());
+        open(createIfMissing, kAppNum, nudb::make_uid(), nudb::make_salt());
     }
 
     void
@@ -460,7 +460,7 @@ public:
 void
 registerNuDBFactory(Manager& manager)
 {
-    static NuDBFactory const kINSTANCE{manager};
+    static NuDBFactory const kInstance{manager};
 }
 
 }  // namespace xrpl::NodeStore
diff --git a/src/libxrpl/nodestore/backend/NullFactory.cpp b/src/libxrpl/nodestore/backend/NullFactory.cpp
index 38f35e91ff..ae33b7daa2 100644
--- a/src/libxrpl/nodestore/backend/NullFactory.cpp
+++ b/src/libxrpl/nodestore/backend/NullFactory.cpp
@@ -128,7 +128,7 @@ public:
 void
 registerNullFactory(Manager& manager)
 {
-    static NullFactory const kINSTANCE{manager};
+    static NullFactory const kInstance{manager};
 }
 
 }  // namespace xrpl::NodeStore
diff --git a/src/libxrpl/nodestore/backend/RocksDBFactory.cpp b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
index 7f5ac6b14e..c1baf6aaaa 100644
--- a/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
+++ b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
@@ -486,7 +486,7 @@ public:
 void
 registerRocksDBFactory(Manager& manager)
 {
-    static RocksDBFactory const kINSTANCE{manager};
+    static RocksDBFactory const kInstance{manager};
 }
 
 }  // namespace xrpl::NodeStore
diff --git a/src/libxrpl/protocol/AMMCore.cpp b/src/libxrpl/protocol/AMMCore.cpp
index b4c44f0f36..eccb581c6d 100644
--- a/src/libxrpl/protocol/AMMCore.cpp
+++ b/src/libxrpl/protocol/AMMCore.cpp
@@ -29,7 +29,7 @@ Currency
 ammLPTCurrency(Asset const& asset1, Asset const& asset2)
 {
     // AMM LPToken is 0x03 plus 19 bytes of the hash
-    std::int32_t constexpr kAMM_CURRENCY_CODE = 0x03;
+    static constexpr std::int32_t kAmmCurrencyCode = 0x03;
     auto const& [minA, maxA] = std::minmax(asset1, asset2);
     uint256 const hash = std::visit(
         [](auto&& issue1, auto&& issue2) {
@@ -44,7 +44,7 @@ ammLPTCurrency(Asset const& asset1, Asset const& asset2)
         minA.value(),
         maxA.value());
     Currency currency;
-    *currency.begin() = kAMM_CURRENCY_CODE;
+    *currency.begin() = kAmmCurrencyCode;
     std::copy(hash.begin(), hash.begin() + currency.size() - 1, currency.begin() + 1);
     return currency;
 }
@@ -60,7 +60,7 @@ invalidAMMAsset(Asset const& asset, std::optional<std::pair<Asset, Asset>> const
 {
     auto const err = asset.visit(
         [](MPTIssue const& issue) -> std::optional<NotTEC> {
-            if (issue.getIssuer() == beast::kZERO)
+            if (issue.getIssuer() == beast::kZero)
                 return temBAD_MPT;
             return std::nullopt;
         },
@@ -101,7 +101,7 @@ invalidAMMAmount(
 {
     if (auto const res = invalidAMMAsset(amount.asset(), pair))
         return res;
-    if (amount < beast::kZERO || (!validZero && amount == beast::kZERO))
+    if (amount < beast::kZero || (!validZero && amount == beast::kZero))
         return temBAD_AMOUNT;
     return tesSUCCESS;
 }
@@ -112,14 +112,13 @@ ammAuctionTimeSlot(std::uint64_t current, STObject const& auctionSlot)
     // It should be impossible for expiration to be < TOTAL_TIME_SLOT_SECS,
     // but check just to be safe
     auto const expiration = auctionSlot[sfExpiration];
-    XRPL_ASSERT(
-        expiration >= kTOTAL_TIME_SLOT_SECS, "xrpl::ammAuctionTimeSlot : minimum expiration");
-    if (expiration >= kTOTAL_TIME_SLOT_SECS)
+    XRPL_ASSERT(expiration >= kTotalTimeSlotSecs, "xrpl::ammAuctionTimeSlot : minimum expiration");
+    if (expiration >= kTotalTimeSlotSecs)
     {
-        if (auto const start = expiration - kTOTAL_TIME_SLOT_SECS; current >= start)
+        if (auto const start = expiration - kTotalTimeSlotSecs; current >= start)
         {
-            if (auto const diff = current - start; diff < kTOTAL_TIME_SLOT_SECS)
-                return diff / kAUCTION_SLOT_INTERVAL_DURATION;
+            if (auto const diff = current - start; diff < kTotalTimeSlotSecs)
+                return diff / kAuctionSlotIntervalDuration;
         }
     }
     return std::nullopt;
diff --git a/src/libxrpl/protocol/AccountID.cpp b/src/libxrpl/protocol/AccountID.cpp
index 76982560de..6050144a8e 100644
--- a/src/libxrpl/protocol/AccountID.cpp
+++ b/src/libxrpl/protocol/AccountID.cpp
@@ -103,7 +103,7 @@ std::optional<AccountID>
 parseBase58(std::string const& s)
 {
     auto const result = decodeBase58Token(s, TokenType::AccountID);
-    if (result.size() != AccountID::kBYTES)
+    if (result.size() != AccountID::kBytes)
         return std::nullopt;
     return AccountID::fromRaw(result);
 }
@@ -146,7 +146,7 @@ parseBase58(std::string const& s)
 AccountID
 calcAccountID(PublicKey const& pk)
 {
-    static_assert(AccountID::kBYTES == sizeof(RipeshaHasher::result_type));
+    static_assert(AccountID::kBytes == sizeof(RipeshaHasher::result_type));
 
     RipeshaHasher rsh;
     rsh(pk.data(), pk.size());
@@ -156,15 +156,15 @@ calcAccountID(PublicKey const& pk)
 AccountID const&
 xrpAccount()
 {
-    static AccountID const kACCOUNT(beast::kZERO);
-    return kACCOUNT;
+    static AccountID const kAccount(beast::kZero);
+    return kAccount;
 }
 
 AccountID const&
 noAccount()
 {
-    static AccountID const kACCOUNT(1);
-    return kACCOUNT;
+    static AccountID const kAccount(1);
+    return kAccount;
 }
 
 bool
diff --git a/src/libxrpl/protocol/BuildInfo.cpp b/src/libxrpl/protocol/BuildInfo.cpp
index 7ea934fe3a..07c5f6f4dc 100644
--- a/src/libxrpl/protocol/BuildInfo.cpp
+++ b/src/libxrpl/protocol/BuildInfo.cpp
@@ -67,7 +67,7 @@ buildVersionString()
 std::string const&
 getVersionString()
 {
-    static std::string const kVALUE = [] {
+    static std::string const kValue = [] {
         std::string const s = buildVersionString();
 
         beast::SemanticVersion v;
@@ -75,23 +75,23 @@ getVersionString()
             logicError(s + ": Bad server version string");
         return s;
     }();
-    return kVALUE;
+    return kValue;
 }
 
 std::string const&
 getFullVersionString()
 {
-    static std::string const kVALUE = systemName() + "-" + getVersionString();
-    return kVALUE;
+    static std::string const kValue = systemName() + "-" + getVersionString();
+    return kValue;
 }
 
-static constexpr std::uint64_t kIMPLEMENTATION_VERSION_IDENTIFIER = 0x183B'0000'0000'0000LLU;
-static constexpr std::uint64_t kIMPLEMENTATION_VERSION_IDENTIFIER_MASK = 0xFFFF'0000'0000'0000LLU;
+static constexpr std::uint64_t kImplementationVersionIdentifier = 0x183B'0000'0000'0000LLU;
+static constexpr std::uint64_t kImplementationVersionIdentifierMask = 0xFFFF'0000'0000'0000LLU;
 
 std::uint64_t
 encodeSoftwareVersion(std::string_view versionStr)
 {
-    std::uint64_t c = kIMPLEMENTATION_VERSION_IDENTIFIER;
+    std::uint64_t c = kImplementationVersionIdentifier;
 
     beast::SemanticVersion v;
 
@@ -155,15 +155,14 @@ encodeSoftwareVersion(std::string_view versionStr)
 std::uint64_t
 getEncodedVersion()
 {
-    static std::uint64_t const kCOOKIE = {encodeSoftwareVersion(getVersionString())};
-    return kCOOKIE;
+    static std::uint64_t const kCookie = {encodeSoftwareVersion(getVersionString())};
+    return kCookie;
 }
 
 bool
 isXrpldVersion(std::uint64_t version)
 {
-    return (version & kIMPLEMENTATION_VERSION_IDENTIFIER_MASK) ==
-        kIMPLEMENTATION_VERSION_IDENTIFIER;
+    return (version & kImplementationVersionIdentifierMask) == kImplementationVersionIdentifier;
 }
 
 bool
diff --git a/src/libxrpl/protocol/ErrorCodes.cpp b/src/libxrpl/protocol/ErrorCodes.cpp
index a51bb9b56d..25c5fbe033 100644
--- a/src/libxrpl/protocol/ErrorCodes.cpp
+++ b/src/libxrpl/protocol/ErrorCodes.cpp
@@ -30,7 +30,7 @@ namespace detail {
 // status code.
 
 // clang-format off
-constexpr static ErrorInfo kUNORDERED_ERROR_INFOS[]{
+static constexpr ErrorInfo kUnorderedErrorInfos[]{
     {RpcActMalformed,          "actMalformed",         "Account malformed."},
     {RpcActNotFound,          "actNotFound",          "Account not found."},
     {RpcAlreadyMultisig,       "alreadyMultisig",      "Already multisigned."},
@@ -153,9 +153,9 @@ sortErrorInfos(ErrorInfo const (&unordered)[N]) -> std::array<ErrorInfo, M>
     return ret;
 }
 
-constexpr auto kSORTED_ERROR_INFOS{sortErrorInfos<RpcLast>(kUNORDERED_ERROR_INFOS)};
+constexpr auto kSortedErrorInfos{sortErrorInfos<RpcLast>(kUnorderedErrorInfos)};
 
-constexpr ErrorInfo kUNKNOWN_ERROR;
+constexpr ErrorInfo kUnknownError;
 
 }  // namespace detail
 
@@ -183,8 +183,8 @@ ErrorInfo const&
 getErrorInfo(ErrorCodeI code)
 {
     if (code <= RpcSuccess || code > RpcLast)
-        return detail::kUNKNOWN_ERROR;
-    return detail::kSORTED_ERROR_INFOS[code - 1];
+        return detail::kUnknownError;
+    return detail::kSortedErrorInfos[code - 1];
 }
 
 json::Value
diff --git a/src/libxrpl/protocol/Feature.cpp b/src/libxrpl/protocol/Feature.cpp
index 3862b52e27..059abe2996 100644
--- a/src/libxrpl/protocol/Feature.cpp
+++ b/src/libxrpl/protocol/Feature.cpp
@@ -202,7 +202,7 @@ public:
 
 FeatureCollections::FeatureCollections()
 {
-    features_.reserve(xrpl::detail::kNUM_FEATURES);
+    features_.reserve(xrpl::detail::kNumFeatures);
 }
 
 std::optional<uint256>
@@ -233,7 +233,7 @@ FeatureCollections::registerFeature(std::string const& name, Supported support,
     Feature const* i = getByName(name);
     if (i == nullptr)
     {
-        check(features_.size() < detail::kNUM_FEATURES, "More features defined than allocated.");
+        check(features_.size() < detail::kNumFeatures, "More features defined than allocated.");
 
         auto const f = sha512Half(Slice(name.data(), name.size()));
 
@@ -446,6 +446,6 @@ enforceValidFeatureName(auto fn) -> char const*
 // are initialized from top to bottom.
 //
 // Use initialization of one final static variable to set featureCollections::readOnly_.
-[[maybe_unused]] static bool const kREAD_ONLY_SET = gFeatureCollections.registrationIsDone();
+[[maybe_unused]] static bool const kReadOnlySet = gFeatureCollections.registrationIsDone();
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/IOUAmount.cpp b/src/libxrpl/protocol/IOUAmount.cpp
index e4326d611e..d65ba41a01 100644
--- a/src/libxrpl/protocol/IOUAmount.cpp
+++ b/src/libxrpl/protocol/IOUAmount.cpp
@@ -43,11 +43,11 @@ setSTNumberSwitchover(bool v)
 /* The range for the mantissa when normalized */
 // log(2^63,10) ~ 18.96
 //
-static std::int64_t constexpr kMIN_MANTISSA = STAmount::kMIN_VALUE;
-static std::int64_t constexpr kMAX_MANTISSA = STAmount::kMAX_VALUE;
+static constexpr std::int64_t kMinMantissa = STAmount::kMinValue;
+static constexpr std::int64_t kMaxMantissa = STAmount::kMaxValue;
 /* The range for the exponent when normalized */
-static int constexpr kMIN_EXPONENT = STAmount::kMIN_OFFSET;
-static int constexpr kMAX_EXPONENT = STAmount::kMAX_OFFSET;
+static constexpr int kMinExponent = STAmount::kMinOffset;
+static constexpr int kMaxExponent = STAmount::kMaxOffset;
 
 IOUAmount
 IOUAmount::fromNumber(Number const& number)
@@ -56,14 +56,14 @@ IOUAmount::fromNumber(Number const& number)
     // to normalize, which calls fromNumber
     IOUAmount result{};
     std::tie(result.mantissa_, result.exponent_) =
-        number.normalizeToRange(kMIN_MANTISSA, kMAX_MANTISSA);
+        number.normalizeToRange(kMinMantissa, kMaxMantissa);
     return result;
 }
 
 IOUAmount
 IOUAmount::minPositiveAmount()
 {
-    return IOUAmount(kMIN_MANTISSA, kMIN_EXPONENT);
+    return IOUAmount(kMinMantissa, kMinExponent);
 }
 
 void
@@ -71,7 +71,7 @@ IOUAmount::normalize()
 {
     if (mantissa_ == 0)
     {
-        *this = beast::kZERO;
+        *this = beast::kZero;
         return;
     }
 
@@ -79,10 +79,10 @@ IOUAmount::normalize()
     {
         Number const v{mantissa_, exponent_};
         *this = fromNumber(v);
-        if (exponent_ > kMAX_EXPONENT)
+        if (exponent_ > kMaxExponent)
             Throw<std::overflow_error>("value overflow");
-        if (exponent_ < kMIN_EXPONENT)
-            *this = beast::kZERO;
+        if (exponent_ < kMinExponent)
+            *this = beast::kZero;
         return;
     }
 
@@ -91,28 +91,28 @@ IOUAmount::normalize()
     if (negative)
         mantissa_ = -mantissa_;
 
-    while ((mantissa_ < kMIN_MANTISSA) && (exponent_ > kMIN_EXPONENT))
+    while ((mantissa_ < kMinMantissa) && (exponent_ > kMinExponent))
     {
         mantissa_ *= 10;
         --exponent_;
     }
 
-    while (mantissa_ > kMAX_MANTISSA)
+    while (mantissa_ > kMaxMantissa)
     {
-        if (exponent_ >= kMAX_EXPONENT)
+        if (exponent_ >= kMaxExponent)
             Throw<std::overflow_error>("IOUAmount::normalize");
 
         mantissa_ /= 10;
         ++exponent_;
     }
 
-    if ((exponent_ < kMIN_EXPONENT) || (mantissa_ < kMIN_MANTISSA))
+    if ((exponent_ < kMinExponent) || (mantissa_ < kMinMantissa))
     {
-        *this = beast::kZERO;
+        *this = beast::kZero;
         return;
     }
 
-    if (exponent_ > kMAX_EXPONENT)
+    if (exponent_ > kMaxExponent)
         Throw<std::overflow_error>("value overflow");
 
     if (negative)
@@ -121,19 +121,19 @@ IOUAmount::normalize()
 
 IOUAmount::IOUAmount(Number const& other) : IOUAmount(fromNumber(other))
 {
-    if (exponent_ > kMAX_EXPONENT)
+    if (exponent_ > kMaxExponent)
         Throw<std::overflow_error>("value overflow");
-    if (exponent_ < kMIN_EXPONENT)
-        *this = beast::kZERO;
+    if (exponent_ < kMinExponent)
+        *this = beast::kZero;
 }
 
 IOUAmount&
 IOUAmount::operator+=(IOUAmount const& other)
 {
-    if (other == beast::kZERO)
+    if (other == beast::kZero)
         return *this;
 
-    if (*this == beast::kZERO)
+    if (*this == beast::kZero)
     {
         *this = other;
         return *this;
@@ -165,7 +165,7 @@ IOUAmount::operator+=(IOUAmount const& other)
 
     if (mantissa_ >= -10 && mantissa_ <= 10)
     {
-        *this = beast::kZERO;
+        *this = beast::kZero;
         return *this;
     }
 
@@ -190,7 +190,7 @@ mulRatio(IOUAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundU
     // A vector with the value 10^index for indexes from 0 to 29
     // The largest intermediate value we expect is 2^96, which
     // is less than 10^29
-    static auto const kPOWER_TABLE = [] {
+    static auto const kPowerTable = [] {
         std::vector<uint128_t> result;
         result.reserve(30);  // 2^96 is largest intermediate result size
         uint128_t cur(1);
@@ -204,11 +204,11 @@ mulRatio(IOUAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundU
 
     // Return floor(log10(v))
     // Note: Returns -1 for v == 0
-    static auto kLOG10_FLOOR = [](uint128_t const& v) {
+    static auto kLoG10Floor = [](uint128_t const& v) {
         // Find the index of the first element >= the requested element, the
         // index is the log of the element in the log table.
-        auto const l = std::ranges::lower_bound(kPOWER_TABLE, v);
-        int index = std::distance(kPOWER_TABLE.begin(), l);
+        auto const l = std::ranges::lower_bound(kPowerTable, v);
+        int index = std::distance(kPowerTable.begin(), l);
         // If we're not equal, subtract to get the floor
         if (*l != v)
             --index;
@@ -216,14 +216,14 @@ mulRatio(IOUAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundU
     };
 
     // Return ceil(log10(v))
-    static auto kLOG10_CEIL = [](uint128_t const& v) {
+    static auto kLoG10Ceil = [](uint128_t const& v) {
         // Find the index of the first element >= the requested element, the
         // index is the log of the element in the log table.
-        auto const l = std::ranges::lower_bound(kPOWER_TABLE, v);
-        return int(std::distance(kPOWER_TABLE.begin(), l));
+        auto const l = std::ranges::lower_bound(kPowerTable, v);
+        return int(std::distance(kPowerTable.begin(), l));
     };
 
-    static auto const kFL64 = kLOG10_FLOOR(std::numeric_limits<std::int64_t>::max());
+    static auto const kFl64 = kLoG10Floor(std::numeric_limits<std::int64_t>::max());
 
     bool const neg = amt.mantissa() < 0;
     uint128_t const den128(den);
@@ -244,12 +244,12 @@ mulRatio(IOUAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundU
         // and (rem/den128) is as large as possible. Scale by multiplying low
         // and rem by 10 and subtracting one from the exponent. We could do this
         // with a loop, but it's more efficient to use logarithms.
-        auto const roomToGrow = kFL64 - kLOG10_CEIL(low);
+        auto const roomToGrow = kFl64 - kLoG10Ceil(low);
         if (roomToGrow > 0)
         {
             exponent -= roomToGrow;
-            low *= kPOWER_TABLE[roomToGrow];
-            rem *= kPOWER_TABLE[roomToGrow];
+            low *= kPowerTable[roomToGrow];
+            rem *= kPowerTable[roomToGrow];
         }
         auto const addRem = rem / den128;
         low += addRem;
@@ -261,14 +261,14 @@ mulRatio(IOUAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundU
     // and adding one to the exponent until the low will fit in the 64-bit
     // mantissa. Use logarithms to avoid looping.
     bool hasRem = bool(rem);
-    auto const mustShrink = kLOG10_CEIL(low) - kFL64;
+    auto const mustShrink = kLoG10Ceil(low) - kFl64;
     if (mustShrink > 0)
     {
         uint128_t const sav(low);
         exponent += mustShrink;
-        low /= kPOWER_TABLE[mustShrink];
+        low /= kPowerTable[mustShrink];
         if (!hasRem)
-            hasRem = bool(sav - low * kPOWER_TABLE[mustShrink]);
+            hasRem = bool(sav - low * kPowerTable[mustShrink]);
     }
 
     std::int64_t mantissa = low.convert_to<std::int64_t>();
@@ -297,7 +297,7 @@ mulRatio(IOUAmount const& amt, std::uint32_t num, std::uint32_t den, bool roundU
         {
             if (!result)
             {
-                return IOUAmount(-kMIN_MANTISSA, kMIN_EXPONENT);
+                return IOUAmount(-kMinMantissa, kMinExponent);
             }
             // This subtraction cannot underflow because `result` is not zero
             return IOUAmount(result.mantissa() - 1, result.exponent());
diff --git a/src/libxrpl/protocol/Indexes.cpp b/src/libxrpl/protocol/Indexes.cpp
index a74e6cedf4..ae29bd3297 100644
--- a/src/libxrpl/protocol/Indexes.cpp
+++ b/src/libxrpl/protocol/Indexes.cpp
@@ -143,9 +143,9 @@ getBookBase(Book const& book)
 uint256
 getQualityNext(uint256 const& uBase)
 {
-    static constexpr uint256 kNEXT_QUALITY(
+    static constexpr uint256 kNextQuality(
         "0000000000000000000000000000000000000000000000010000000000000000");
-    return uBase + kNEXT_QUALITY;
+    return uBase + kNextQuality;
 }
 
 std::uint64_t
@@ -197,8 +197,8 @@ child(uint256 const& key) noexcept
 Keylet const&
 skip() noexcept
 {
-    static Keylet const kRET{ltLEDGER_HASHES, indexHash(LedgerNameSpace::SkipList)};
-    return kRET;
+    static Keylet const kRet{ltLEDGER_HASHES, indexHash(LedgerNameSpace::SkipList)};
+    return kRet;
 }
 
 Keylet
@@ -213,22 +213,22 @@ skip(LedgerIndex ledger) noexcept
 Keylet const&
 amendments() noexcept
 {
-    static Keylet const kRET{ltAMENDMENTS, indexHash(LedgerNameSpace::Amendments)};
-    return kRET;
+    static Keylet const kRet{ltAMENDMENTS, indexHash(LedgerNameSpace::Amendments)};
+    return kRet;
 }
 
 Keylet const&
 fees() noexcept
 {
-    static Keylet const kRET{ltFEE_SETTINGS, indexHash(LedgerNameSpace::FeeSettings)};
-    return kRET;
+    static Keylet const kRet{ltFEE_SETTINGS, indexHash(LedgerNameSpace::FeeSettings)};
+    return kRet;
 }
 
 Keylet const&
 negativeUNL() noexcept
 {
-    static Keylet const kRET{ltNEGATIVE_UNL, indexHash(LedgerNameSpace::NegativeUnl)};
-    return kRET;
+    static Keylet const kRet{ltNEGATIVE_UNL, indexHash(LedgerNameSpace::NegativeUnl)};
+    return kRet;
 }
 
 Keylet
@@ -391,7 +391,7 @@ nftpageMin(AccountID const& owner)
 Keylet
 nftpageMax(AccountID const& owner)
 {
-    uint256 id = nft::kPAGE_MASK;
+    uint256 id = nft::kPageMask;
     std::memcpy(id.data(), owner.data(), owner.size());
     return {ltNFTOKEN_PAGE, id};
 }
@@ -400,7 +400,7 @@ Keylet
 nftpage(Keylet const& k, uint256 const& token)
 {
     XRPL_ASSERT(k.type == ltNFTOKEN_PAGE, "xrpl::keylet::nftpage : valid input type");
-    return {ltNFTOKEN_PAGE, (k.key & ~nft::kPAGE_MASK) + (token & nft::kPAGE_MASK)};
+    return {ltNFTOKEN_PAGE, (k.key & ~nft::kPageMask) + (token & nft::kPageMask)};
 }
 
 Keylet
diff --git a/src/libxrpl/protocol/InnerObjectFormats.cpp b/src/libxrpl/protocol/InnerObjectFormats.cpp
index 5c691159d7..66b2822a42 100644
--- a/src/libxrpl/protocol/InnerObjectFormats.cpp
+++ b/src/libxrpl/protocol/InnerObjectFormats.cpp
@@ -165,8 +165,8 @@ InnerObjectFormats::InnerObjectFormats()
 InnerObjectFormats const&
 InnerObjectFormats::getInstance()
 {
-    static InnerObjectFormats const kINSTANCE;
-    return kINSTANCE;
+    static InnerObjectFormats const kInstance;
+    return kInstance;
 }
 
 SOTemplate const*
diff --git a/src/libxrpl/protocol/LedgerFormats.cpp b/src/libxrpl/protocol/LedgerFormats.cpp
index 99c636fbdc..8b91bb7930 100644
--- a/src/libxrpl/protocol/LedgerFormats.cpp
+++ b/src/libxrpl/protocol/LedgerFormats.cpp
@@ -11,12 +11,12 @@ namespace xrpl {
 std::vector<SOElement> const&
 LedgerFormats::getCommonFields()
 {
-    static auto const kCOMMON_FIELDS = std::vector<SOElement>{
+    static auto const kCommonFields = std::vector<SOElement>{
         {sfLedgerIndex, SoeOptional},
         {sfLedgerEntryType, SoeRequired},
         {sfFlags, SoeRequired},
     };
-    return kCOMMON_FIELDS;
+    return kCommonFields;
 }
 
 LedgerFormats::LedgerFormats()
@@ -41,8 +41,8 @@ LedgerFormats::LedgerFormats()
 LedgerFormats const&
 LedgerFormats::getInstance()
 {
-    static LedgerFormats const kINSTANCE;
-    return kINSTANCE;
+    static LedgerFormats const kInstance;
+    return kInstance;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/Permissions.cpp b/src/libxrpl/protocol/Permissions.cpp
index 4222c63fea..ce3baeb35e 100644
--- a/src/libxrpl/protocol/Permissions.cpp
+++ b/src/libxrpl/protocol/Permissions.cpp
@@ -92,8 +92,8 @@ Permission::Permission()
 Permission const&
 Permission::getInstance()
 {
-    static Permission const kINSTANCE;
-    return kINSTANCE;
+    static Permission const kInstance;
+    return kInstance;
 }
 
 std::optional<std::string>
diff --git a/src/libxrpl/protocol/Protocol.cpp b/src/libxrpl/protocol/Protocol.cpp
index 14230e78bd..fc45a2d4b3 100644
--- a/src/libxrpl/protocol/Protocol.cpp
+++ b/src/libxrpl/protocol/Protocol.cpp
@@ -4,12 +4,12 @@ namespace xrpl {
 bool
 isVotingLedger(LedgerIndex seq)
 {
-    return seq % kFLAG_LEDGER_INTERVAL == 0;
+    return seq % kFlagLedgerInterval == 0;
 }
 
 bool
 isFlagLedger(LedgerIndex seq)
 {
-    return seq % kFLAG_LEDGER_INTERVAL == 0;
+    return seq % kFlagLedgerInterval == 0;
 }
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/PublicKey.cpp b/src/libxrpl/protocol/PublicKey.cpp
index c38fb781c9..7472f059e9 100644
--- a/src/libxrpl/protocol/PublicKey.cpp
+++ b/src/libxrpl/protocol/PublicKey.cpp
@@ -88,9 +88,9 @@ sliceToHex(Slice const& slice)
     }
     for (int i = 0; i < slice.size(); ++i)
     {
-        constexpr char kHEX[] = "0123456789ABCDEF";
-        s += kHEX[((slice[i] & 0xf0) >> 4)];
-        s += kHEX[((slice[i] & 0x0f) >> 0)];
+        static constexpr char kHex[] = "0123456789ABCDEF";
+        s += kHex[((slice[i] & 0xf0) >> 4)];
+        s += kHex[((slice[i] & 0x0f) >> 0)];
     }
     return s;
 }
@@ -173,7 +173,7 @@ ed25519Canonical(Slice const& sig)
 
 PublicKey::PublicKey(Slice const& slice)
 {
-    if (slice.size() < kSIZE)
+    if (slice.size() < kSize)
     {
         logicError(
             "PublicKey::PublicKey - Input slice cannot be an undersized "
@@ -182,12 +182,12 @@ PublicKey::PublicKey(Slice const& slice)
 
     if (!publicKeyType(slice))
         logicError("PublicKey::PublicKey invalid type");
-    std::memcpy(buf_, slice.data(), kSIZE);
+    std::memcpy(buf_, slice.data(), kSize);
 }
 
 PublicKey::PublicKey(PublicKey const& other)
 {
-    std::memcpy(buf_, other.buf_, kSIZE);
+    std::memcpy(buf_, other.buf_, kSize);
 }
 
 PublicKey&
@@ -195,7 +195,7 @@ PublicKey::operator=(PublicKey const& other)
 {
     if (this != &other)
     {
-        std::memcpy(buf_, other.buf_, kSIZE);
+        std::memcpy(buf_, other.buf_, kSize);
     }
 
     return *this;
@@ -293,7 +293,7 @@ verify(PublicKey const& publicKey, Slice const& m, Slice const& sig) noexcept
 NodeID
 calcNodeID(PublicKey const& pk)
 {
-    static_assert(NodeID::kBYTES == sizeof(RipeshaHasher::result_type));
+    static_assert(NodeID::kBytes == sizeof(RipeshaHasher::result_type));
 
     RipeshaHasher h;
     h(pk.data(), pk.size());
diff --git a/src/libxrpl/protocol/Quality.cpp b/src/libxrpl/protocol/Quality.cpp
index 35a3a3b3a5..7ad426bef7 100644
--- a/src/libxrpl/protocol/Quality.cpp
+++ b/src/libxrpl/protocol/Quality.cpp
@@ -114,10 +114,10 @@ Quality
 composedQuality(Quality const& lhs, Quality const& rhs)
 {
     STAmount const lhsRate(lhs.rate());
-    XRPL_ASSERT(lhsRate != beast::kZERO, "xrpl::composedQuality : nonzero left input");
+    XRPL_ASSERT(lhsRate != beast::kZero, "xrpl::composedQuality : nonzero left input");
 
     STAmount const rhsRate(rhs.rate());
-    XRPL_ASSERT(rhsRate != beast::kZERO, "xrpl::composedQuality : nonzero right input");
+    XRPL_ASSERT(rhsRate != beast::kZero, "xrpl::composedQuality : nonzero right input");
 
     STAmount const rate(mulRound(lhsRate, rhsRate, lhsRate.asset(), true));
 
@@ -134,7 +134,7 @@ Quality
 Quality::round(int digits) const
 {
     // Modulus for mantissa
-    static std::uint64_t const kMOD[17] = {
+    static std::uint64_t const kMod[17] = {
         /* 0 */ 10000000000000000,
         /* 1 */ 1000000000000000,
         /* 2 */ 100000000000000,
@@ -156,8 +156,8 @@ Quality::round(int digits) const
 
     auto exponent = value_ >> (64 - 8);
     auto mantissa = value_ & 0x00ffffffffffffffULL;
-    mantissa += kMOD[digits] - 1;
-    mantissa -= (mantissa % kMOD[digits]);
+    mantissa += kMod[digits] - 1;
+    mantissa -= (mantissa % kMod[digits]);
 
     return Quality{(exponent << (64 - 8)) | mantissa};
 }
diff --git a/src/libxrpl/protocol/QualityFunction.cpp b/src/libxrpl/protocol/QualityFunction.cpp
index 2e9eb5745a..e862770406 100644
--- a/src/libxrpl/protocol/QualityFunction.cpp
+++ b/src/libxrpl/protocol/QualityFunction.cpp
@@ -13,7 +13,7 @@ namespace xrpl {
 QualityFunction::QualityFunction(Quality const& quality, QualityFunction::CLOBLikeTag)
     : m_(0), b_(0), quality_(quality)
 {
-    if (quality.rate() <= beast::kZERO)
+    if (quality.rate() <= beast::kZero)
         Throw<std::runtime_error>("QualityFunction quality rate is 0.");
     b_ = 1 / quality.rate();
 }
@@ -30,7 +30,7 @@ QualityFunction::combine(QualityFunction const& qf)
 std::optional<Number>
 QualityFunction::outFromAvgQ(Quality const& quality)
 {
-    if (m_ != 0 && quality.rate() != beast::kZERO)
+    if (m_ != 0 && quality.rate() != beast::kZero)
     {
         SaveNumberRoundMode const rm(Number::setround(Number::RoundingMode::Upward));
         auto const out = (1 / quality.rate() - b_) / m_;
diff --git a/src/libxrpl/protocol/Rate2.cpp b/src/libxrpl/protocol/Rate2.cpp
index 27b17068e3..fd56f83bf5 100644
--- a/src/libxrpl/protocol/Rate2.cpp
+++ b/src/libxrpl/protocol/Rate2.cpp
@@ -9,7 +9,7 @@
 
 namespace xrpl {
 
-Rate const kPARITY_RATE(QUALITY_ONE);
+Rate const kParityRate(QUALITY_ONE);
 
 namespace detail {
 
@@ -35,7 +35,7 @@ multiply(STAmount const& amount, Rate const& rate)
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::multiply : nonzero rate input");
 
-    if (rate == kPARITY_RATE)
+    if (rate == kParityRate)
         return amount;
 
     return multiply(amount, detail::asAmount(rate), amount.asset());
@@ -46,7 +46,7 @@ multiplyRound(STAmount const& amount, Rate const& rate, bool roundUp)
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::multiplyRound : nonzero rate input");
 
-    if (rate == kPARITY_RATE)
+    if (rate == kParityRate)
         return amount;
 
     return mulRound(amount, detail::asAmount(rate), amount.asset(), roundUp);
@@ -57,7 +57,7 @@ multiplyRound(STAmount const& amount, Rate const& rate, Asset const& asset, bool
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::multiplyRound(Issue) : nonzero rate input");
 
-    if (rate == kPARITY_RATE)
+    if (rate == kParityRate)
     {
         return amount;
     }
@@ -70,7 +70,7 @@ divide(STAmount const& amount, Rate const& rate)
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::divide : nonzero rate input");
 
-    if (rate == kPARITY_RATE)
+    if (rate == kParityRate)
         return amount;
 
     return divide(amount, detail::asAmount(rate), amount.asset());
@@ -81,7 +81,7 @@ divideRound(STAmount const& amount, Rate const& rate, bool roundUp)
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::divideRound : nonzero rate input");
 
-    if (rate == kPARITY_RATE)
+    if (rate == kParityRate)
         return amount;
 
     return divRound(amount, detail::asAmount(rate), amount.asset(), roundUp);
@@ -92,7 +92,7 @@ divideRound(STAmount const& amount, Rate const& rate, Asset const& asset, bool r
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::divideRound(Issue) : nonzero rate input");
 
-    if (rate == kPARITY_RATE)
+    if (rate == kParityRate)
         return amount;
 
     return divRound(amount, detail::asAmount(rate), asset, roundUp);
diff --git a/src/libxrpl/protocol/SField.cpp b/src/libxrpl/protocol/SField.cpp
index 094c67d150..f2a523db49 100644
--- a/src/libxrpl/protocol/SField.cpp
+++ b/src/libxrpl/protocol/SField.cpp
@@ -8,7 +8,7 @@
 namespace xrpl {
 
 // Storage for static const members.
-SField::IsSigning const SField::kNOT_SIGNING;
+SField::IsSigning const SField::kNotSigning;
 int SField::num = 0;
 std::unordered_map<int, SField const*> SField::knownCodeToField;
 std::unordered_map<std::string, SField const*> SField::knownNameToField;
@@ -53,12 +53,12 @@ TypedField<T>::TypedField(PrivateAccessTagT pat, Args&&... args)
         ##__VA_ARGS__);
 
 // SFields which, for historical reasons, do not follow naming conventions.
-SField const kSF_INVALID(access, -1, "");
-SField const kSF_GENERIC(access, 0, "Generic");
+SField const kSfInvalid(access, -1, "");
+SField const kSfGeneric(access, 0, "Generic");
 // The following two fields aren't used anywhere, but they break tests/have
 // downstream effects.
-SField const kSF_HASH(access, STI_UINT256, 257, "hash");
-SField const kSF_INDEX(access, STI_UINT256, 258, "index");
+SField const kSfHash(access, STI_UINT256, 257, "hash");
+SField const kSfIndex(access, STI_UINT256, 258, "index");
 
 #include <xrpl/protocol/detail/sfields.macro>
 
@@ -98,7 +98,7 @@ SField::SField(PrivateAccessTagT, int fc, char const* fn)
     , fieldType(STI_UNKNOWN)
     , fieldValue(0)
     , fieldName(fn)
-    , fieldMeta(kSMD_NEVER)
+    , fieldMeta(kSmdNever)
     , fieldNum(++num)
     , signingField(IsSigning::Yes)
     , jsonName(fieldName.c_str())
@@ -121,7 +121,7 @@ SField::getField(int code)
     {
         return *(it->second);
     }
-    return kSF_INVALID;
+    return kSfInvalid;
 }
 
 int
@@ -149,7 +149,7 @@ SField::getField(std::string const& fieldName)
     {
         return *(it->second);
     }
-    return kSF_INVALID;
+    return kSfInvalid;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/STAccount.cpp b/src/libxrpl/protocol/STAccount.cpp
index f561c9f930..da8b233c61 100644
--- a/src/libxrpl/protocol/STAccount.cpp
+++ b/src/libxrpl/protocol/STAccount.cpp
@@ -17,11 +17,11 @@
 
 namespace xrpl {
 
-STAccount::STAccount() : value_(beast::kZERO), default_(true)
+STAccount::STAccount() : value_(beast::kZero), default_(true)
 {
 }
 
-STAccount::STAccount(SField const& n) : STBase(n), value_(beast::kZERO), default_(true)
+STAccount::STAccount(SField const& n) : STBase(n), value_(beast::kZero), default_(true)
 {
 }
 
@@ -35,11 +35,11 @@ STAccount::STAccount(SField const& n, Buffer const& v) : STAccount(n)
     //    STVar::STVar (SerialIter&, SField const&)
     // which throws.  If STVar can throw in its constructor, then so can
     // STAccount.
-    if (v.size() != uint160::kBYTES)
+    if (v.size() != uint160::kBytes)
         Throw<std::runtime_error>("Invalid STAccount size");
 
     default_ = false;
-    memcpy(value_.begin(), v.data(), uint160::kBYTES);
+    memcpy(value_.begin(), v.data(), uint160::kBytes);
 }
 
 STAccount::STAccount(SerialIter& sit, SField const& name) : STAccount(name, sit.getVLBuffer())
@@ -77,7 +77,7 @@ STAccount::add(Serializer& s) const
     // Preserve the serialization behavior of an STBlob:
     //  o If we are default (all zeros) serialize as an empty blob.
     //  o Otherwise serialize 160 bits.
-    int const size = isDefault() ? 0 : uint160::kBYTES;
+    int const size = isDefault() ? 0 : uint160::kBytes;
     s.addVL(value_.data(), size);
 }
 
diff --git a/src/libxrpl/protocol/STAmount.cpp b/src/libxrpl/protocol/STAmount.cpp
index 20d3db45c0..3cbf03575b 100644
--- a/src/libxrpl/protocol/STAmount.cpp
+++ b/src/libxrpl/protocol/STAmount.cpp
@@ -47,9 +47,9 @@
 
 namespace xrpl {
 
-static std::uint64_t const kTEN_TO14 = 100000000000000ull;
-static std::uint64_t const kTEN_TO14M1 = kTEN_TO14 - 1;
-static std::uint64_t const kTEN_TO17 = kTEN_TO14 * 1000;
+static std::uint64_t const kTenTO14 = 100000000000000ull;
+static std::uint64_t const kTenTO14M1 = kTenTO14 - 1;
+static std::uint64_t const kTenTO17 = kTenTO14 * 1000;
 
 //------------------------------------------------------------------------------
 static std::int64_t
@@ -88,11 +88,11 @@ areComparable(STAmount const& v1, STAmount const& v2)
 {
     return std::visit(
         [&]<ValidIssueType TIss1, ValidIssueType TIss2>(TIss1 const& issue1, TIss2 const& issue2) {
-            if constexpr (kIS_ISSUE_V<TIss1> && kIS_ISSUE_V<TIss2>)
+            if constexpr (kIsIssueV<TIss1> && kIsIssueV<TIss2>)
             {
                 return v1.native() == v2.native() && issue1.currency == issue2.currency;
             }
-            else if constexpr (kIS_MPTISSUE_V<TIss1> && kIS_MPTISSUE_V<TIss2>)
+            else if constexpr (kIsMptissueV<TIss1> && kIsMptissueV<TIss2>)
             {
                 return issue1 == issue2;
             }
@@ -105,20 +105,20 @@ areComparable(STAmount const& v1, STAmount const& v2)
         v2.asset().value());
 }
 
-static_assert(kINITIAL_XRP.drops() == STAmount::kMAX_NATIVE_N);
+static_assert(kInitialXrp.drops() == STAmount::kMaxNativeN);
 
 STAmount::STAmount(SerialIter& sit, SField const& name) : STBase(name)
 {
     std::uint64_t value = sit.get64();
 
     // native or MPT
-    if ((value & kISSUED_CURRENCY) == 0)
+    if ((value & kIssuedCurrency) == 0)
     {
-        if ((value & kMP_TOKEN) != 0)
+        if ((value & kMpToken) != 0)
         {
             // is MPT
             offset_ = 0;
-            isNegative_ = (value & kPOSITIVE) == 0;
+            isNegative_ = (value & kPositive) == 0;
             value_ = (value << 8) | sit.get8();
             asset_ = sit.get192();
             return;
@@ -126,9 +126,9 @@ STAmount::STAmount(SerialIter& sit, SField const& name) : STBase(name)
         // else is XRP
         asset_ = xrpIssue();
         // positive
-        if ((value & kPOSITIVE) != 0)
+        if ((value & kPositive) != 0)
         {
-            value_ = value & kVALUE_MASK;
+            value_ = value & kValueMask;
             offset_ = 0;
             isNegative_ = false;
             return;
@@ -138,7 +138,7 @@ STAmount::STAmount(SerialIter& sit, SField const& name) : STBase(name)
         if (value == 0)
             Throw<std::runtime_error>("negative zero is not canonical");
 
-        value_ = value & kVALUE_MASK;
+        value_ = value & kValueMask;
         offset_ = 0;
         isNegative_ = true;
         return;
@@ -165,8 +165,7 @@ STAmount::STAmount(SerialIter& sit, SField const& name) : STBase(name)
         bool const isNegative = (offset & 256) == 0;
         offset = (offset & 255) - 97;  // center the range
 
-        if (value < kMIN_VALUE || value > kMAX_VALUE || offset < kMIN_OFFSET ||
-            offset > kMAX_OFFSET)
+        if (value < kMinValue || value > kMaxValue || offset < kMinOffset || offset > kMaxOffset)
         {
             Throw<std::runtime_error>("invalid currency value");
         }
@@ -229,7 +228,7 @@ STAmount::STAmount(std::uint64_t mantissa, bool negative)
 }
 
 STAmount::STAmount(XRPAmount const& amount)
-    : asset_(xrpIssue()), offset_(0), isNegative_(amount < beast::kZERO)
+    : asset_(xrpIssue()), offset_(0), isNegative_(amount < beast::kZero)
 {
     if (isNegative_)
     {
@@ -316,7 +315,7 @@ STAmount::operator=(IOUAmount const& iou)
 {
     XRPL_ASSERT(integral() == false, "xrpl::STAmount::operator=(IOUAmount) : is not integral");
     offset_ = iou.exponent();
-    isNegative_ = iou < beast::kZERO;
+    isNegative_ = iou < beast::kZero;
     if (isNegative_)
     {
         value_ = static_cast<std::uint64_t>(-iou.mantissa());
@@ -373,10 +372,10 @@ operator+(STAmount const& v1, STAmount const& v2)
     if (!areComparable(v1, v2))
         Throw<std::runtime_error>("Can't add amounts that are't comparable!");
 
-    if (v2 == beast::kZERO)
+    if (v2 == beast::kZero)
         return v1;
 
-    if (v1 == beast::kZERO)
+    if (v1 == beast::kZero)
     {
         // Result must be in terms of v1 currency and issuer.
         return {v1.getFName(), v1.asset(), v2.mantissa(), v2.exponent(), v2.negative()};
@@ -438,7 +437,7 @@ operator-(STAmount const& v1, STAmount const& v2)
 
 //------------------------------------------------------------------------------
 
-std::uint64_t const STAmount::kU_RATE_ONE = getRate(STAmount(1), STAmount(1));
+std::uint64_t const STAmount::kURateOne = getRate(STAmount(1), STAmount(1));
 
 void
 STAmount::setIssue(Asset const& asset)
@@ -458,13 +457,13 @@ STAmount::setIssue(Asset const& asset)
 std::uint64_t
 getRate(STAmount const& offerOut, STAmount const& offerIn)
 {
-    if (offerOut == beast::kZERO)
+    if (offerOut == beast::kZero)
         return 0;
 
     try
     {
         STAmount const r = divide(offerIn, offerOut, noIssue());
-        if (r == beast::kZERO)  // offer is too good
+        if (r == beast::kZero)  // offer is too good
             return 0;
         XRPL_ASSERT(
             (r.exponent() >= -100) && (r.exponent() <= 155),
@@ -505,7 +504,7 @@ canAdd(STAmount const& a, STAmount const& b)
         return false;
 
     // special case: adding anything to zero is always fine
-    if (a == beast::kZERO || b == beast::kZERO)
+    if (a == beast::kZero || b == beast::kZero)
         return true;
 
     // XRP case (overflow & underflow check)
@@ -525,17 +524,17 @@ canAdd(STAmount const& a, STAmount const& b)
     auto const ret = std::visit(
         [&]<ValidIssueType TIss1, ValidIssueType TIss2>(
             TIss1 const&, TIss2 const&) -> std::optional<bool> {
-            if constexpr (kIS_ISSUE_V<TIss1> && kIS_ISSUE_V<TIss2>)
+            if constexpr (kIsIssueV<TIss1> && kIsIssueV<TIss2>)
             {
-                static STAmount const kONE{IOUAmount{1, 0}, noIssue()};
-                static STAmount const kMAX_LOSS{IOUAmount{1, -4}, noIssue()};
-                STAmount const lhs = divide((a - b) + b, a, noIssue()) - kONE;
-                STAmount const rhs = divide((b - a) + a, b, noIssue()) - kONE;
-                return ((rhs.negative() ? -rhs : rhs) + (lhs.negative() ? -lhs : lhs)) <= kMAX_LOSS;
+                static STAmount const kOne{IOUAmount{1, 0}, noIssue()};
+                static STAmount const kMaxLoss{IOUAmount{1, -4}, noIssue()};
+                STAmount const lhs = divide((a - b) + b, a, noIssue()) - kOne;
+                STAmount const rhs = divide((b - a) + a, b, noIssue()) - kOne;
+                return ((rhs.negative() ? -rhs : rhs) + (lhs.negative() ? -lhs : lhs)) <= kMaxLoss;
             }
 
             // MPT (overflow & underflow check)
-            if constexpr (kIS_MPTISSUE_V<TIss1> && kIS_MPTISSUE_V<TIss2>)
+            if constexpr (kIsMptissueV<TIss1> && kIsMptissueV<TIss2>)
             {
                 MPTAmount const aVal = a.mpt();
                 MPTAmount const bVal = b.mpt();
@@ -582,7 +581,7 @@ canSubtract(STAmount const& a, STAmount const& b)
         return false;
 
     // Special case: subtracting zero is always fine
-    if (b == beast::kZERO)
+    if (b == beast::kZero)
         return true;
 
     // XRP case (underflow & overflow check)
@@ -606,13 +605,13 @@ canSubtract(STAmount const& a, STAmount const& b)
     auto const ret = std::visit(
         [&]<ValidIssueType TIss1, ValidIssueType TIss2>(
             TIss1 const&, TIss2 const&) -> std::optional<bool> {
-            if constexpr (kIS_ISSUE_V<TIss1> && kIS_ISSUE_V<TIss2>)
+            if constexpr (kIsIssueV<TIss1> && kIsIssueV<TIss2>)
             {
                 return true;
             }
 
             // MPT case (underflow & overflow check)
-            if constexpr (kIS_MPTISSUE_V<TIss1> && kIS_MPTISSUE_V<TIss2>)
+            if constexpr (kIsMptissueV<TIss1> && kIsMptissueV<TIss2>)
             {
                 MPTAmount const aVal = a.mpt();
                 MPTAmount const bVal = b.mpt();
@@ -683,7 +682,7 @@ std::string
 STAmount::getText() const
 {
     // keep full internal accuracy, but make more human friendly if possible
-    if (*this == beast::kZERO)
+    if (*this == beast::kZero)
         return "0";
 
     std::string const rawValue(std::to_string(value_));
@@ -780,9 +779,9 @@ STAmount::add(Serializer& s) const
 {
     asset_.visit(
         [&](MPTIssue const& issue) {
-            auto u8 = static_cast<unsigned char>(kMP_TOKEN >> 56);
+            auto u8 = static_cast<unsigned char>(kMpToken >> 56);
             if (!isNegative_)
-                u8 |= static_cast<unsigned char>(kPOSITIVE >> 56);
+                u8 |= static_cast<unsigned char>(kPositive >> 56);
             s.add8(u8);
             s.add64(value_);
             s.addBitString(issue.getMptID());
@@ -794,7 +793,7 @@ STAmount::add(Serializer& s) const
 
                 if (!isNegative_)
                 {
-                    s.add64(value_ | kPOSITIVE);
+                    s.add64(value_ | kPositive);
                 }
                 else
                 {
@@ -803,9 +802,9 @@ STAmount::add(Serializer& s) const
             }
             else
             {
-                if (*this == beast::kZERO)
+                if (*this == beast::kZero)
                 {
-                    s.add64(kISSUED_CURRENCY);
+                    s.add64(kIssuedCurrency);
                 }
                 else if (isNegative_)  // 512 = not native
                 {
@@ -910,11 +909,11 @@ STAmount::canonicalize()
             {
                 // N.B. do not move the overflow check to after the
                 // multiplication
-                if (native() && value_ > kMAX_NATIVE_N)
+                if (native() && value_ > kMaxNativeN)
                 {
                     Throw<std::runtime_error>("Native currency amount out of range");
                 }
-                else if (!native() && value_ > kMAX_MP_TOKEN_AMOUNT)
+                else if (!native() && value_ > kMaxMpTokenAmount)
                 {
                     Throw<std::runtime_error>("MPT amount out of range");
                 }
@@ -924,11 +923,11 @@ STAmount::canonicalize()
             }
         }
 
-        if (native() && value_ > kMAX_NATIVE_N)
+        if (native() && value_ > kMaxNativeN)
         {
             Throw<std::runtime_error>("Native currency amount out of range");
         }
-        else if (!native() && value_ > kMAX_MP_TOKEN_AMOUNT)
+        else if (!native() && value_ > kMaxMpTokenAmount)
         {
             Throw<std::runtime_error>("MPT amount out of range");
         }
@@ -949,22 +948,22 @@ STAmount::canonicalize()
         return;
     }
 
-    while ((value_ < kMIN_VALUE) && (offset_ > kMIN_OFFSET))
+    while ((value_ < kMinValue) && (offset_ > kMinOffset))
     {
         value_ *= 10;
         --offset_;
     }
 
-    while (value_ > kMAX_VALUE)
+    while (value_ > kMaxValue)
     {
-        if (offset_ >= kMAX_OFFSET)
+        if (offset_ >= kMaxOffset)
             Throw<std::runtime_error>("value overflow");
 
         value_ /= 10;
         ++offset_;
     }
 
-    if ((offset_ < kMIN_OFFSET) || (value_ < kMIN_VALUE))
+    if ((offset_ < kMinOffset) || (value_ < kMinValue))
     {
         value_ = 0;
         isNegative_ = false;
@@ -972,14 +971,14 @@ STAmount::canonicalize()
         return;
     }
 
-    if (offset_ > kMAX_OFFSET)
+    if (offset_ > kMaxOffset)
         Throw<std::runtime_error>("value overflow");
 
     XRPL_ASSERT(
-        (value_ == 0) || ((value_ >= kMIN_VALUE) && (value_ <= kMAX_VALUE)),
+        (value_ == 0) || ((value_ >= kMinValue) && (value_ <= kMaxValue)),
         "xrpl::STAmount::canonicalize : value inside range");
     XRPL_ASSERT(
-        (value_ == 0) || ((offset_ >= kMIN_OFFSET) && (offset_ <= kMAX_OFFSET)),
+        (value_ == 0) || ((offset_ >= kMinOffset) && (offset_ <= kMaxOffset)),
         "xrpl::STAmount::canonicalize : offset inside range");
     XRPL_ASSERT(
         (value_ != 0) || (offset_ != -100), "xrpl::STAmount::canonicalize : value or offset set");
@@ -1152,7 +1151,7 @@ amountFromJsonNoThrow(STAmount& result, json::Value const& jvSource)
 {
     try
     {
-        result = amountFromJson(kSF_GENERIC, jvSource);
+        result = amountFromJson(kSfGeneric, jvSource);
         return true;
     }
     catch (std::exception const& e)
@@ -1275,10 +1274,10 @@ muldivRound(
 STAmount
 divide(STAmount const& num, STAmount const& den, Asset const& asset)
 {
-    if (den == beast::kZERO)
+    if (den == beast::kZero)
         Throw<std::runtime_error>("division by zero");
 
-    if (num == beast::kZERO)
+    if (num == beast::kZero)
         return {asset};
 
     std::uint64_t numVal = num.mantissa();
@@ -1288,7 +1287,7 @@ divide(STAmount const& num, STAmount const& den, Asset const& asset)
 
     if (num.integral())
     {
-        while (numVal < STAmount::kMIN_VALUE)
+        while (numVal < STAmount::kMinValue)
         {
             // Need to bring into range
             numVal *= 10;
@@ -1298,7 +1297,7 @@ divide(STAmount const& num, STAmount const& den, Asset const& asset)
 
     if (den.integral())
     {
-        while (denVal < STAmount::kMIN_VALUE)
+        while (denVal < STAmount::kMinValue)
         {
             denVal *= 10;
             --denOffset;
@@ -1312,7 +1311,7 @@ divide(STAmount const& num, STAmount const& den, Asset const& asset)
     // is in the range of 10^16 to 10^15.
     return STAmount(
         asset,
-        muldiv(numVal, kTEN_TO17, denVal) + 5,
+        muldiv(numVal, kTenTO17, denVal) + 5,
         numOffset - denOffset - 17,
         num.negative() != den.negative());
 }
@@ -1320,7 +1319,7 @@ divide(STAmount const& num, STAmount const& den, Asset const& asset)
 STAmount
 multiply(STAmount const& v1, STAmount const& v2, Asset const& asset)
 {
-    if (v1 == beast::kZERO || v2 == beast::kZERO)
+    if (v1 == beast::kZero || v2 == beast::kZero)
         return STAmount(asset);
 
     if (v1.native() && v2.native() && asset.native())
@@ -1363,7 +1362,7 @@ multiply(STAmount const& v1, STAmount const& v2, Asset const& asset)
 
     if (v1.integral())
     {
-        while (value1 < STAmount::kMIN_VALUE)
+        while (value1 < STAmount::kMinValue)
         {
             value1 *= 10;
             --offset1;
@@ -1372,7 +1371,7 @@ multiply(STAmount const& v1, STAmount const& v2, Asset const& asset)
 
     if (v2.integral())
     {
-        while (value2 < STAmount::kMIN_VALUE)
+        while (value2 < STAmount::kMinValue)
         {
             value2 *= 10;
             --offset2;
@@ -1385,7 +1384,7 @@ multiply(STAmount const& v1, STAmount const& v2, Asset const& asset)
     // precision, by scaling the result to 10^16 to 10^18.
     return STAmount(
         asset,
-        muldiv(value1, value2, kTEN_TO14) + 7,
+        muldiv(value1, value2, kTenTO14) + 7,
         offset1 + offset2 + 14,
         v1.negative() != v2.negative());
 }
@@ -1431,9 +1430,9 @@ canonicalizeRound(bool integral, std::uint64_t& value, int& offset, bool)
             ++offset;
         }
     }
-    else if (value > STAmount::kMAX_VALUE)
+    else if (value > STAmount::kMaxValue)
     {
-        while (value > (10 * STAmount::kMAX_VALUE))
+        while (value > (10 * STAmount::kMaxValue))
         {
             value /= 10;
             ++offset;
@@ -1473,9 +1472,9 @@ canonicalizeRoundStrict(bool integral, std::uint64_t& value, int& offset, bool r
             ++offset;
         }
     }
-    else if (value > STAmount::kMAX_VALUE)
+    else if (value > STAmount::kMaxValue)
     {
-        while (value > (10 * STAmount::kMAX_VALUE))
+        while (value > (10 * STAmount::kMaxValue))
         {
             value /= 10;
             ++offset;
@@ -1494,7 +1493,7 @@ roundToScale(STAmount const& value, std::int32_t scale, Number::RoundingMode rou
         return value;
 
     // Nothing to do for zero.
-    if (value == beast::kZERO)
+    if (value == beast::kZero)
         return value;
 
     // If the value's exponent is greater than or equal to the scale, then
@@ -1503,7 +1502,7 @@ roundToScale(STAmount const& value, std::int32_t scale, Number::RoundingMode rou
     if (value.exponent() >= scale)
         return value;
 
-    STAmount const referenceValue{value.asset(), STAmount::kMIN_VALUE, scale, value.negative()};
+    STAmount const referenceValue{value.asset(), STAmount::kMinValue, scale, value.negative()};
 
     NumberRoundModeGuard const mg(rounding);
     // With an IOU, the the result of addition will be truncated to the
@@ -1540,7 +1539,7 @@ template <void (*CanonicalizeFunc)(bool, std::uint64_t&, int&, bool), typename M
 static STAmount
 mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool roundUp)
 {
-    if (v1 == beast::kZERO || v2 == beast::kZERO)
+    if (v1 == beast::kZero || v2 == beast::kZero)
         return {asset};
 
     if (v1.native() && v2.native() && asset.native())
@@ -1576,7 +1575,7 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
 
     if (v1.integral())
     {
-        while (value1 < STAmount::kMIN_VALUE)
+        while (value1 < STAmount::kMinValue)
         {
             value1 *= 10;
             --offset1;
@@ -1585,7 +1584,7 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
 
     if (v2.integral())
     {
-        while (value2 < STAmount::kMIN_VALUE)
+        while (value2 < STAmount::kMinValue)
         {
             value2 *= 10;
             --offset2;
@@ -1603,7 +1602,7 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
     // from zero, and if we're rounding down, truncation
     // is implicit.
     std::uint64_t amount =
-        muldivRound(value1, value2, kTEN_TO14, (resultNegative != roundUp) ? kTEN_TO14M1 : 0);
+        muldivRound(value1, value2, kTenTO14, (resultNegative != roundUp) ? kTenTO14M1 : 0);
 
     int offset = offset1 + offset2 + 14;
     if (resultNegative != roundUp)
@@ -1628,8 +1627,8 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
         else
         {
             // return the smallest value above zero
-            amount = STAmount::kMIN_VALUE;
-            offset = STAmount::kMIN_OFFSET;
+            amount = STAmount::kMinValue;
+            offset = STAmount::kMinOffset;
         }
         return STAmount(asset, amount, offset, resultNegative);
     }
@@ -1654,10 +1653,10 @@ template <typename MightSaveRound>
 static STAmount
 divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool roundUp)
 {
-    if (den == beast::kZERO)
+    if (den == beast::kZero)
         Throw<std::runtime_error>("division by zero");
 
-    if (num == beast::kZERO)
+    if (num == beast::kZero)
         return {asset};
 
     std::uint64_t numVal = num.mantissa(), denVal = den.mantissa();
@@ -1665,7 +1664,7 @@ divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool
 
     if (num.integral())
     {
-        while (numVal < STAmount::kMIN_VALUE)
+        while (numVal < STAmount::kMinValue)
         {
             numVal *= 10;
             --numOffset;
@@ -1674,7 +1673,7 @@ divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool
 
     if (den.integral())
     {
-        while (denVal < STAmount::kMIN_VALUE)
+        while (denVal < STAmount::kMinValue)
         {
             denVal *= 10;
             --denOffset;
@@ -1692,7 +1691,7 @@ divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool
     // We round away from zero if we're rounding up or
     // truncate if we're rounding down.
     std::uint64_t amount =
-        muldivRound(numVal, kTEN_TO17, denVal, (resultNegative != roundUp) ? denVal - 1 : 0);
+        muldivRound(numVal, kTenTO17, denVal, (resultNegative != roundUp) ? denVal - 1 : 0);
 
     int offset = numOffset - denOffset - 17;
 
@@ -1719,8 +1718,8 @@ divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool
         else
         {
             // return the smallest value above zero
-            amount = STAmount::kMIN_VALUE;
-            offset = STAmount::kMIN_OFFSET;
+            amount = STAmount::kMinValue;
+            offset = STAmount::kMinOffset;
         }
         return STAmount(asset, amount, offset, resultNegative);
     }
diff --git a/src/libxrpl/protocol/STBase.cpp b/src/libxrpl/protocol/STBase.cpp
index ec6131482f..d1ae1e5aa8 100644
--- a/src/libxrpl/protocol/STBase.cpp
+++ b/src/libxrpl/protocol/STBase.cpp
@@ -12,7 +12,7 @@
 
 namespace xrpl {
 
-STBase::STBase() : fName_(&kSF_GENERIC)
+STBase::STBase() : fName_(&kSfGeneric)
 {
 }
 
diff --git a/src/libxrpl/protocol/STInteger.cpp b/src/libxrpl/protocol/STInteger.cpp
index 51af029011..5f3fb6ffa4 100644
--- a/src/libxrpl/protocol/STInteger.cpp
+++ b/src/libxrpl/protocol/STInteger.cpp
@@ -209,7 +209,7 @@ STUInt64::getJson(JsonOptions) const
         return str;
     };
 
-    if (auto const& fName = getFName(); fName.shouldMeta(SField::kSMD_BASE_TEN))
+    if (auto const& fName = getFName(); fName.shouldMeta(SField::kSmdBaseTen))
     {
         return convertToString(value_, 10);  // Convert to base 10
     }
diff --git a/src/libxrpl/protocol/STLedgerEntry.cpp b/src/libxrpl/protocol/STLedgerEntry.cpp
index 8bec23d319..8c5c5b5eae 100644
--- a/src/libxrpl/protocol/STLedgerEntry.cpp
+++ b/src/libxrpl/protocol/STLedgerEntry.cpp
@@ -133,13 +133,12 @@ STLedgerEntry::getJson(JsonOptions options) const
 bool
 STLedgerEntry::isThreadedType(Rules const& rules) const
 {
-    static constexpr std::array<LedgerEntryType, 5> kNEW_PREVIOUS_TXN_ID_TYPES = {
+    static constexpr std::array<LedgerEntryType, 5> kNewPreviousTxnIdTypes = {
         ltDIR_NODE, ltAMENDMENTS, ltFEE_SETTINGS, ltNEGATIVE_UNL, ltAMM};
     // Exclude PrevTxnID/PrevTxnLgrSeq if the fixPreviousTxnID amendment is not
     // enabled and the ledger object type is in the above set
     bool const excludePrevTxnID = !rules.enabled(fixPreviousTxnID) &&
-        (std::count(
-             kNEW_PREVIOUS_TXN_ID_TYPES.cbegin(), kNEW_PREVIOUS_TXN_ID_TYPES.cend(), type_) != 0);
+        (std::count(kNewPreviousTxnIdTypes.cbegin(), kNewPreviousTxnIdTypes.cend(), type_) != 0);
     return !excludePrevTxnID && getFieldIndex(sfPreviousTxnID) != -1;
 }
 
diff --git a/src/libxrpl/protocol/STNumber.cpp b/src/libxrpl/protocol/STNumber.cpp
index 3bbd28e8f6..aa3e83515c 100644
--- a/src/libxrpl/protocol/STNumber.cpp
+++ b/src/libxrpl/protocol/STNumber.cpp
@@ -58,7 +58,7 @@ STNumber::associateAsset(Asset const& a)
     STTakesAsset::associateAsset(a);
 
     XRPL_ASSERT_PARTS(
-        getFName().shouldMeta(SField::kSMD_NEEDS_ASSET),
+        getFName().shouldMeta(SField::kSmdNeedsAsset),
         "STNumber::associateAsset",
         "field needs asset");
 
@@ -76,7 +76,7 @@ STNumber::add(Serializer& s) const
     auto const exponent = value.exponent();
 
     SField const& field = getFName();
-    if (field.shouldMeta(SField::kSMD_NEEDS_ASSET))
+    if (field.shouldMeta(SField::kSmdNeedsAsset))
     {
         // asset is defined in the STTakesAsset base class
         if (asset_)
@@ -160,7 +160,7 @@ operator<<(std::ostream& out, STNumber const& rhs)
 NumberParts
 partsFromString(std::string const& number)
 {
-    static boost::regex const kRE_NUMBER(
+    static boost::regex const kReNumber(
         "^"                       // the beginning of the string
         "([-+]?)"                 // (optional) + or - character
         "(0|[1-9][0-9]*)"         // a number (no leading zeroes, unless 0)
@@ -171,7 +171,7 @@ partsFromString(std::string const& number)
 
     boost::smatch match;
 
-    if (!boost::regex_match(number, match, kRE_NUMBER))
+    if (!boost::regex_match(number, match, kReNumber))
         Throw<std::runtime_error>("'" + number + "' is not a number");
 
     // Match fields:
diff --git a/src/libxrpl/protocol/STObject.cpp b/src/libxrpl/protocol/STObject.cpp
index ec44250bed..e16cbc871f 100644
--- a/src/libxrpl/protocol/STObject.cpp
+++ b/src/libxrpl/protocol/STObject.cpp
@@ -646,22 +646,22 @@ STObject::getFieldVL(SField const& field) const
 STAmount const&
 STObject::getFieldAmount(SField const& field) const
 {
-    static STAmount const kEMPTY{};
-    return getFieldByConstRef<STAmount>(field, kEMPTY);
+    static STAmount const kEmpty{};
+    return getFieldByConstRef<STAmount>(field, kEmpty);
 }
 
 STPathSet const&
 STObject::getFieldPathSet(SField const& field) const
 {
-    static STPathSet const kEMPTY{};
-    return getFieldByConstRef<STPathSet>(field, kEMPTY);
+    static STPathSet const kEmpty{};
+    return getFieldByConstRef<STPathSet>(field, kEmpty);
 }
 
 STVector256 const&
 STObject::getFieldV256(SField const& field) const
 {
-    static STVector256 const kEMPTY{};
-    return getFieldByConstRef<STVector256>(field, kEMPTY);
+    static STVector256 const kEmpty{};
+    return getFieldByConstRef<STVector256>(field, kEmpty);
 }
 
 STObject
@@ -677,22 +677,22 @@ STObject::getFieldObject(SField const& field) const
 STArray const&
 STObject::getFieldArray(SField const& field) const
 {
-    static STArray const kEMPTY{};
-    return getFieldByConstRef<STArray>(field, kEMPTY);
+    static STArray const kEmpty{};
+    return getFieldByConstRef<STArray>(field, kEmpty);
 }
 
 STCurrency const&
 STObject::getFieldCurrency(SField const& field) const
 {
-    static STCurrency const kEMPTY{};
-    return getFieldByConstRef<STCurrency>(field, kEMPTY);
+    static STCurrency const kEmpty{};
+    return getFieldByConstRef<STCurrency>(field, kEmpty);
 }
 
 STNumber const&
 STObject::getFieldNumber(SField const& field) const
 {
-    static STNumber const kEMPTY{};
-    return getFieldByConstRef<STNumber>(field, kEMPTY);
+    static STNumber const kEmpty{};
+    return getFieldByConstRef<STNumber>(field, kEmpty);
 }
 
 void
diff --git a/src/libxrpl/protocol/STParsedJSON.cpp b/src/libxrpl/protocol/STParsedJSON.cpp
index c6d1d0e805..7b9989afac 100644
--- a/src/libxrpl/protocol/STParsedJSON.cpp
+++ b/src/libxrpl/protocol/STParsedJSON.cpp
@@ -142,7 +142,7 @@ arrayTooBig(std::string const& object, std::string const& field)
     return RPC::makeError(
         RpcInvalidParams,
         "Field '" + makeName(object, field) + "' exceeds allowed JSON array size of " +
-            std::to_string(kMAX_PARSED_JSON_ARRAY_SIZE) + " elements per field.");
+            std::to_string(kMaxParsedJsonArraySize) + " elements per field.");
 }
 
 static inline json::Value
@@ -258,7 +258,7 @@ parseUInt16(
                         safeCast<typename STResult::value_type>(static_cast<Integer>(
                             TxFormats::getInstance().findTypeByName(strValue))));
 
-                    if (*name == kSF_GENERIC)
+                    if (*name == kSfGeneric)
                         name = &sfTransaction;
                 }
                 else if (field == sfLedgerEntryType)
@@ -268,7 +268,7 @@ parseUInt16(
                         safeCast<typename STResult::value_type>(static_cast<Integer>(
                             LedgerFormats::getInstance().findTypeByName(strValue))));
 
-                    if (*name == kSF_GENERIC)
+                    if (*name == kSfGeneric)
                         name = &sfLedgerEntry;
                 }
                 else
@@ -361,7 +361,7 @@ parseLeaf(
     auto const& field = SField::getField(fieldName);
 
     // checked in parseObject
-    if (field == kSF_INVALID)
+    if (field == kSfInvalid)
     {
         // LCOV_EXCL_START
         error = unknownField(jsonName, fieldName);
@@ -374,8 +374,8 @@ parseLeaf(
         case STI_UINT8:
             try
             {
-                constexpr auto kMIN_VALUE = std::numeric_limits<std::uint8_t>::min();
-                constexpr auto kMAX_VALUE = std::numeric_limits<std::uint8_t>::max();
+                constexpr auto kMinValue = std::numeric_limits<std::uint8_t>::min();
+                constexpr auto kMaxValue = std::numeric_limits<std::uint8_t>::max();
                 if (value.isString())
                 {
                     std::string const strValue = value.asString();
@@ -386,7 +386,7 @@ parseLeaf(
                         {
                             auto ter = transCode(strValue);
 
-                            if (!ter || TERtoInt(*ter) < kMIN_VALUE || TERtoInt(*ter) > kMAX_VALUE)
+                            if (!ter || TERtoInt(*ter) < kMinValue || TERtoInt(*ter) > kMaxValue)
                             {
                                 error = outOfRange(jsonName, fieldName);
                                 return ret;
@@ -409,7 +409,7 @@ parseLeaf(
                 }
                 else if (value.isInt())
                 {
-                    if (value.asInt() < kMIN_VALUE || value.asInt() > kMAX_VALUE)
+                    if (value.asInt() < kMinValue || value.asInt() > kMaxValue)
                     {
                         error = outOfRange(jsonName, fieldName);
                         return ret;
@@ -420,7 +420,7 @@ parseLeaf(
                 }
                 else if (value.isUInt())
                 {
-                    if (value.asUInt() > kMAX_VALUE)
+                    if (value.asUInt() > kMaxValue)
                     {
                         error = outOfRange(jsonName, fieldName);
                         return ret;
@@ -465,7 +465,7 @@ parseLeaf(
 
                     std::uint64_t val = 0;
 
-                    bool const useBase10 = field.shouldMeta(SField::kSMD_BASE_TEN);
+                    bool const useBase10 = field.shouldMeta(SField::kSmdBaseTen);
 
                     // if the field is amount, serialize as base 10
                     auto [p, ec] = std::from_chars(
@@ -696,7 +696,7 @@ parseLeaf(
                 return ret;
             }
 
-            if (not value.isNull() and value.size() > kMAX_PARSED_JSON_ARRAY_SIZE)
+            if (not value.isNull() and value.size() > kMaxParsedJsonArraySize)
             {
                 error = arrayTooBig(jsonName, fieldName);
                 return ret;
@@ -729,7 +729,7 @@ parseLeaf(
                 return ret;
             }
 
-            if (not value.isNull() and value.size() > kMAX_PARSED_JSON_ARRAY_SIZE)
+            if (not value.isNull() and value.size() > kMaxParsedJsonArraySize)
             {
                 error = arrayTooBig(jsonName, fieldName);
                 return ret;
@@ -751,7 +751,7 @@ parseLeaf(
                         return ret;
                     }
 
-                    if (not value[i].isNull() and value[i].size() > kMAX_PARSED_JSON_ARRAY_SIZE)
+                    if (not value[i].isNull() and value[i].size() > kMaxParsedJsonArraySize)
                     {
                         std::stringstream ss;
                         ss << fieldName << "[" << i << "]";
@@ -839,7 +839,7 @@ parseLeaf(
                                     error = invalidData(elementName, assetName.cStr());
                                     return ret;
                                 }
-                                if (getMPTIssuer(u) == beast::kZERO)
+                                if (getMPTIssuer(u) == beast::kZero)
                                 {
                                     error = invalidData(elementName, jss::account.cStr());
                                     return ret;
@@ -998,7 +998,7 @@ parseObject(
         return std::nullopt;
     }
 
-    if (depth > kMAX_PARSED_JSON_DEPTH)
+    if (depth > kMaxParsedJsonDepth)
     {
         error = tooDeep(jsonName);
         return std::nullopt;
@@ -1013,7 +1013,7 @@ parseObject(
             json::Value const& value = json[fieldName];
             auto const& field = SField::getField(fieldName);
 
-            if (field == kSF_INVALID)
+            if (field == kSfInvalid)
             {
                 error = unknownField(jsonName, fieldName);
                 return std::nullopt;
@@ -1111,13 +1111,13 @@ parseArray(
         return std::nullopt;
     }
 
-    if (depth > kMAX_PARSED_JSON_DEPTH)
+    if (depth > kMaxParsedJsonDepth)
     {
         error = tooDeep(jsonName);
         return std::nullopt;
     }
 
-    if (not json.isNull() and json.size() > kMAX_PARSED_JSON_ARRAY_SIZE)
+    if (not json.isNull() and json.size() > kMaxParsedJsonArraySize)
     {
         error = arrayTooBig(jsonName, "");
         return std::nullopt;
@@ -1144,7 +1144,7 @@ parseArray(
             std::string const memberName(json[i].getMemberNames()[0]);
             auto const& nameField(SField::getField(memberName));
 
-            if (nameField == kSF_INVALID)
+            if (nameField == kSfInvalid)
             {
                 error = unknownField(jsonName, memberName);
                 return std::nullopt;
@@ -1189,7 +1189,7 @@ parseArray(
 STParsedJSONObject::STParsedJSONObject(std::string const& name, json::Value const& json)
 {
     using namespace STParsedJSONDetail;
-    object = parseObject(name, json, kSF_GENERIC, 0, error);
+    object = parseObject(name, json, kSfGeneric, 0, error);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/STTakesAsset.cpp b/src/libxrpl/protocol/STTakesAsset.cpp
index 1fe01b1e84..806861e6b6 100644
--- a/src/libxrpl/protocol/STTakesAsset.cpp
+++ b/src/libxrpl/protocol/STTakesAsset.cpp
@@ -17,7 +17,7 @@ associateAsset(SLE& sle, Asset const& asset)
     {
         STBase& entry = sle.getIndex(i);
         SField const& field = entry.getFName();
-        if (field.shouldMeta(SField::kSMD_NEEDS_ASSET))
+        if (field.shouldMeta(SField::kSmdNeedsAsset))
         {
             auto const type = entry.getSType();
             // If the field is not set or present, skip it.
diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp
index 06731e9072..878aa296dd 100644
--- a/src/libxrpl/protocol/STTx.cpp
+++ b/src/libxrpl/protocol/STTx.cpp
@@ -78,7 +78,7 @@ STTx::STTx(SerialIter& sit) : STObject(sfTransaction)
 {
     int const length = sit.getBytesLeft();
 
-    if ((length < kTX_MIN_SIZE_BYTES) || (length > kTX_MAX_SIZE_BYTES))
+    if ((length < kTxMinSizeBytes) || (length > kTxMaxSizeBytes))
         Throw<std::runtime_error>("Transaction length invalid");
 
     if (set(sit))
@@ -352,13 +352,13 @@ STTx::getJson(JsonOptions options, bool binary) const
 std::string const&
 STTx::getMetaSQLInsertReplaceHeader()
 {
-    static std::string const kSQL =
+    static std::string const kSql =
         "INSERT OR REPLACE INTO Transactions "
         "(TransID, TransType, FromAcct, FromSeq, LedgerSeq, Status, RawTxn, "
         "TxnMeta)"
         " VALUES ";
 
-    return kSQL;
+    return kSql;
 }
 
 std::string
@@ -377,14 +377,14 @@ STTx::getMetaSQL(
     TxnSql status,
     std::string const& escapedMetaData) const
 {
-    static boost::format const kBF_TRANS("('%s', '%s', '%s', '%d', '%d', '%c', %s, %s)");
+    static boost::format const kBfTrans("('%s', '%s', '%s', '%d', '%d', '%c', %s, %s)");
     std::string rTxn = sqlBlobLiteral(rawTxn.peekData());
 
     auto format = TxFormats::getInstance().findByType(tx_type_);
     XRPL_ASSERT(format, "xrpl::STTx::getMetaSQL : non-null type format");
 
     return str(
-        boost::format(kBF_TRANS) % to_string(getTransactionID()) % format->getName() %
+        boost::format(kBfTrans) % to_string(getTransactionID()) % format->getName() %
         toBase58(getAccountID(sfAccount)) % getFieldU32(sfSequence) % inLedger %
         safeCast<char>(status) % rTxn % escapedMetaData);
 }
@@ -454,11 +454,11 @@ multiSignHelper(
     STArray const& signers{sigObject.getFieldArray(sfSigners)};
 
     // There are well known bounds that the number of signers must be within.
-    if (signers.size() < STTx::kMIN_MULTI_SIGNERS || signers.size() > STTx::kMAX_MULTI_SIGNERS)
+    if (signers.size() < STTx::kMinMultiSigners || signers.size() > STTx::kMaxMultiSigners)
         return Unexpected("Invalid Signers array size.");
 
     // Signers must be in sorted order by AccountID.
-    AccountID lastAccountID(beast::kZERO);
+    AccountID lastAccountID(beast::kZero);
 
     for (auto const& signer : signers)
     {
@@ -652,7 +652,7 @@ isMemoOkay(STObject const& st, std::string& reason)
             // The only allowed characters for MemoType and MemoFormat are the
             // characters allowed in URLs per RFC 3986: alphanumerics and the
             // following symbols: -._~:/?#[]@!$&'()*+,;=%
-            static constexpr std::array<char, 256> const kALLOWED_SYMBOLS = []() {
+            static constexpr std::array<char, 256> const kAllowedSymbols = []() {
                 std::array<char, 256> a{};
 
                 std::string_view const symbols(
@@ -668,7 +668,7 @@ isMemoOkay(STObject const& st, std::string& reason)
 
             for (unsigned char const c : *optData)
             {
-                if (kALLOWED_SYMBOLS[c] == 0)
+                if (kAllowedSymbols[c] == 0)
                 {
                     reason =
                         "The MemoType and MemoFormat fields may only "
@@ -731,14 +731,14 @@ isRawTransactionOkay(STObject const& st, std::string& reason)
         return true;
 
     if (st.isFieldPresent(sfBatchSigners) &&
-        st.getFieldArray(sfBatchSigners).size() > kMAX_BATCH_TX_COUNT)
+        st.getFieldArray(sfBatchSigners).size() > kMaxBatchTxCount)
     {
         reason = "Batch Signers array exceeds max entries.";
         return false;
     }
 
     auto const& rawTxns = st.getFieldArray(sfRawTransactions);
-    if (rawTxns.size() > kMAX_BATCH_TX_COUNT)
+    if (rawTxns.size() > kMaxBatchTxCount)
     {
         reason = "Raw Transactions array exceeds max entries.";
         return false;
diff --git a/src/libxrpl/protocol/STValidation.cpp b/src/libxrpl/protocol/STValidation.cpp
index dd4b8a0fee..5eafb407ec 100644
--- a/src/libxrpl/protocol/STValidation.cpp
+++ b/src/libxrpl/protocol/STValidation.cpp
@@ -38,7 +38,7 @@ STValidation::validationFormat()
     // it relies on the SField's below being initialized, and we can't
     // guarantee the initialization order.
     // clang-format off
-    static SOTemplate const kFORMAT{
+    static SOTemplate const kFormat{
         {sfFlags,               SoeRequired},
         {sfLedgerHash,          SoeRequired},
         {sfLedgerSequence,      SoeRequired},
@@ -62,7 +62,7 @@ STValidation::validationFormat()
     };
     // clang-format on
 
-    return kFORMAT;
+    return kFormat;
 };
 
 uint256
@@ -108,7 +108,7 @@ STValidation::isValid() const noexcept
             getSignerPublic(),
             getSigningHash(),
             makeSlice(getFieldVL(sfSignature)),
-            (getFlags() & kVF_FULLY_CANONICAL_SIG) != 0u);
+            (getFlags() & kVfFullyCanonicalSig) != 0u);
     }
 
     return valid_.value();
@@ -117,7 +117,7 @@ STValidation::isValid() const noexcept
 bool
 STValidation::isFull() const noexcept
 {
-    return (getFlags() & kVF_FULL_VALIDATION) != 0;
+    return (getFlags() & kVfFullValidation) != 0;
 }
 
 Blob
diff --git a/src/libxrpl/protocol/STVar.cpp b/src/libxrpl/protocol/STVar.cpp
index 8e45d3c75b..3d123e6a0e 100644
--- a/src/libxrpl/protocol/STVar.cpp
+++ b/src/libxrpl/protocol/STVar.cpp
@@ -38,7 +38,7 @@ STVar::~STVar()
 STVar::STVar(STVar const& other)
 {
     if (other.p_ != nullptr)
-        p_ = other.p_->copy(kMAX_SIZE, &d_);
+        p_ = other.p_->copy(kMaxSize, &d_);
 }
 
 STVar::STVar(STVar&& other)
@@ -50,7 +50,7 @@ STVar::STVar(STVar&& other)
     }
     else
     {
-        p_ = other.p_->move(kMAX_SIZE, &d_);
+        p_ = other.p_->move(kMaxSize, &d_);
     }
 }
 
@@ -62,7 +62,7 @@ STVar::operator=(STVar const& rhs)
         destroy();
         if (rhs.p_ != nullptr)
         {
-            p_ = rhs.p_->copy(kMAX_SIZE, &d_);
+            p_ = rhs.p_->copy(kMaxSize, &d_);
         }
         else
         {
@@ -86,7 +86,7 @@ STVar::operator=(STVar&& rhs)
         }
         else
         {
-            p_ = rhs.p_->move(kMAX_SIZE, &d_);
+            p_ = rhs.p_->move(kMaxSize, &d_);
         }
     }
 
@@ -149,9 +149,9 @@ STVar::constructST(SerializedTypeID id, int depth, Args&&... args)
         }
         else
         {
-            constexpr bool kALWAYS_FALSE =
+            static constexpr bool kAlwaysFalse =
                 !std::is_same_v<std::tuple<Args...>, std::tuple<Args...>>;
-            static_assert(kALWAYS_FALSE, "Invalid STVar constructor arguments");
+            static_assert(kAlwaysFalse, "Invalid STVar constructor arguments");
         }
     };
 
diff --git a/src/libxrpl/protocol/STXChainBridge.cpp b/src/libxrpl/protocol/STXChainBridge.cpp
index 97b46852fd..ce6ad2368a 100644
--- a/src/libxrpl/protocol/STXChainBridge.cpp
+++ b/src/libxrpl/protocol/STXChainBridge.cpp
@@ -64,12 +64,12 @@ STXChainBridge::STXChainBridge(SField const& name, json::Value const& v) : STBas
     }
 
     auto checkExtra = [](json::Value const& v) {
-        static auto const kBRIDGE_JSON =
+        static auto const kBridgeJson =
             xrpl::STXChainBridge().getJson(xrpl::JsonOptions::Values::None);
         for (auto it = v.begin(); it != v.end(); ++it)
         {
             std::string const name = it.memberName();
-            if (!kBRIDGE_JSON.isMember(name))
+            if (!kBridgeJson.isMember(name))
             {
                 Throw<std::runtime_error>("STXChainBridge extra field detected: " + name);
             }
diff --git a/src/libxrpl/protocol/TER.cpp b/src/libxrpl/protocol/TER.cpp
index 3654547dd2..6b8dfc6811 100644
--- a/src/libxrpl/protocol/TER.cpp
+++ b/src/libxrpl/protocol/TER.cpp
@@ -22,7 +22,7 @@ transResults()
     static
     std::unordered_map<
             TERUnderlyingType,
-            std::pair<char const* const, char const* const>> const kRESULTS
+            std::pair<char const* const, char const* const>> const kResults
     {
         MAKE_ERROR(tecAMM_BALANCE,                   "AMM has invalid balance."),
         MAKE_ERROR(tecAMM_INVALID_TOKENS,            "AMM invalid LP tokens."),
@@ -223,7 +223,7 @@ transResults()
 
 #undef MAKE_ERROR
 
-    return kRESULTS;
+    return kResults;
 }
 
 bool
@@ -262,7 +262,7 @@ transHuman(TER code)
 std::optional<TER>
 transCode(std::string const& token)
 {
-    static auto const kRESULTS = [] {
+    static auto const kResults = [] {
         auto& byTer = transResults();
         auto range = boost::make_iterator_range(byTer.begin(), byTer.end());
         auto tRange = boost::adaptors::transform(
@@ -272,9 +272,9 @@ transCode(std::string const& token)
         return byToken;
     }();
 
-    auto const r = kRESULTS.find(token);
+    auto const r = kResults.find(token);
 
-    if (r == kRESULTS.end())
+    if (r == kResults.end())
         return std::nullopt;
 
     return TER::fromInt(r->second);
diff --git a/src/libxrpl/protocol/TxFormats.cpp b/src/libxrpl/protocol/TxFormats.cpp
index 083889622c..b926bdf0e5 100644
--- a/src/libxrpl/protocol/TxFormats.cpp
+++ b/src/libxrpl/protocol/TxFormats.cpp
@@ -12,7 +12,7 @@ namespace xrpl {
 std::vector<SOElement> const&
 TxFormats::getCommonFields()
 {
-    static auto const kCOMMON_FIELDS = std::vector<SOElement>{
+    static auto const kCommonFields = std::vector<SOElement>{
         {sfTransactionType, SoeRequired},
         {sfFlags, SoeOptional},
         {sfSourceTag, SoeOptional},
@@ -31,7 +31,7 @@ TxFormats::getCommonFields()
         {sfNetworkID, SoeOptional},
         {sfDelegate, SoeOptional},
     };
-    return kCOMMON_FIELDS;
+    return kCommonFields;
 }
 
 TxFormats::TxFormats()
@@ -56,8 +56,8 @@ TxFormats::TxFormats()
 TxFormats const&
 TxFormats::getInstance()
 {
-    static TxFormats const kINSTANCE;
-    return kINSTANCE;
+    static TxFormats const kInstance;
+    return kInstance;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/UintTypes.cpp b/src/libxrpl/protocol/UintTypes.cpp
index adef5e2c14..486c11ba45 100644
--- a/src/libxrpl/protocol/UintTypes.cpp
+++ b/src/libxrpl/protocol/UintTypes.cpp
@@ -18,41 +18,41 @@ namespace detail {
 
 // Characters we are willing to allow in the ASCII representation of a
 // three-letter currency code.
-constexpr std::string_view kISO_CHAR_SET =
+constexpr std::string_view kIsoCharSet =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "0123456789"
     "<>(){}[]|?!@#$%^&*";
 
 // The location (in bytes) of the 3 digit currency inside a 160-bit value
-constexpr std::size_t kISO_CODE_OFFSET = 12;
+constexpr std::size_t kIsoCodeOffset = 12;
 
 // The length of an ISO-4217 like code
-constexpr std::size_t kISO_CODE_LENGTH = 3;
+constexpr std::size_t kIsoCodeLength = 3;
 
 }  // namespace detail
 
 std::string
 to_string(Currency const& currency)
 {
-    if (currency == beast::kZERO)
+    if (currency == beast::kZero)
         return systemCurrencyCode();
 
     if (currency == noCurrency())
         return "1";
 
-    static constexpr Currency kS_ISO_BITS("FFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF");
+    static constexpr Currency kSIsoBits("FFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF");
 
-    if ((currency & kS_ISO_BITS).isZero())
+    if ((currency & kSIsoBits).isZero())
     {
         std::string const iso(
-            currency.data() + detail::kISO_CODE_OFFSET,
-            currency.data() + detail::kISO_CODE_OFFSET + detail::kISO_CODE_LENGTH);
+            currency.data() + detail::kIsoCodeOffset,
+            currency.data() + detail::kIsoCodeOffset + detail::kIsoCodeLength);
 
         // Specifying the system currency code using ISO-style representation
         // is not allowed.
         if ((iso != systemCurrencyCode()) &&
-            (iso.find_first_not_of(detail::kISO_CHAR_SET) == std::string::npos))
+            (iso.find_first_not_of(detail::kIsoCharSet) == std::string::npos))
         {
             return iso;
         }
@@ -66,19 +66,19 @@ toCurrency(Currency& currency, std::string const& code)
 {
     if (code.empty() || (code.compare(systemCurrencyCode()) == 0))
     {
-        currency = beast::kZERO;
+        currency = beast::kZero;
         return true;
     }
 
     // Handle ISO-4217-like 3-digit character codes.
-    if (code.size() == detail::kISO_CODE_LENGTH)
+    if (code.size() == detail::kIsoCodeLength)
     {
-        if (code.find_first_not_of(detail::kISO_CHAR_SET) != std::string::npos)
+        if (code.find_first_not_of(detail::kIsoCharSet) != std::string::npos)
             return false;
 
-        currency = beast::kZERO;
+        currency = beast::kZero;
 
-        std::ranges::copy(code, currency.begin() + detail::kISO_CODE_OFFSET);
+        std::ranges::copy(code, currency.begin() + detail::kIsoCodeOffset);
 
         return true;
     }
@@ -98,22 +98,22 @@ toCurrency(std::string const& code)
 Currency const&
 xrpCurrency()
 {
-    static Currency const kCURRENCY(beast::kZERO);
-    return kCURRENCY;
+    static Currency const kCurrency(beast::kZero);
+    return kCurrency;
 }
 
 Currency const&
 noCurrency()
 {
-    static Currency const kCURRENCY(1);
-    return kCURRENCY;
+    static Currency const kCurrency(1);
+    return kCurrency;
 }
 
 Currency const&
 badCurrency()
 {
-    static Currency const kCURRENCY(0x5852500000000000);
-    return kCURRENCY;
+    static Currency const kCurrency(0x5852500000000000);
+    return kCurrency;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/XChainAttestations.cpp b/src/libxrpl/protocol/XChainAttestations.cpp
index f89ad6a52c..e41e5f3d61 100644
--- a/src/libxrpl/protocol/XChainAttestations.cpp
+++ b/src/libxrpl/protocol/XChainAttestations.cpp
@@ -195,7 +195,7 @@ AttestationClaim::message(
     std::uint64_t claimID,
     std::optional<AccountID> const& dst)
 {
-    STObject o{kSF_GENERIC};
+    STObject o{kSfGeneric};
     // Serialize in SField order to make python serializers easier to write
     o[sfXChainClaimID] = claimID;
     o[sfAmount] = sendingAmount;
@@ -332,7 +332,7 @@ AttestationCreateAccount::message(
     std::uint64_t createCount,
     AccountID const& dst)
 {
-    STObject o{kSF_GENERIC};
+    STObject o{kSfGeneric};
     // Serialize in SField order to make python serializers easier to write
     o[sfXChainAccountCreateCount] = createCount;
     o[sfAmount] = sendingAmount;
@@ -668,7 +668,7 @@ XChainAttestationsBase<TAttestation>::XChainAttestationsBase(json::Value const&
     attestations_ = [&] {
         auto const jAtts = v[jss::attestations];
 
-        if (jAtts.size() > kMAX_ATTESTATIONS)
+        if (jAtts.size() > kMaxAttestations)
             Throw<std::runtime_error>("XChainAttestationsBase exceeded max number of attestations");
 
         std::vector<TAttestation> r;
@@ -682,7 +682,7 @@ XChainAttestationsBase<TAttestation>::XChainAttestationsBase(json::Value const&
 template <class TAttestation>
 XChainAttestationsBase<TAttestation>::XChainAttestationsBase(STArray const& arr)
 {
-    if (arr.size() > kMAX_ATTESTATIONS)
+    if (arr.size() > kMaxAttestations)
         Throw<std::runtime_error>("XChainAttestationsBase exceeded max number of attestations");
 
     attestations_.reserve(arr.size());
diff --git a/src/libxrpl/protocol/tokens.cpp b/src/libxrpl/protocol/tokens.cpp
index 91063d3fa6..a43cbd9c85 100644
--- a/src/libxrpl/protocol/tokens.cpp
+++ b/src/libxrpl/protocol/tokens.cpp
@@ -122,15 +122,15 @@ coefficients sizes greatly speeds up the multi-precision computations.
 
 namespace xrpl {
 
-static constexpr char const* kALPHABET_FORWARD =
+static constexpr char const* kAlphabetForward =
     "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
 
-static constexpr std::array<int, 256> const kALPHABET_REVERSE = []() {
+static constexpr std::array<int, 256> const kAlphabetReverse = []() {
     std::array<int, 256> map{};
     for (auto& m : map)
         m = -1;
-    for (int i = 0, j = 0; kALPHABET_FORWARD[i] != 0; ++i)
-        map[static_cast<unsigned char>(kALPHABET_FORWARD[i])] = j++;
+    for (int i = 0, j = 0; kAlphabetForward[i] != 0; ++i)
+        map[static_cast<unsigned char>(kAlphabetForward[i])] = j++;
     return map;
 }();
 
@@ -239,9 +239,9 @@ encodeBase58(void const* message, std::size_t size, void* temp, std::size_t temp
     // Translate the result into a string.
     std::string str;
     str.reserve(zeroes + (b58end - iter));
-    str.assign(zeroes, kALPHABET_FORWARD[0]);
+    str.assign(zeroes, kAlphabetForward[0]);
     while (iter != b58end)
-        str += kALPHABET_FORWARD[*(iter++)];
+        str += kAlphabetForward[*(iter++)];
     return str;
 }
 
@@ -252,7 +252,7 @@ decodeBase58(std::string const& s)
     auto remain = s.size();
     // Skip and count leading zeroes
     int zeroes = 0;
-    while (remain > 0 && kALPHABET_REVERSE[*psz] == 0)
+    while (remain > 0 && kAlphabetReverse[*psz] == 0)
     {
         ++zeroes;
         ++psz;
@@ -267,7 +267,7 @@ decodeBase58(std::string const& s)
     std::vector<unsigned char> b256((remain * 733 / 1000) + 1);
     while (remain > 0)
     {
-        auto carry = kALPHABET_REVERSE[*psz];
+        auto carry = kAlphabetReverse[*psz];
         if (carry == -1)
             return {};
         // Apply "b256 = b256 * 58 + carry".
@@ -425,7 +425,7 @@ b256ToB58Be(std::span<std::uint8_t const> input, std::span<std::uint8_t> out)
 
     // Translate the result into the alphabet
     // Put all the zeros at the beginning, then all the values from the output
-    std::fill(out.begin(), out.begin() + inputZeros, ::xrpl::kALPHABET_FORWARD[0]);
+    std::fill(out.begin(), out.begin() + inputZeros, ::xrpl::kAlphabetForward[0]);
 
     // iterate through the base 58^10 coeff
     // convert to base 58 big endian then
@@ -458,7 +458,7 @@ b256ToB58Be(std::span<std::uint8_t const> input, std::span<std::uint8_t> out)
         }
         for (auto b58Coeff : b58BeS.subspan(toSkip))
         {
-            out[outIndex] = ::xrpl::kALPHABET_FORWARD[b58Coeff];
+            out[outIndex] = ::xrpl::kAlphabetForward[b58Coeff];
             outIndex += 1;
         }
     }
@@ -487,7 +487,7 @@ b58ToB256Be(std::string_view input, std::span<std::uint8_t> out)
         std::size_t count = 0;
         for (auto const& c : col)
         {
-            if (c != ::xrpl::kALPHABET_FORWARD[0])
+            if (c != ::xrpl::kAlphabetForward[0])
             {
                 return count;
             }
@@ -510,7 +510,7 @@ b58ToB256Be(std::string_view input, std::span<std::uint8_t> out)
         "xrpl::b58_fast::detail::b58_to_b256_be : maximum coeff");
     for (unsigned char const c : input.substr(0, partial_coeff_len))
     {
-        auto curVal = ::xrpl::kALPHABET_REVERSE[c];
+        auto curVal = ::xrpl::kAlphabetReverse[c];
         if (curVal < 0)
         {
             return Unexpected(TokenCodecErrc::InvalidEncodingChar);
@@ -523,7 +523,7 @@ b58ToB256Be(std::string_view input, std::span<std::uint8_t> out)
         for (int j = 0; j < num_full_coeffs; ++j)
         {
             unsigned char const c = input[partial_coeff_len + (j * 10) + i];
-            auto curVal = ::xrpl::kALPHABET_REVERSE[c];
+            auto curVal = ::xrpl::kAlphabetReverse[c];
             if (curVal < 0)
             {
                 return Unexpected(TokenCodecErrc::InvalidEncodingChar);
@@ -610,9 +610,9 @@ encodeBase58Token(
     std::span<std::uint8_t const> input,
     std::span<std::uint8_t> out)
 {
-    constexpr std::size_t kTMP_BUF_SIZE = 128;
-    std::array<std::uint8_t, kTMP_BUF_SIZE> buf{};
-    if (input.size() > kTMP_BUF_SIZE - 5)
+    static constexpr std::size_t kTmpBufSize = 128;
+    std::array<std::uint8_t, kTmpBufSize> buf{};
+    if (input.size() > kTmpBufSize - 5)
     {
         return Unexpected(TokenCodecErrc::InputTooLarge);
     }
diff --git a/src/libxrpl/resource/Fees.cpp b/src/libxrpl/resource/Fees.cpp
index 8c9b72987f..bb825fa3c7 100644
--- a/src/libxrpl/resource/Fees.cpp
+++ b/src/libxrpl/resource/Fees.cpp
@@ -4,24 +4,24 @@
 
 namespace xrpl::Resource {
 
-Charge const kFEE_MALFORMED_REQUEST(200, "malformed request");
-Charge const kFEE_REQUEST_NO_REPLY(10, "unsatisfiable request");
-Charge const kFEE_INVALID_SIGNATURE(2000, "invalid signature");
-Charge const kFEE_USELESS_DATA(150, "useless data");
-Charge const kFEE_INVALID_DATA(400, "invalid data");
+Charge const kFeeMalformedRequest(200, "malformed request");
+Charge const kFeeRequestNoReply(10, "unsatisfiable request");
+Charge const kFeeInvalidSignature(2000, "invalid signature");
+Charge const kFeeUselessData(150, "useless data");
+Charge const kFeeInvalidData(400, "invalid data");
 
-Charge const kFEE_MALFORMED_RPC(100, "malformed RPC");
-Charge const kFEE_REFERENCE_RPC(20, "reference RPC");
-Charge const kFEE_EXCEPTION_RPC(100, "exceptioned RPC");
-Charge const kFEE_MEDIUM_BURDEN_RPC(400, "medium RPC");
-Charge const kFEE_HEAVY_BURDEN_RPC(3000, "heavy RPC");
+Charge const kFeeMalformedRpc(100, "malformed RPC");
+Charge const kFeeReferenceRpc(20, "reference RPC");
+Charge const kFeeExceptionRpc(100, "exceptioned RPC");
+Charge const kFeeMediumBurdenRpc(400, "medium RPC");
+Charge const kFeeHeavyBurdenRpc(3000, "heavy RPC");
 
-Charge const kFEE_TRIVIAL_PEER(1, "trivial peer request");
-Charge const kFEE_MODERATE_BURDEN_PEER(250, "moderate peer request");
-Charge const kFEE_HEAVY_BURDEN_PEER(2000, "heavy peer request");
+Charge const kFeeTrivialPeer(1, "trivial peer request");
+Charge const kFeeModerateBurdenPeer(250, "moderate peer request");
+Charge const kFeeHeavyBurdenPeer(2000, "heavy peer request");
 
-Charge const kFEE_WARNING(4000, "received warning");
-Charge const kFEE_DROP(6000, "dropped");
+Charge const kFeeWarning(4000, "received warning");
+Charge const kFeeDrop(6000, "dropped");
 
 // See also Resource::Logic::charge for log level cutoff values
 
diff --git a/src/libxrpl/server/LoadFeeTrack.cpp b/src/libxrpl/server/LoadFeeTrack.cpp
index 085e846145..31b2fa2558 100644
--- a/src/libxrpl/server/LoadFeeTrack.cpp
+++ b/src/libxrpl/server/LoadFeeTrack.cpp
@@ -27,9 +27,9 @@ LoadFeeTrack::raiseLocalFee()
     localTxnLoadFee_ = std::max(localTxnLoadFee_, remoteTxnLoadFee_);
 
     // Increase slowly
-    localTxnLoadFee_ += (localTxnLoadFee_ / kLFT_FEE_INC_FRACTION);
+    localTxnLoadFee_ += (localTxnLoadFee_ / kLftFeeIncFraction);
 
-    localTxnLoadFee_ = std::min(localTxnLoadFee_, kLFT_FEE_MAX);
+    localTxnLoadFee_ = std::min(localTxnLoadFee_, kLftFeeMax);
 
     if (origFee == localTxnLoadFee_)
         return false;
@@ -46,9 +46,9 @@ LoadFeeTrack::lowerLocalFee()
     raiseCount_ = 0;
 
     // Reduce slowly
-    localTxnLoadFee_ -= (localTxnLoadFee_ / kLFT_FEE_DEC_FRACTION);
+    localTxnLoadFee_ -= (localTxnLoadFee_ / kLftFeeDecFraction);
 
-    localTxnLoadFee_ = std::max(localTxnLoadFee_, kLFT_NORMAL_FEE);
+    localTxnLoadFee_ = std::max(localTxnLoadFee_, kLftNormalFee);
 
     if (origFee == localTxnLoadFee_)
         return false;
diff --git a/src/libxrpl/server/Manifest.cpp b/src/libxrpl/server/Manifest.cpp
index fd38d02d6b..1b0493dd9d 100644
--- a/src/libxrpl/server/Manifest.cpp
+++ b/src/libxrpl/server/Manifest.cpp
@@ -62,7 +62,7 @@ deserializeManifest(Slice s, beast::Journal journal)
     if (s.empty())
         return std::nullopt;
 
-    static SOTemplate const kMANIFEST_FORMAT{
+    static SOTemplate const kManifestFormat{
         // A manifest must include:
         // - the master public key
         {sfPublicKey, SoeRequired},
@@ -90,9 +90,9 @@ deserializeManifest(Slice s, beast::Journal journal)
     try
     {
         SerialIter sit{s};
-        STObject st{sit, kSF_GENERIC};
+        STObject st{sit, kSfGeneric};
 
-        st.applyTemplate(kMANIFEST_FORMAT);
+        st.applyTemplate(kManifestFormat);
 
         // We only understand "version 0" manifests at this time:
         if (st.isFieldPresent(sfVersion) && st.getFieldU16(sfVersion) != 0)
@@ -193,7 +193,7 @@ logMftAct(
 bool
 Manifest::verify() const
 {
-    STObject st(kSF_GENERIC);
+    STObject st(kSfGeneric);
     SerialIter sit(serialized.data(), serialized.size());
     st.set(sit);
 
@@ -213,7 +213,7 @@ Manifest::verify() const
 uint256
 Manifest::hash() const
 {
-    STObject st(kSF_GENERIC);
+    STObject st(kSfGeneric);
     SerialIter sit(serialized.data(), serialized.size());
     st.set(sit);
     return st.getHash(HashPrefix::Manifest);
@@ -240,7 +240,7 @@ Manifest::revoked(std::uint32_t sequence)
 std::optional<Blob>
 Manifest::getSignature() const
 {
-    STObject st(kSF_GENERIC);
+    STObject st(kSfGeneric);
     SerialIter sit(serialized.data(), serialized.size());
     st.set(sit);
     if (!get(st, sfSignature))
@@ -251,7 +251,7 @@ Manifest::getSignature() const
 Blob
 Manifest::getMasterSignature() const
 {
-    STObject st(kSF_GENERIC);
+    STObject st(kSfGeneric);
     SerialIter sit(serialized.data(), serialized.size());
     st.set(sit);
     return st.getFieldVL(sfMasterSignature);
diff --git a/src/libxrpl/server/Vacuum.cpp b/src/libxrpl/server/Vacuum.cpp
index 140ef04def..63d40af156 100644
--- a/src/libxrpl/server/Vacuum.cpp
+++ b/src/libxrpl/server/Vacuum.cpp
@@ -20,7 +20,7 @@ namespace xrpl {
 bool
 doVacuumDB(DatabaseCon::Setup const& setup, beast::Journal j)
 {
-    boost::filesystem::path const dbPath = setup.dataDir / kTX_DB_NAME;
+    boost::filesystem::path const dbPath = setup.dataDir / kTxDbName;
 
     uintmax_t const dbSize = file_size(dbPath);
     XRPL_ASSERT(dbSize != static_cast<uintmax_t>(-1), "xrpl::doVacuumDB : file_size succeeded");
@@ -34,14 +34,14 @@ doVacuumDB(DatabaseCon::Setup const& setup, beast::Journal j)
         return false;
     }
 
-    auto txnDB = std::make_unique<DatabaseCon>(setup, kTX_DB_NAME, setup.txPragma, kTX_DB_INIT, j);
+    auto txnDB = std::make_unique<DatabaseCon>(setup, kTxDbName, setup.txPragma, kTxDbInit, j);
     auto& session = txnDB->getSession();
     std::uint32_t pageSize = 0;
 
     // Only the most trivial databases will fit in memory on typical
     // (recommended) hardware. Force temp files to be written to disk
     // regardless of the config settings.
-    session << boost::format(kCOMMON_DB_PRAGMA_TEMP) % "file";
+    session << boost::format(kCommonDbPragmaTemp) % "file";
     session << "PRAGMA page_size;", soci::into(pageSize);
 
     std::cout << "VACUUM beginning. page_size: " << pageSize << std::endl;
diff --git a/src/libxrpl/server/Wallet.cpp b/src/libxrpl/server/Wallet.cpp
index 3f2be6267a..f3ae9dc925 100644
--- a/src/libxrpl/server/Wallet.cpp
+++ b/src/libxrpl/server/Wallet.cpp
@@ -40,7 +40,7 @@ makeWalletDB(DatabaseCon::Setup const& setup, beast::Journal j)
 {
     // wallet database
     return std::make_unique<DatabaseCon>(
-        setup, kWALLET_DB_NAME, std::array<std::string, 0>(), kWALLET_DB_INIT, j);
+        setup, kWalletDbName, std::array<std::string, 0>(), kWalletDbInit, j);
 }
 
 std::unique_ptr<DatabaseCon>
@@ -48,7 +48,7 @@ makeTestWalletDB(DatabaseCon::Setup const& setup, std::string const& dbname, bea
 {
     // wallet database
     return std::make_unique<DatabaseCon>(
-        setup, dbname.data(), std::array<std::string, 0>(), kWALLET_DB_INIT, j);
+        setup, dbname.data(), std::array<std::string, 0>(), kWalletDbInit, j);
 }
 
 void
diff --git a/src/libxrpl/shamap/SHAMap.cpp b/src/libxrpl/shamap/SHAMap.cpp
index dafca12c22..d3a7d49da6 100644
--- a/src/libxrpl/shamap/SHAMap.cpp
+++ b/src/libxrpl/shamap/SHAMap.cpp
@@ -352,7 +352,7 @@ SHAMap::descend(
 {
     XRPL_ASSERT(parent->isInner(), "xrpl::SHAMap::descend : valid parent input");
     XRPL_ASSERT(
-        (branch >= 0) && (branch < kBRANCH_FACTOR), "xrpl::SHAMap::descend : valid branch input");
+        (branch >= 0) && (branch < kBranchFactor), "xrpl::SHAMap::descend : valid branch input");
     XRPL_ASSERT(
         !parent->isEmptyBranch(branch), "xrpl::SHAMap::descend : parent branch is non-empty");
 
@@ -443,7 +443,7 @@ SHAMap::belowHelper(
     if (node->isLeaf())
     {
         auto n = intr_ptr::staticPointerCast<SHAMapLeafNode>(node);
-        stack.push({node, {kLEAF_DEPTH, n->peekItem()->key()}});
+        stack.push({node, {kLeafDepth, n->peekItem()->key()}});
         return n.get();
     }
     auto inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
@@ -464,7 +464,7 @@ SHAMap::belowHelper(
             if (node->isLeaf())
             {
                 auto n = intr_ptr::staticPointerCast<SHAMapLeafNode>(node);
-                stack.push({n, {kLEAF_DEPTH, n->peekItem()->key()}});
+                stack.push({n, {kLeafDepth, n->peekItem()->key()}});
                 return n.get();
             }
             inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
@@ -482,7 +482,7 @@ SHAMapLeafNode*
 SHAMap::lastBelow(intr_ptr::SharedPtr<SHAMapTreeNode> node, SharedPtrNodeStack& stack, int branch)
     const
 {
-    auto init = kBRANCH_FACTOR - 1;
+    auto init = kBranchFactor - 1;
     auto cmp = [](int i) { return i >= 0; };
     auto incr = [](int& i) { --i; };
 
@@ -493,12 +493,12 @@ SHAMap::firstBelow(intr_ptr::SharedPtr<SHAMapTreeNode> node, SharedPtrNodeStack&
     const
 {
     auto init = 0;
-    auto cmp = [](int i) { return i <= kBRANCH_FACTOR; };
+    auto cmp = [](int i) { return i <= kBranchFactor; };
     auto incr = [](int& i) { ++i; };
 
     return belowHelper(node, stack, branch, {init, cmp, incr});
 }
-static boost::intrusive_ptr<SHAMapItem const> const kNO_ITEM;
+static boost::intrusive_ptr<SHAMapItem const> const kNoItem;
 
 boost::intrusive_ptr<SHAMapItem const> const&
 SHAMap::onlyBelow(SHAMapTreeNode* node) const
@@ -509,12 +509,12 @@ SHAMap::onlyBelow(SHAMapTreeNode* node) const
     {
         SHAMapTreeNode* nextNode = nullptr;
         auto inner = safeDowncast<SHAMapInnerNode*>(node);
-        for (int i = 0; i < kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < kBranchFactor; ++i)
         {
             if (!inner->isEmptyBranch(i))
             {
                 if (nextNode != nullptr)
-                    return kNO_ITEM;
+                    return kNoItem;
 
                 nextNode = descendThrow(inner, i);
             }
@@ -524,7 +524,7 @@ SHAMap::onlyBelow(SHAMapTreeNode* node) const
         {
             // LCOV_EXCL_START
             UNREACHABLE("xrpl::SHAMap::onlyBelow : no next node");
-            return kNO_ITEM;
+            return kNoItem;
             // LCOV_EXCL_STOP
         }
 
@@ -564,7 +564,7 @@ SHAMap::peekNextItem(uint256 const& id, SharedPtrNodeStack& stack) const
         auto [node, nodeID] = stack.top();
         XRPL_ASSERT(!node->isLeaf(), "xrpl::SHAMap::peekNextItem : another node is not leaf");
         auto inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
-        for (auto i = selectBranch(nodeID, id) + 1; i < kBRANCH_FACTOR; ++i)
+        for (auto i = selectBranch(nodeID, id) + 1; i < kBranchFactor; ++i)
         {
             if (!inner->isEmptyBranch(i))
             {
@@ -588,7 +588,7 @@ SHAMap::peekItem(uint256 const& id) const
     SHAMapLeafNode const* leaf = findKey(id);
 
     if (leaf == nullptr)
-        return kNO_ITEM;
+        return kNoItem;
 
     return leaf->peekItem();
 }
@@ -599,7 +599,7 @@ SHAMap::peekItem(uint256 const& id, SHAMapHash& hash) const
     SHAMapLeafNode const* leaf = findKey(id);
 
     if (leaf == nullptr)
-        return kNO_ITEM;
+        return kNoItem;
 
     hash = leaf->getHash();
     return leaf->peekItem();
@@ -622,7 +622,7 @@ SHAMap::upperBound(uint256 const& id) const
         else
         {
             auto inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
-            for (auto branch = selectBranch(nodeID, id) + 1; branch < kBRANCH_FACTOR; ++branch)
+            for (auto branch = selectBranch(nodeID, id) + 1; branch < kBranchFactor; ++branch)
             {
                 if (!inner->isEmptyBranch(branch))
                 {
@@ -737,7 +737,7 @@ SHAMap::delItem(uint256 const& id)
 
                 if (item)
                 {
-                    for (int i = 0; i < kBRANCH_FACTOR; ++i)
+                    for (int i = 0; i < kBranchFactor; ++i)
                     {
                         if (!node->isEmptyBranch(i))
                         {
@@ -1027,7 +1027,7 @@ SHAMap::walkSubTree(bool doWrite, NodeObjectType t)
     // We can't flush an inner node until we flush its children
     while (true)
     {
-        while (pos < kBRANCH_FACTOR)
+        while (pos < kBranchFactor)
         {
             if (node->isEmptyBranch(pos))
             {
@@ -1131,7 +1131,7 @@ SHAMap::dump(bool hash) const
         if (node->isInner())
         {
             auto inner = safeDowncast<SHAMapInnerNode*>(node);
-            for (int i = 0; i < kBRANCH_FACTOR; ++i)
+            for (int i = 0; i < kBranchFactor; ++i)
             {
                 if (!inner->isEmptyBranch(i))
                 {
diff --git a/src/libxrpl/shamap/SHAMapInnerNode.cpp b/src/libxrpl/shamap/SHAMapInnerNode.cpp
index ef38819599..f31b75ad39 100644
--- a/src/libxrpl/shamap/SHAMapInnerNode.cpp
+++ b/src/libxrpl/shamap/SHAMapInnerNode.cpp
@@ -122,16 +122,16 @@ intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMapInnerNode::makeFullInner(Slice data, SHAMapHash const& hash, bool hashValid)
 {
     // A full inner node is serialized as 16 256-bit hashes, back to back:
-    if (data.size() != kBRANCH_FACTOR * uint256::kBYTES)
+    if (data.size() != kBranchFactor * uint256::kBytes)
         Throw<std::runtime_error>("Invalid FI node");
 
-    auto ret = intr_ptr::makeShared<SHAMapInnerNode>(0, kBRANCH_FACTOR);
+    auto ret = intr_ptr::makeShared<SHAMapInnerNode>(0, kBranchFactor);
 
     SerialIter si(data);
 
     auto hashes = ret->hashesAndChildren_.getHashes();
 
-    for (int i = 0; i < kBRANCH_FACTOR; ++i)
+    for (int i = 0; i < kBranchFactor; ++i)
     {
         hashes[i].asUInt256() = si.getBitString<256>();
 
@@ -158,14 +158,14 @@ SHAMapInnerNode::makeCompressedInner(Slice data)
 {
     // A compressed inner node is serialized as a series of 33 byte chunks,
     // representing a one byte "position" and a 256-bit hash:
-    constexpr std::size_t kCHUNK_SIZE = uint256::kBYTES + 1;
+    static constexpr std::size_t kChunkSize = uint256::kBytes + 1;
 
-    if (auto const s = data.size(); (s % kCHUNK_SIZE != 0) || (s > kCHUNK_SIZE * kBRANCH_FACTOR))
+    if (auto const s = data.size(); (s % kChunkSize != 0) || (s > kChunkSize * kBranchFactor))
         Throw<std::runtime_error>("Invalid CI node");
 
     SerialIter si(data);
 
-    auto ret = intr_ptr::makeShared<SHAMapInnerNode>(0, kBRANCH_FACTOR);
+    auto ret = intr_ptr::makeShared<SHAMapInnerNode>(0, kBranchFactor);
 
     auto hashes = ret->hashesAndChildren_.getHashes();
 
@@ -174,7 +174,7 @@ SHAMapInnerNode::makeCompressedInner(Slice data)
         auto const hash = si.getBitString<256>();
         auto const pos = si.get8();
 
-        if (pos >= kBRANCH_FACTOR)
+        if (pos >= kBranchFactor)
             Throw<std::runtime_error>("invalid CI node");
 
         hashes[pos].asUInt256() = hash;
@@ -231,12 +231,12 @@ SHAMapInnerNode::serializeForWire(Serializer& s) const
             s.addBitString(hashes[indexNum].asUInt256());
             s.add8(branchNum);
         });
-        s.add8(kWIRE_TYPE_COMPRESSED_INNER);
+        s.add8(kWireTypeCompressedInner);
     }
     else
     {
         iterChildren([&](SHAMapHash const& hh) { s.addBitString(hh.asUInt256()); });
-        s.add8(kWIRE_TYPE_INNER);
+        s.add8(kWireTypeInner);
     }
 }
 
@@ -268,7 +268,7 @@ void
 SHAMapInnerNode::setChild(int m, intr_ptr::SharedPtr<SHAMapTreeNode> child)
 {
     XRPL_ASSERT(
-        (m >= 0) && (m < kBRANCH_FACTOR), "xrpl::SHAMapInnerNode::setChild : valid branch input");
+        (m >= 0) && (m < kBranchFactor), "xrpl::SHAMapInnerNode::setChild : valid branch input");
     XRPL_ASSERT(cowid_, "xrpl::SHAMapInnerNode::setChild : nonzero cowid");
     XRPL_ASSERT(child.get() != this, "xrpl::SHAMapInnerNode::setChild : valid child input");
 
@@ -310,7 +310,7 @@ void
 SHAMapInnerNode::shareChild(int m, intr_ptr::SharedPtr<SHAMapTreeNode> const& child)
 {
     XRPL_ASSERT(
-        (m >= 0) && (m < kBRANCH_FACTOR), "xrpl::SHAMapInnerNode::shareChild : valid branch input");
+        (m >= 0) && (m < kBranchFactor), "xrpl::SHAMapInnerNode::shareChild : valid branch input");
     XRPL_ASSERT(cowid_, "xrpl::SHAMapInnerNode::shareChild : nonzero cowid");
     XRPL_ASSERT(child, "xrpl::SHAMapInnerNode::shareChild : non-null child input");
     XRPL_ASSERT(child.get() != this, "xrpl::SHAMapInnerNode::shareChild : valid child input");
@@ -324,7 +324,7 @@ SHAMapTreeNode*
 SHAMapInnerNode::getChildPointer(int branch)
 {
     XRPL_ASSERT(
-        branch >= 0 && branch < kBRANCH_FACTOR,
+        branch >= 0 && branch < kBranchFactor,
         "xrpl::SHAMapInnerNode::getChildPointer : valid branch input");
     XRPL_ASSERT(
         !isEmptyBranch(branch), "xrpl::SHAMapInnerNode::getChildPointer : non-empty branch input");
@@ -341,7 +341,7 @@ intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMapInnerNode::getChild(int branch)
 {
     XRPL_ASSERT(
-        branch >= 0 && branch < kBRANCH_FACTOR,
+        branch >= 0 && branch < kBranchFactor,
         "xrpl::SHAMapInnerNode::getChild : valid branch input");
     XRPL_ASSERT(!isEmptyBranch(branch), "xrpl::SHAMapInnerNode::getChild : non-empty branch input");
 
@@ -357,19 +357,19 @@ SHAMapHash const&
 SHAMapInnerNode::getChildHash(int m) const
 {
     XRPL_ASSERT(
-        (m >= 0) && (m < kBRANCH_FACTOR),
+        (m >= 0) && (m < kBranchFactor),
         "xrpl::SHAMapInnerNode::getChildHash : valid branch input");
     if (auto const i = getChildIndex(m))
         return hashesAndChildren_.getHashes()[*i];
 
-    return kZERO_SHA_MAP_HASH;
+    return kZeroShaMapHash;
 }
 
 intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMapInnerNode::canonicalizeChild(int branch, intr_ptr::SharedPtr<SHAMapTreeNode> node)
 {
     XRPL_ASSERT(
-        branch >= 0 && branch < kBRANCH_FACTOR,
+        branch >= 0 && branch < kBranchFactor,
         "xrpl::SHAMapInnerNode::canonicalizeChild : valid branch input");
     XRPL_ASSERT(node != nullptr, "xrpl::SHAMapInnerNode::canonicalizeChild : valid node input");
     XRPL_ASSERT(
@@ -405,7 +405,7 @@ SHAMapInnerNode::invariants(bool isRoot) const
     [[maybe_unused]] unsigned count = 0;
     auto [numAllocated, hashes, children] = hashesAndChildren_.getHashesAndChildren();
 
-    if (numAllocated != kBRANCH_FACTOR)
+    if (numAllocated != kBranchFactor)
     {
         auto const branchCount = getBranchCount();
         for (int i = 0; i < branchCount; ++i)
@@ -420,7 +420,7 @@ SHAMapInnerNode::invariants(bool isRoot) const
     }
     else
     {
-        for (int i = 0; i < kBRANCH_FACTOR; ++i)
+        for (int i = 0; i < kBranchFactor; ++i)
         {
             if (hashes[i].isNonZero())
             {
diff --git a/src/libxrpl/shamap/SHAMapLeafNode.cpp b/src/libxrpl/shamap/SHAMapLeafNode.cpp
index 84c4498698..2fc23d6bb3 100644
--- a/src/libxrpl/shamap/SHAMapLeafNode.cpp
+++ b/src/libxrpl/shamap/SHAMapLeafNode.cpp
@@ -19,7 +19,7 @@ SHAMapLeafNode::SHAMapLeafNode(boost::intrusive_ptr<SHAMapItem const> item, std:
     : SHAMapTreeNode(cowid), item_(std::move(item))
 {
     XRPL_ASSERT(
-        item_->size() >= kMIN_SHA_MAP_ITEM_BYTES,
+        item_->size() >= kMinShaMapItemBytes,
         "xrpl::SHAMapLeafNode::SHAMapLeafNode(boost::intrusive_ptr<"
         "SHAMapItem const>, std::uint32_t) : minimum input size");
 }
@@ -31,7 +31,7 @@ SHAMapLeafNode::SHAMapLeafNode(
     : SHAMapTreeNode(cowid, hash), item_(std::move(item))
 {
     XRPL_ASSERT(
-        item_->size() >= kMIN_SHA_MAP_ITEM_BYTES,
+        item_->size() >= kMinShaMapItemBytes,
         "xrpl::SHAMapLeafNode::SHAMapLeafNode(boost::intrusive_ptr<"
         "SHAMapItem const>, std::uint32_t, SHAMapHash const&) : minimum input "
         "size");
diff --git a/src/libxrpl/shamap/SHAMapNodeID.cpp b/src/libxrpl/shamap/SHAMapNodeID.cpp
index 4eb6742aac..16aaafe709 100644
--- a/src/libxrpl/shamap/SHAMapNodeID.cpp
+++ b/src/libxrpl/shamap/SHAMapNodeID.cpp
@@ -16,35 +16,35 @@ namespace xrpl {
 static uint256 const&
 depthMask(unsigned int depth)
 {
-    static constexpr auto kMASK_SIZE = 65;
+    static constexpr auto kMaskSize = 65;
 
     struct MasksT
     {
-        uint256 entry[kMASK_SIZE];
+        uint256 entry[kMaskSize];
 
         MasksT()
         {
             uint256 selector;
-            for (int i = 0; i < kMASK_SIZE - 1; i += 2)
+            for (int i = 0; i < kMaskSize - 1; i += 2)
             {
                 entry[i] = selector;
                 *(selector.begin() + (i / 2)) = 0xF0;
                 entry[i + 1] = selector;
                 *(selector.begin() + (i / 2)) = 0xFF;
             }
-            entry[kMASK_SIZE - 1] = selector;
+            entry[kMaskSize - 1] = selector;
         }
     };
 
-    static MasksT const kMASKS;
-    return kMASKS.entry[depth];
+    static MasksT const kMasks;
+    return kMasks.entry[depth];
 }
 
 // canonicalize the hash to a node ID for this depth
 SHAMapNodeID::SHAMapNodeID(unsigned int depth, uint256 const& hash) : id_(hash), depth_(depth)
 {
     XRPL_ASSERT(
-        depth <= SHAMap::kLEAF_DEPTH, "xrpl::SHAMapNodeID::SHAMapNodeID : maximum depth input");
+        depth <= SHAMap::kLeafDepth, "xrpl::SHAMapNodeID::SHAMapNodeID : maximum depth input");
     XRPL_ASSERT(
         id_ == (id_ & depthMask(depth)),
         "xrpl::SHAMapNodeID::SHAMapNodeID : hash and depth inputs do match");
@@ -63,7 +63,7 @@ SHAMapNodeID
 SHAMapNodeID::getChildNodeID(unsigned int m) const
 {
     XRPL_ASSERT(
-        m < SHAMap::kBRANCH_FACTOR, "xrpl::SHAMapNodeID::getChildNodeID : valid branch input");
+        m < SHAMap::kBranchFactor, "xrpl::SHAMapNodeID::getChildNodeID : valid branch input");
 
     // A SHAMap has exactly 65 levels, so nodes must not exceed that
     // depth; if they do, this breaks the invariant of never allowing
@@ -74,9 +74,9 @@ SHAMapNodeID::getChildNodeID(unsigned int m) const
     // entries at that depth are leaf nodes and have no children and even
     // constructing a child node from them would break the above invariant.
     XRPL_ASSERT(
-        depth_ <= SHAMap::kLEAF_DEPTH, "xrpl::SHAMapNodeID::getChildNodeID : maximum leaf depth");
+        depth_ <= SHAMap::kLeafDepth, "xrpl::SHAMapNodeID::getChildNodeID : maximum leaf depth");
 
-    if (depth_ >= SHAMap::kLEAF_DEPTH)
+    if (depth_ >= SHAMap::kLeafDepth)
         Throw<std::logic_error>("Request for child node ID of " + to_string(*this));
 
     if (id_ != (id_ & depthMask(depth_)))
@@ -95,7 +95,7 @@ deserializeSHAMapNodeID(void const* data, std::size_t size)
     if (size == 33)
     {
         unsigned int const depth = *(static_cast<unsigned char const*>(data) + 32);
-        if (depth <= SHAMap::kLEAF_DEPTH)
+        if (depth <= SHAMap::kLeafDepth)
         {
             auto const id = uint256::fromVoid(data);
 
@@ -122,7 +122,7 @@ selectBranch(SHAMapNodeID const& id, uint256 const& hash)
         branch >>= 4;
     }
 
-    XRPL_ASSERT(branch < SHAMap::kBRANCH_FACTOR, "xrpl::selectBranch : maximum result");
+    XRPL_ASSERT(branch < SHAMap::kBranchFactor, "xrpl::selectBranch : maximum result");
     return branch;
 }
 
diff --git a/src/libxrpl/shamap/SHAMapSync.cpp b/src/libxrpl/shamap/SHAMapSync.cpp
index 935f5b4e4a..cd2654c603 100644
--- a/src/libxrpl/shamap/SHAMapSync.cpp
+++ b/src/libxrpl/shamap/SHAMapSync.cpp
@@ -615,8 +615,8 @@ SHAMap::addKnownNode(SHAMapNodeID const& node, Slice const& rawNode, SHAMapSyncF
         // Inner nodes must be at a level strictly less than 64
         // but leaf nodes (while notionally at level 64) can be
         // at any depth up to and including 64:
-        if ((currNodeID.getDepth() > kLEAF_DEPTH) ||
-            (newNode->isInner() && currNodeID.getDepth() == kLEAF_DEPTH))
+        if ((currNodeID.getDepth() > kLeafDepth) ||
+            (newNode->isInner() && currNodeID.getDepth() == kLeafDepth))
         {
             // Map is provably invalid
             state_ = SHAMapState::Invalid;
diff --git a/src/libxrpl/shamap/SHAMapTreeNode.cpp b/src/libxrpl/shamap/SHAMapTreeNode.cpp
index 66eced2192..3b8d976c69 100644
--- a/src/libxrpl/shamap/SHAMapTreeNode.cpp
+++ b/src/libxrpl/shamap/SHAMapTreeNode.cpp
@@ -28,11 +28,11 @@ namespace xrpl {
 intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMapTreeNode::makeTransaction(Slice data, SHAMapHash const& hash, bool hashValid)
 {
-    if (data.size() < kMIN_SHA_MAP_ITEM_BYTES)
+    if (data.size() < kMinShaMapItemBytes)
     {
         Throw<std::runtime_error>(
             "Short TXN node: " + std::to_string(data.size()) + " bytes (minimum " +
-            std::to_string(kMIN_SHA_MAP_ITEM_BYTES) + " required)");
+            std::to_string(kMinShaMapItemBytes) + " required)");
     }
 
     auto item = makeShamapitem(sha512Half(HashPrefix::TransactionId, data), data);
@@ -50,28 +50,28 @@ SHAMapTreeNode::makeTransactionWithMeta(Slice data, SHAMapHash const& hash, bool
 
     uint256 tag;
 
-    if (s.size() < tag.kBYTES)
+    if (s.size() < tag.kBytes)
     {
         Throw<std::runtime_error>(
             "Short TXN+MD node: " + std::to_string(s.size()) + " bytes (minimum " +
-            std::to_string(tag.kBYTES) + " required for tag)");
+            std::to_string(tag.kBytes) + " required for tag)");
     }
 
     // FIXME: improve this interface so that the above check isn't needed
-    if (!s.getBitString(tag, s.size() - tag.kBYTES))
+    if (!s.getBitString(tag, s.size() - tag.kBytes))
     {
         Throw<std::out_of_range>(
             "Short TXN+MD node: failed to read tag at offset " +
-            std::to_string(s.size() - tag.kBYTES));
+            std::to_string(s.size() - tag.kBytes));
     }
 
-    s.chop(tag.kBYTES);
+    s.chop(tag.kBytes);
 
-    if (s.size() < kMIN_SHA_MAP_ITEM_BYTES)
+    if (s.size() < kMinShaMapItemBytes)
     {
         Throw<std::runtime_error>(
             "Short TXN+MD node: " + std::to_string(s.size()) +
-            " bytes after tag removal (minimum " + std::to_string(kMIN_SHA_MAP_ITEM_BYTES) +
+            " bytes after tag removal (minimum " + std::to_string(kMinShaMapItemBytes) +
             " required)");
     }
 
@@ -90,30 +90,30 @@ SHAMapTreeNode::makeAccountState(Slice data, SHAMapHash const& hash, bool hashVa
 
     uint256 tag;
 
-    if (s.size() < tag.kBYTES)
+    if (s.size() < tag.kBytes)
     {
         Throw<std::runtime_error>(
             "Short AS node: " + std::to_string(s.size()) + " bytes (minimum " +
-            std::to_string(tag.kBYTES) + " required for tag)");
+            std::to_string(tag.kBytes) + " required for tag)");
     }
 
     // FIXME: improve this interface so that the above check isn't needed
-    if (!s.getBitString(tag, s.size() - tag.kBYTES))
+    if (!s.getBitString(tag, s.size() - tag.kBytes))
     {
         Throw<std::out_of_range>(
-            "Short AS node: failed to read tag at offset " + std::to_string(s.size() - tag.kBYTES));
+            "Short AS node: failed to read tag at offset " + std::to_string(s.size() - tag.kBytes));
     }
 
-    s.chop(tag.kBYTES);
+    s.chop(tag.kBytes);
 
     if (tag.isZero())
         Throw<std::runtime_error>("Invalid AS node");
 
-    if (s.size() < kMIN_SHA_MAP_ITEM_BYTES)
+    if (s.size() < kMinShaMapItemBytes)
     {
         Throw<std::runtime_error>(
             "Short AS node: " + std::to_string(s.size()) + " bytes after tag removal (minimum " +
-            std::to_string(kMIN_SHA_MAP_ITEM_BYTES) + " required)");
+            std::to_string(kMinShaMapItemBytes) + " required)");
     }
 
     auto item = makeShamapitem(tag, s.slice());
@@ -137,19 +137,19 @@ SHAMapTreeNode::makeFromWire(Slice rawNode)
     bool const hashValid = false;
     SHAMapHash const hash;
 
-    if (type == kWIRE_TYPE_TRANSACTION)
+    if (type == kWireTypeTransaction)
         return makeTransaction(rawNode, hash, hashValid);
 
-    if (type == kWIRE_TYPE_ACCOUNT_STATE)
+    if (type == kWireTypeAccountState)
         return makeAccountState(rawNode, hash, hashValid);
 
-    if (type == kWIRE_TYPE_INNER)
+    if (type == kWireTypeInner)
         return SHAMapInnerNode::makeFullInner(rawNode, hash, hashValid);
 
-    if (type == kWIRE_TYPE_COMPRESSED_INNER)
+    if (type == kWireTypeCompressedInner)
         return SHAMapInnerNode::makeCompressedInner(rawNode);
 
-    if (type == kWIRE_TYPE_TRANSACTION_WITH_META)
+    if (type == kWireTypeTransactionWithMeta)
         return makeTransactionWithMeta(rawNode, hash, hashValid);
 
     Throw<std::runtime_error>("wire: Unknown type (" + std::to_string(type) + ")");
diff --git a/src/libxrpl/tx/SignerEntries.cpp b/src/libxrpl/tx/SignerEntries.cpp
index d425c86ca6..7251b8260f 100644
--- a/src/libxrpl/tx/SignerEntries.cpp
+++ b/src/libxrpl/tx/SignerEntries.cpp
@@ -28,7 +28,7 @@ SignerEntries::deserialize(STObject const& obj, beast::Journal journal, std::str
     }
 
     std::vector<SignerEntry> accountVec;
-    accountVec.reserve(STTx::kMAX_MULTI_SIGNERS);
+    accountVec.reserve(STTx::kMaxMultiSigners);
 
     STArray const& sEntries(obj.getFieldArray(sfSignerEntries));
     for (STObject const& sEntry : sEntries)
diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp
index 6af781145c..81a30fc5ef 100644
--- a/src/libxrpl/tx/Transactor.cpp
+++ b/src/libxrpl/tx/Transactor.cpp
@@ -89,7 +89,7 @@ preflight0(PreflightContext const& ctx, std::uint32_t flagMask)
 
     auto const txID = ctx.tx.getTransactionID();
 
-    if (txID == beast::kZERO)
+    if (txID == beast::kZero)
     {
         JLOG(ctx.j.warn()) << "applyTransaction: transaction id may not be zero";
         return temINVALID;
@@ -182,7 +182,7 @@ Transactor::preflight1(PreflightContext const& ctx, std::uint32_t flagMask)
         return ret;
 
     auto const id = ctx.tx.getAccountID(sfAccount);
-    if (id == beast::kZERO)
+    if (id == beast::kZero)
     {
         JLOG(ctx.j.warn()) << "preflight1: bad account id";
         return temBAD_SRC_ACCOUNT;
@@ -361,14 +361,14 @@ Transactor::checkFee(PreclaimContext const& ctx, XRPAmount baseFee)
 
     if ((ctx.flags & TapBatch) != 0u)
     {
-        if (feePaid == beast::kZERO)
+        if (feePaid == beast::kZero)
             return tesSUCCESS;
 
         JLOG(ctx.j.trace()) << "Batch: Fee must be zero.";
         return temBAD_FEE;  // LCOV_EXCL_LINE
     }
 
-    if (!isLegalAmount(feePaid) || feePaid < beast::kZERO)
+    if (!isLegalAmount(feePaid) || feePaid < beast::kZero)
         return temBAD_FEE;
 
     // Only check fee is sufficient when the ledger is open.
@@ -384,7 +384,7 @@ Transactor::checkFee(PreclaimContext const& ctx, XRPAmount baseFee)
         }
     }
 
-    if (feePaid == beast::kZERO)
+    if (feePaid == beast::kZero)
         return tesSUCCESS;
 
     auto const id = ctx.tx.getFeePayer();
@@ -406,7 +406,7 @@ Transactor::checkFee(PreclaimContext const& ctx, XRPAmount baseFee)
         JLOG(ctx.j.trace()) << "Insufficient balance:" << " balance=" << to_string(balance)
                             << " paid=" << to_string(feePaid);
 
-        if ((balance > beast::kZERO) && !ctx.view.open())
+        if ((balance > beast::kZero) && !ctx.view.open())
         {
             // Closed ledger, non-zero balance, less than fee
             return tecINSUFF_FEE;
@@ -492,7 +492,7 @@ Transactor::checkSeqProxy(ReadView const& view, STTx const& tx, beast::Journal j
         }
 
         // Transaction can never succeed if the Ticket is not in the ledger.
-        if (!view.exists(keylet::kTICKET(id, tSeqProx)))
+        if (!view.exists(keylet::kTicket(id, tSeqProx)))
         {
             JLOG(j.trace()) << "applyTransaction: ticket already used or never created "
                             << "a_seq=" << aSeq << " t_seq=" << tSeqProx;
@@ -557,7 +557,7 @@ Transactor::ticketDelete(
 {
     // Delete the Ticket, adjust the account root ticket count, and
     // reduce the owner count.
-    SLE::pointer const sleTicket = view.peek(keylet::kTICKET(ticketIndex));
+    SLE::pointer const sleTicket = view.peek(keylet::kTicket(ticketIndex));
     if (!sleTicket)
     {
         // LCOV_EXCL_START
@@ -617,7 +617,7 @@ Transactor::ticketDelete(
 void
 Transactor::preCompute()
 {
-    XRPL_ASSERT(account_ != beast::kZERO, "xrpl::Transactor::preCompute : nonzero account");
+    XRPL_ASSERT(account_ != beast::kZero, "xrpl::Transactor::preCompute : nonzero account");
 }
 
 TER
@@ -632,7 +632,7 @@ Transactor::apply()
     // sle must exist except for transactions
     // that allow zero account.
     XRPL_ASSERT(
-        sle != nullptr || account_ == beast::kZERO,
+        sle != nullptr || account_ == beast::kZero,
         "xrpl::Transactor::apply : non-null SLE or zero account");
 
     if (sle)
@@ -979,7 +979,7 @@ removeUnfundedOffers(ApplyView& view, std::vector<uint256> const& offers, beast:
         {
             // offer is unfunded
             offerDelete(view, sleOffer, viewJ);
-            if (++removed == kUNFUNDED_OFFER_REMOVE_LIMIT)
+            if (++removed == kUnfundedOfferRemoveLimit)
                 return;
         }
     }
@@ -998,7 +998,7 @@ removeExpiredNFTokenOffers(
         if (auto const offer = view.peek(keylet::nftoffer(index)))
         {
             nft::deleteTokenOffer(view, offer);
-            if (++removed == kEXPIRED_OFFER_REMOVE_LIMIT)
+            if (++removed == kExpiredOfferRemoveLimit)
                 return;
         }
     }
@@ -1027,7 +1027,7 @@ removeDeletedTrustLines(
     std::vector<uint256> const& trustLines,
     beast::Journal viewJ)
 {
-    if (trustLines.size() > kMAX_DELETABLE_AMM_TRUST_LINES)
+    if (trustLines.size() > kMaxDeletableAmmTrustLines)
     {
         JLOG(viewJ.error()) << "removeDeletedTrustLines: deleted trustlines exceed max "
                             << trustLines.size();
@@ -1079,17 +1079,17 @@ Transactor::reset(XRPAmount fee)
     // The account should never be missing from the ledger.  But if it
     // is missing then we can't very well charge it a fee, can we?
     if (!txnAcct)
-        return {tefINTERNAL, beast::kZERO};
+        return {tefINTERNAL, beast::kZero};
 
     auto const payerSle = view().peek(keylet::account(ctx_.tx.getFeePayer()));
     if (!payerSle)
-        return {tefINTERNAL, beast::kZERO};  // LCOV_EXCL_LINE
+        return {tefINTERNAL, beast::kZero};  // LCOV_EXCL_LINE
 
     auto const balance = payerSle->getFieldAmount(sfBalance).xrp();
 
     // balance should have already been checked in checkFee / preFlight.
     XRPL_ASSERT(
-        balance != beast::kZERO && (!view().open() || balance >= fee),
+        balance != beast::kZero && (!view().open() || balance >= fee),
         "xrpl::Transactor::reset : valid balance");
 
     // We retry/reject the transaction if the account balance is zero or
@@ -1233,7 +1233,7 @@ Transactor::operator()()
     bool applied = isTesSuccess(result);
     auto fee = ctx_.tx.getFieldAmount(sfFee).xrp();
 
-    if (ctx_.size() > kOVERSIZE_META_DATA_CAP)
+    if (ctx_.size() > kOversizeMetaDataCap)
         result = tecOVERSIZE;
 
     if (isTecClaim(result) && ((view().flags() & TapFailHard) != 0u))
@@ -1388,14 +1388,14 @@ Transactor::operator()()
         // The transactor and invariant checkers guarantee that this will
         // *never* trigger but if it, somehow, happens, don't allow a tx
         // that charges a negative fee.
-        if (fee < beast::kZERO)
+        if (fee < beast::kZero)
             Throw<std::logic_error>("fee charged is negative!");
 
         // Charge whatever fee they specified. The fee has already been
         // deducted from the balance of the account that issued the
         // transaction. We just need to account for it in the ledger
         // header.
-        if (!view().open() && fee != beast::kZERO)
+        if (!view().open() && fee != beast::kZero)
             ctx_.destroyXRP(fee);
 
         // Once we call apply, we will no longer be able to look at view()
diff --git a/src/libxrpl/tx/apply.cpp b/src/libxrpl/tx/apply.cpp
index 228d15778f..0fc0275eb0 100644
--- a/src/libxrpl/tx/apply.cpp
+++ b/src/libxrpl/tx/apply.cpp
@@ -27,10 +27,10 @@ namespace xrpl {
 
 // These are the same flags defined as HashRouterFlags::PRIVATE1-4 in
 // HashRouter.h
-constexpr HashRouterFlags kSF_SIGBAD = HashRouterFlags::PRIVATE1;     // Signature is bad
-constexpr HashRouterFlags kSF_SIGGOOD = HashRouterFlags::PRIVATE2;    // Signature is good
-constexpr HashRouterFlags kSF_LOCALBAD = HashRouterFlags::PRIVATE3;   // Local checks failed
-constexpr HashRouterFlags kSF_LOCALGOOD = HashRouterFlags::PRIVATE4;  // Local checks passed
+constexpr HashRouterFlags kSfSigbad = HashRouterFlags::PRIVATE1;     // Signature is bad
+constexpr HashRouterFlags kSfSiggood = HashRouterFlags::PRIVATE2;    // Signature is good
+constexpr HashRouterFlags kSfLocalbad = HashRouterFlags::PRIVATE3;   // Local checks failed
+constexpr HashRouterFlags kSfLocalgood = HashRouterFlags::PRIVATE4;  // Local checks passed
 
 //------------------------------------------------------------------------------
 
@@ -57,41 +57,41 @@ checkValidity(HashRouter& router, STTx const& tx, Rules const& rules)
             std::string reason;
             if (!passesLocalChecks(tx, reason))
             {
-                router.setFlags(id, kSF_LOCALBAD);
+                router.setFlags(id, kSfLocalbad);
                 return {Validity::SigGoodOnly, reason};
             }
 
-            router.setFlags(id, kSF_SIGGOOD);
+            router.setFlags(id, kSfSiggood);
             return {Validity::Valid, ""};
         }
     }
 
-    if (any(flags & kSF_SIGBAD))
+    if (any(flags & kSfSigbad))
     {
         // Signature is known bad
         return {Validity::SigBad, "Transaction has bad signature."};
     }
 
-    if (!any(flags & kSF_SIGGOOD))
+    if (!any(flags & kSfSiggood))
     {
         auto const sigVerify = tx.checkSign(rules);
         if (!sigVerify)
         {
-            router.setFlags(id, kSF_SIGBAD);
+            router.setFlags(id, kSfSigbad);
             return {Validity::SigBad, sigVerify.error()};
         }
-        router.setFlags(id, kSF_SIGGOOD);
+        router.setFlags(id, kSfSiggood);
     }
 
     // Signature is now known good
-    if (any(flags & kSF_LOCALBAD))
+    if (any(flags & kSfLocalbad))
     {
         // ...but the local checks
         // are known bad.
         return {Validity::SigGoodOnly, "Local checks failed."};
     }
 
-    if (any(flags & kSF_LOCALGOOD))
+    if (any(flags & kSfLocalgood))
     {
         // ...and the local checks
         // are known good.
@@ -102,10 +102,10 @@ checkValidity(HashRouter& router, STTx const& tx, Rules const& rules)
     std::string reason;
     if (!passesLocalChecks(tx, reason))
     {
-        router.setFlags(id, kSF_LOCALBAD);
+        router.setFlags(id, kSfLocalbad);
         return {Validity::SigGoodOnly, reason};
     }
-    router.setFlags(id, kSF_LOCALGOOD);
+    router.setFlags(id, kSfLocalgood);
     return {Validity::Valid, ""};
 }
 
@@ -116,10 +116,10 @@ forceValidity(HashRouter& router, uint256 const& txid, Validity validity)
     switch (validity)
     {
         case Validity::Valid:
-            flags |= kSF_LOCALGOOD;
+            flags |= kSfLocalgood;
             [[fallthrough]];
         case Validity::SigGoodOnly:
-            flags |= kSF_SIGGOOD;
+            flags |= kSfSiggood;
             [[fallthrough]];
         case Validity::SigBad:
             // would be silly to call directly
@@ -173,7 +173,7 @@ applyBatchTransactions(
     auto const mode = batchTxn.getFlags();
 
     auto applyOneTransaction = [&registry, &j, &parentBatchId, &batchView](STTx const& tx) {
-        OpenView perTxBatchView(kBATCH_VIEW, batchView);
+        OpenView perTxBatchView(kBatchView, batchView);
 
         auto const ret = apply(registry, perTxBatchView, parentBatchId, tx, TapBatch, j);
         XRPL_ASSERT(
@@ -247,7 +247,7 @@ applyTransaction(
             // its inner transactions as necessary.
             if (isTesSuccess(result.ter) && txn.getTxnType() == ttBATCH)
             {
-                OpenView wholeBatchView(kBATCH_VIEW, view);
+                OpenView wholeBatchView(kBatchView, view);
 
                 if (applyBatchTransactions(registry, wholeBatchView, txn, j))
                     wholeBatchView.apply(view);
diff --git a/src/libxrpl/tx/applySteps.cpp b/src/libxrpl/tx/applySteps.cpp
index 99b3425275..e0b1af80e2 100644
--- a/src/libxrpl/tx/applySteps.cpp
+++ b/src/libxrpl/tx/applySteps.cpp
@@ -106,7 +106,7 @@ withTxnType(Rules const& rules, TxType txnType, F&& f)
 }
 }  // namespace
 
-// Templates so preflight does the right thing with T::kCONSEQUENCES_FACTORY.
+// Templates so preflight does the right thing with T::kConsequencesFactory.
 //
 // This could be done more easily using if constexpr, but Visual Studio
 // 2017 doesn't handle if constexpr correctly.  So once we're no longer
@@ -117,7 +117,7 @@ withTxnType(Rules const& rules, TxType txnType, F&& f)
 //
 
 template <class T>
-    requires(T::kCONSEQUENCES_FACTORY == Transactor::ConsequencesFactoryType::Normal)
+    requires(T::kConsequencesFactory == Transactor::ConsequencesFactoryType::Normal)
 TxConsequences
 consequencesHelper(PreflightContext const& ctx)
 {
@@ -126,7 +126,7 @@ consequencesHelper(PreflightContext const& ctx)
 
 // For ConsequencesFactoryType::Blocker
 template <class T>
-    requires(T::kCONSEQUENCES_FACTORY == Transactor::ConsequencesFactoryType::Blocker)
+    requires(T::kConsequencesFactory == Transactor::ConsequencesFactoryType::Blocker)
 TxConsequences
 consequencesHelper(PreflightContext const& ctx)
 {
@@ -135,7 +135,7 @@ consequencesHelper(PreflightContext const& ctx)
 
 // For ConsequencesFactoryType::Custom
 template <class T>
-    requires(T::kCONSEQUENCES_FACTORY == Transactor::ConsequencesFactoryType::Custom)
+    requires(T::kConsequencesFactory == Transactor::ConsequencesFactoryType::Custom)
 TxConsequences
 consequencesHelper(PreflightContext const& ctx)
 {
@@ -186,7 +186,7 @@ invokePreclaim(PreclaimContext const& ctx)
             // a flagged a failure.
             auto const id = ctx.tx.getAccountID(sfAccount);
 
-            if (id != beast::kZERO)
+            if (id != beast::kZero)
             {
                 if (NotTEC const preSigResult = [&]() -> NotTEC {
                         if (NotTEC const result = T::checkSeqProxy(ctx.view, ctx.tx, ctx.j))
@@ -259,8 +259,8 @@ invokeCalculateBaseFee(ReadView const& view, STTx const& tx)
 
 TxConsequences::TxConsequences(NotTEC pfResult)
     : isBlocker_(false)
-    , fee_(beast::kZERO)
-    , potentialSpend_(beast::kZERO)
+    , fee_(beast::kZero)
+    , potentialSpend_(beast::kZero)
     , seqProx_(SeqProxy::sequence(0))
     , sequencesConsumed_(0)
 {
@@ -270,8 +270,8 @@ TxConsequences::TxConsequences(NotTEC pfResult)
 
 TxConsequences::TxConsequences(STTx const& tx)
     : isBlocker_(false)
-    , fee_(tx[sfFee].native() && !tx[sfFee].negative() ? tx[sfFee].xrp() : beast::kZERO)
-    , potentialSpend_(beast::kZERO)
+    , fee_(tx[sfFee].native() && !tx[sfFee].negative() ? tx[sfFee].xrp() : beast::kZero)
+    , potentialSpend_(beast::kZero)
     , seqProx_(tx.getSeqProxy())
     , sequencesConsumed_(tx.getSeqProxy().isSeq() ? 1 : 0)
 {
diff --git a/src/libxrpl/tx/invariants/AMMInvariant.cpp b/src/libxrpl/tx/invariants/AMMInvariant.cpp
index 18c37b9eaf..e13684eca5 100644
--- a/src/libxrpl/tx/invariants/AMMInvariant.cpp
+++ b/src/libxrpl/tx/invariants/AMMInvariant.cpp
@@ -69,11 +69,11 @@ validBalances(
     ValidAMM::ZeroAllowed zeroAllowed)
 {
     bool const positive =
-        amount > beast::kZERO && amount2 > beast::kZERO && lptAMMBalance > beast::kZERO;
+        amount > beast::kZero && amount2 > beast::kZero && lptAMMBalance > beast::kZero;
     if (zeroAllowed == ValidAMM::ZeroAllowed::Yes)
     {
         return positive ||
-            (amount == beast::kZERO && amount2 == beast::kZERO && lptAMMBalance == beast::kZERO);
+            (amount == beast::kZero && amount2 == beast::kZero && lptAMMBalance == beast::kZero);
     }
     return positive;
 }
@@ -111,7 +111,7 @@ ValidAMM::finalizeBid(bool enforce, beast::Journal const& j) const
     // LPTokens are burnt, therefore there should be fewer LPTokens
     else if (
         lptAMMBalanceBefore_ && lptAMMBalanceAfter_ &&
-        (*lptAMMBalanceAfter_ > *lptAMMBalanceBefore_ || *lptAMMBalanceAfter_ <= beast::kZERO))
+        (*lptAMMBalanceAfter_ > *lptAMMBalanceBefore_ || *lptAMMBalanceAfter_ <= beast::kZero))
     {
         // LCOV_EXCL_START
         JLOG(j.error()) << "AMMBid invariant failed: " << *lptAMMBalanceBefore_ << " "
@@ -227,7 +227,7 @@ ValidAMM::generalInvariant(
     bool const strongInvariantCheck = poolProductMean >= *lptAMMBalanceAfter_;
     // Allow for a small relative error if strongInvariantCheck fails
     auto weakInvariantCheck = [&]() {
-        return *lptAMMBalanceAfter_ != beast::kZERO &&
+        return *lptAMMBalanceAfter_ != beast::kZero &&
             withinRelativeDistance(poolProductMean, Number{*lptAMMBalanceAfter_}, Number{1, -11});
     };
     if (!nonNegativeBalances || (!strongInvariantCheck && !weakInvariantCheck()))
@@ -236,7 +236,7 @@ ValidAMM::generalInvariant(
                         << " invariant failed: " << tx.getHash(HashPrefix::TransactionId) << " "
                         << ammPoolChanged_ << " " << amount << " " << amount2 << " "
                         << poolProductMean << " " << lptAMMBalanceAfter_->getText() << " "
-                        << ((*lptAMMBalanceAfter_ == beast::kZERO)
+                        << ((*lptAMMBalanceAfter_ == beast::kZero)
                                 ? Number{1}
                                 : ((*lptAMMBalanceAfter_ - poolProductMean) / poolProductMean));
         return false;
diff --git a/src/libxrpl/tx/invariants/InvariantCheck.cpp b/src/libxrpl/tx/invariants/InvariantCheck.cpp
index a945b0f117..2019e378e2 100644
--- a/src/libxrpl/tx/invariants/InvariantCheck.cpp
+++ b/src/libxrpl/tx/invariants/InvariantCheck.cpp
@@ -89,7 +89,7 @@ TransactionFeeCheck::finalize(
 
     // We should never charge a fee that's greater than or equal to the
     // entire XRP supply.
-    if (fee >= kINITIAL_XRP)
+    if (fee >= kInitialXrp)
     {
         JLOG(j.fatal()) << "Invariant failed: fee paid exceeds system limit: " << fee.drops();
         return false;
@@ -205,7 +205,7 @@ XRPBalanceChecks::visitEntry(
 
         // Can't have more than the number of drops instantiated
         // in the genesis ledger.
-        if (drops > kINITIAL_XRP)
+        if (drops > kInitialXrp)
             return true;
 
         // Can't have a negative balance (0 is OK)
@@ -249,10 +249,10 @@ NoBadOffers::visitEntry(
 {
     auto isBad = [](STAmount const& pays, STAmount const& gets) {
         // An offer should never be negative
-        if (pays < beast::kZERO)
+        if (pays < beast::kZero)
             return true;
 
-        if (gets < beast::kZERO)
+        if (gets < beast::kZero)
             return true;
 
         // Can't have an XRP to XRP offer:
@@ -298,7 +298,7 @@ NoZeroEscrow::visitEntry(
             if (amount.xrp() <= XRPAmount{0})
                 return true;
 
-            if (amount.xrp() >= kINITIAL_XRP)
+            if (amount.xrp() >= kInitialXrp)
                 return true;
         }
         else
@@ -306,7 +306,7 @@ NoZeroEscrow::visitEntry(
             return amount.asset().visit(
                 [&](Issue const& issue) {
                     // IOU case
-                    if (amount <= beast::kZERO)
+                    if (amount <= beast::kZero)
                         return true;
 
                     if (badCurrency() == issue.currency)
@@ -318,10 +318,10 @@ NoZeroEscrow::visitEntry(
                 // MPT case
                 ,
                 [&](MPTIssue const&) {
-                    if (amount <= beast::kZERO)
+                    if (amount <= beast::kZero)
                         return true;
 
-                    if (amount.mpt() > MPTAmount{kMAX_MP_TOKEN_AMOUNT})
+                    if (amount.mpt() > MPTAmount{kMaxMpTokenAmount})
                         return true;  // LCOV_EXCL_LINE
 
                     return false;
@@ -337,7 +337,7 @@ NoZeroEscrow::visitEntry(
         bad_ |= isBad((*after)[sfAmount]);
 
     auto checkAmount = [this](std::int64_t amount) {
-        if (amount > kMAX_MP_TOKEN_AMOUNT || amount < 0)
+        if (amount > kMaxMpTokenAmount || amount < 0)
             bad_ |= true;
     };
 
@@ -501,7 +501,7 @@ AccountRootsDeletedClean::finalize(
     {
         auto const accountID = before->getAccountID(sfAccount);
         // An account should not be deleted with a balance
-        if (after->at(sfBalance) != beast::kZERO)
+        if (after->at(sfBalance) != beast::kZero)
         {
             JLOG(j.fatal()) << "Invariant failed: account deletion left "
                                "behind a non-zero balance";
@@ -525,7 +525,7 @@ AccountRootsDeletedClean::finalize(
                 return false;
         }
         // Simple types
-        for (auto const& [keyletfunc, _1, _2] : kDIRECT_ACCOUNT_KEYLETS)
+        for (auto const& [keyletfunc, _1, _2] : kDirectAccountKeylets)
         {
             // TODO: use '_' for both unused variables above once we are in C++26
             if (objectExists(std::invoke(keyletfunc, accountID)) && enforce)
@@ -990,9 +990,7 @@ NoModifiedUnmodifiableFields::finalize(
     ReadView const& view,
     beast::Journal const& j)
 {
-    static auto const kFIELD_CHANGED = [](auto const& before,
-                                          auto const& after,
-                                          auto const& field) {
+    static auto const kFieldChanged = [](auto const& before, auto const& after, auto const& field) {
         bool const beforeField = before->isFieldPresent(field);
         bool const afterField = after->isFieldPresent(field);
         return beforeField != afterField || (afterField && before->at(field) != after->at(field));
@@ -1013,17 +1011,17 @@ NoModifiedUnmodifiableFields::finalize(
                  * potential issues even when the amendment is disabled.
                  */
                 enforce = view.rules().enabled(featureLendingProtocol);
-                bad = kFIELD_CHANGED(before, after, sfLedgerEntryType) ||
-                    kFIELD_CHANGED(before, after, sfLedgerIndex) ||
-                    kFIELD_CHANGED(before, after, sfSequence) ||
-                    kFIELD_CHANGED(before, after, sfOwnerNode) ||
-                    kFIELD_CHANGED(before, after, sfVaultNode) ||
-                    kFIELD_CHANGED(before, after, sfVaultID) ||
-                    kFIELD_CHANGED(before, after, sfAccount) ||
-                    kFIELD_CHANGED(before, after, sfOwner) ||
-                    kFIELD_CHANGED(before, after, sfManagementFeeRate) ||
-                    kFIELD_CHANGED(before, after, sfCoverRateMinimum) ||
-                    kFIELD_CHANGED(before, after, sfCoverRateLiquidation);
+                bad = kFieldChanged(before, after, sfLedgerEntryType) ||
+                    kFieldChanged(before, after, sfLedgerIndex) ||
+                    kFieldChanged(before, after, sfSequence) ||
+                    kFieldChanged(before, after, sfOwnerNode) ||
+                    kFieldChanged(before, after, sfVaultNode) ||
+                    kFieldChanged(before, after, sfVaultID) ||
+                    kFieldChanged(before, after, sfAccount) ||
+                    kFieldChanged(before, after, sfOwner) ||
+                    kFieldChanged(before, after, sfManagementFeeRate) ||
+                    kFieldChanged(before, after, sfCoverRateMinimum) ||
+                    kFieldChanged(before, after, sfCoverRateLiquidation);
                 break;
             case ltLOAN:
                 /*
@@ -1032,26 +1030,26 @@ NoModifiedUnmodifiableFields::finalize(
                  * potential issues even when the amendment is disabled.
                  */
                 enforce = view.rules().enabled(featureLendingProtocol);
-                bad = kFIELD_CHANGED(before, after, sfLedgerEntryType) ||
-                    kFIELD_CHANGED(before, after, sfLedgerIndex) ||
-                    kFIELD_CHANGED(before, after, sfSequence) ||
-                    kFIELD_CHANGED(before, after, sfOwnerNode) ||
-                    kFIELD_CHANGED(before, after, sfLoanBrokerNode) ||
-                    kFIELD_CHANGED(before, after, sfLoanBrokerID) ||
-                    kFIELD_CHANGED(before, after, sfBorrower) ||
-                    kFIELD_CHANGED(before, after, sfLoanOriginationFee) ||
-                    kFIELD_CHANGED(before, after, sfLoanServiceFee) ||
-                    kFIELD_CHANGED(before, after, sfLatePaymentFee) ||
-                    kFIELD_CHANGED(before, after, sfClosePaymentFee) ||
-                    kFIELD_CHANGED(before, after, sfOverpaymentFee) ||
-                    kFIELD_CHANGED(before, after, sfInterestRate) ||
-                    kFIELD_CHANGED(before, after, sfLateInterestRate) ||
-                    kFIELD_CHANGED(before, after, sfCloseInterestRate) ||
-                    kFIELD_CHANGED(before, after, sfOverpaymentInterestRate) ||
-                    kFIELD_CHANGED(before, after, sfStartDate) ||
-                    kFIELD_CHANGED(before, after, sfPaymentInterval) ||
-                    kFIELD_CHANGED(before, after, sfGracePeriod) ||
-                    kFIELD_CHANGED(before, after, sfLoanScale);
+                bad = kFieldChanged(before, after, sfLedgerEntryType) ||
+                    kFieldChanged(before, after, sfLedgerIndex) ||
+                    kFieldChanged(before, after, sfSequence) ||
+                    kFieldChanged(before, after, sfOwnerNode) ||
+                    kFieldChanged(before, after, sfLoanBrokerNode) ||
+                    kFieldChanged(before, after, sfLoanBrokerID) ||
+                    kFieldChanged(before, after, sfBorrower) ||
+                    kFieldChanged(before, after, sfLoanOriginationFee) ||
+                    kFieldChanged(before, after, sfLoanServiceFee) ||
+                    kFieldChanged(before, after, sfLatePaymentFee) ||
+                    kFieldChanged(before, after, sfClosePaymentFee) ||
+                    kFieldChanged(before, after, sfOverpaymentFee) ||
+                    kFieldChanged(before, after, sfInterestRate) ||
+                    kFieldChanged(before, after, sfLateInterestRate) ||
+                    kFieldChanged(before, after, sfCloseInterestRate) ||
+                    kFieldChanged(before, after, sfOverpaymentInterestRate) ||
+                    kFieldChanged(before, after, sfStartDate) ||
+                    kFieldChanged(before, after, sfPaymentInterval) ||
+                    kFieldChanged(before, after, sfGracePeriod) ||
+                    kFieldChanged(before, after, sfLoanScale);
                 break;
             default:
                 /*
@@ -1064,8 +1062,8 @@ NoModifiedUnmodifiableFields::finalize(
                  * was added.
                  */
                 enforce = view.rules().enabled(featureLendingProtocol);
-                bad = kFIELD_CHANGED(before, after, sfLedgerEntryType) ||
-                    kFIELD_CHANGED(before, after, sfLedgerIndex);
+                bad = kFieldChanged(before, after, sfLedgerEntryType) ||
+                    kFieldChanged(before, after, sfLedgerIndex);
         }
         XRPL_ASSERT(
             !bad || enforce,
diff --git a/src/libxrpl/tx/invariants/LoanInvariant.cpp b/src/libxrpl/tx/invariants/LoanInvariant.cpp
index e3dff3dde9..3eef0957e5 100644
--- a/src/libxrpl/tx/invariants/LoanInvariant.cpp
+++ b/src/libxrpl/tx/invariants/LoanInvariant.cpp
@@ -44,9 +44,9 @@ ValidLoan::finalize(
         // https://github.com/Tapanito/XRPL-Standards/blob/xls-66-lending-protocol/XLS-0066d-lending-protocol/README.md#3223-invariants
         // If `Loan.PaymentRemaining = 0` then the loan MUST be fully paid off
         if (after->at(sfPaymentRemaining) == 0 &&
-            (after->at(sfTotalValueOutstanding) != beast::kZERO ||
-             after->at(sfPrincipalOutstanding) != beast::kZERO ||
-             after->at(sfManagementFeeOutstanding) != beast::kZERO))
+            (after->at(sfTotalValueOutstanding) != beast::kZero ||
+             after->at(sfPrincipalOutstanding) != beast::kZero ||
+             after->at(sfManagementFeeOutstanding) != beast::kZero))
         {
             JLOG(j.fatal()) << "Invariant failed: Loan with zero payments "
                                "remaining has not been paid off";
@@ -55,9 +55,9 @@ ValidLoan::finalize(
         // If `Loan.PaymentRemaining != 0` then the loan MUST NOT be fully paid
         // off
         if (after->at(sfPaymentRemaining) != 0 &&
-            after->at(sfTotalValueOutstanding) == beast::kZERO &&
-            after->at(sfPrincipalOutstanding) == beast::kZERO &&
-            after->at(sfManagementFeeOutstanding) == beast::kZERO)
+            after->at(sfTotalValueOutstanding) == beast::kZero &&
+            after->at(sfPrincipalOutstanding) == beast::kZero &&
+            after->at(sfManagementFeeOutstanding) == beast::kZero)
         {
             JLOG(j.fatal()) << "Invariant failed: Fully paid off Loan still has payments remaining";
             return false;
diff --git a/src/libxrpl/tx/invariants/MPTInvariant.cpp b/src/libxrpl/tx/invariants/MPTInvariant.cpp
index 9b8838f145..43379b0b86 100644
--- a/src/libxrpl/tx/invariants/MPTInvariant.cpp
+++ b/src/libxrpl/tx/invariants/MPTInvariant.cpp
@@ -299,7 +299,7 @@ ValidMPTPayment::visitEntry(
         if (type == ltMPTOKEN_ISSUANCE)
         {
             auto const outstanding = sle[sfOutstandingAmount];
-            if (outstanding > kMAX_MP_TOKEN_AMOUNT)
+            if (outstanding > kMaxMpTokenAmount)
             {
                 overflow_ = true;
                 return false;
@@ -310,8 +310,8 @@ ValidMPTPayment::visitEntry(
         {
             auto const mptAmt = sle[sfMPTAmount];
             auto const lockedAmt = sle[~sfLockedAmount].value_or(0);
-            if (mptAmt > kMAX_MP_TOKEN_AMOUNT || lockedAmt > kMAX_MP_TOKEN_AMOUNT ||
-                lockedAmt > (kMAX_MP_TOKEN_AMOUNT - mptAmt))
+            if (mptAmt > kMaxMpTokenAmount || lockedAmt > kMaxMpTokenAmount ||
+                lockedAmt > (kMaxMpTokenAmount - mptAmt))
             {
                 overflow_ = true;
                 return false;
@@ -361,21 +361,20 @@ ValidMPTPayment::finalize(
             return !enforce;
         }
 
-        auto const signedMax = static_cast<std::int64_t>(kMAX_MP_TOKEN_AMOUNT);
+        auto const signedMax = static_cast<std::int64_t>(kMaxMpTokenAmount);
         for (auto const& [id, data] : data_)
         {
             (void)id;
-            constexpr auto kI_BEFORE = static_cast<std::size_t>(Order::Before);
-            constexpr auto kI_AFTER = static_cast<std::size_t>(Order::After);
+            static constexpr auto kIBefore = static_cast<std::size_t>(Order::Before);
+            static constexpr auto kIAfter = static_cast<std::size_t>(Order::After);
             bool const addOverflows =
-                (data.mptAmount > 0 &&
-                 data.outstanding[kI_BEFORE] > (signedMax - data.mptAmount)) ||
-                (data.mptAmount < 0 && data.outstanding[kI_BEFORE] < (-signedMax - data.mptAmount));
+                (data.mptAmount > 0 && data.outstanding[kIBefore] > (signedMax - data.mptAmount)) ||
+                (data.mptAmount < 0 && data.outstanding[kIBefore] < (-signedMax - data.mptAmount));
             if (addOverflows ||
-                data.outstanding[kI_AFTER] != (data.outstanding[kI_BEFORE] + data.mptAmount))
+                data.outstanding[kIAfter] != (data.outstanding[kIBefore] + data.mptAmount))
             {
                 JLOG(j.fatal()) << "Invariant failed: invalid OutstandingAmount balance "
-                                << data.outstanding[kI_BEFORE] << " " << data.outstanding[kI_AFTER]
+                                << data.outstanding[kIBefore] << " " << data.outstanding[kIAfter]
                                 << " " << data.mptAmount;
                 return !enforce;
             }
diff --git a/src/libxrpl/tx/invariants/NFTInvariant.cpp b/src/libxrpl/tx/invariants/NFTInvariant.cpp
index da415d2ad8..09ae9db925 100644
--- a/src/libxrpl/tx/invariants/NFTInvariant.cpp
+++ b/src/libxrpl/tx/invariants/NFTInvariant.cpp
@@ -31,16 +31,16 @@ ValidNFTokenPage::visitEntry(
     std::shared_ptr<SLE const> const& before,
     std::shared_ptr<SLE const> const& after)
 {
-    static constexpr uint256 const& kPAGE_BITS = nft::kPAGE_MASK;
-    static constexpr uint256 const kACCOUNT_BITS = ~kPAGE_BITS;
+    static constexpr uint256 const& kPageBits = nft::kPageMask;
+    static constexpr uint256 kAccountBits = ~kPageBits;
 
     if ((before && before->getType() != ltNFTOKEN_PAGE) ||
         (after && after->getType() != ltNFTOKEN_PAGE))
         return;
 
     auto check = [this, isDelete](std::shared_ptr<SLE const> const& sle) {
-        uint256 const account = sle->key() & kACCOUNT_BITS;
-        uint256 const hiLimit = sle->key() & kPAGE_BITS;
+        uint256 const account = sle->key() & kAccountBits;
+        uint256 const hiLimit = sle->key() & kPageBits;
         std::optional<uint256> const prev = (*sle)[~sfPreviousPageMin];
 
         // Make sure that any page links...
@@ -48,19 +48,19 @@ ValidNFTokenPage::visitEntry(
         //  2. The page is correctly ordered between links.
         if (prev)
         {
-            if (account != (*prev & kACCOUNT_BITS))
+            if (account != (*prev & kAccountBits))
                 badLink_ = true;
 
-            if (hiLimit <= (*prev & kPAGE_BITS))
+            if (hiLimit <= (*prev & kPageBits))
                 badLink_ = true;
         }
 
         if (auto const next = (*sle)[~sfNextPageMin])
         {
-            if (account != (*next & kACCOUNT_BITS))
+            if (account != (*next & kAccountBits))
                 badLink_ = true;
 
-            if (hiLimit >= (*next & kPAGE_BITS))
+            if (hiLimit >= (*next & kPageBits))
                 badLink_ = true;
         }
 
@@ -69,12 +69,12 @@ ValidNFTokenPage::visitEntry(
 
             // An NFTokenPage should never contain too many tokens or be empty.
             if (std::size_t const nftokenCount = nftokens.size();
-                (!isDelete && nftokenCount == 0) || nftokenCount > kDIR_MAX_TOKENS_PER_PAGE)
+                (!isDelete && nftokenCount == 0) || nftokenCount > kDirMaxTokensPerPage)
                 invalidSize_ = true;
 
             // If prev is valid, use it to establish a lower bound for
             // page entries.  If prev is not valid the lower bound is zero.
-            uint256 const loLimit = prev ? *prev & kPAGE_BITS : uint256(beast::kZERO);
+            uint256 const loLimit = prev ? *prev & kPageBits : uint256(beast::kZero);
 
             // Also verify that all NFTokenIDs in the page are sorted.
             uint256 loCmp = loLimit;
@@ -87,7 +87,7 @@ ValidNFTokenPage::visitEntry(
 
                 // None of the NFTs on this page should belong on lower or
                 // higher pages.
-                if (uint256 const tokenPageBits = tokenID & kPAGE_BITS;
+                if (uint256 const tokenPageBits = tokenID & kPageBits;
                     tokenPageBits < loLimit || tokenPageBits >= hiLimit)
                     badEntry_ = true;
 
@@ -104,7 +104,7 @@ ValidNFTokenPage::visitEntry(
         // While an account's NFToken directory contains any NFTokens, the last
         // NFTokenPage (with 96 bits of 1 in the low part of the index) should
         // never be deleted.
-        if (isDelete && (before->key() & nft::kPAGE_MASK) == nft::kPAGE_MASK &&
+        if (isDelete && (before->key() & nft::kPageMask) == nft::kPageMask &&
             before->isFieldPresent(sfPreviousPageMin))
         {
             deletedFinalPage_ = true;
@@ -121,7 +121,7 @@ ValidNFTokenPage::visitEntry(
         //  2. This is not the last page in the directory
         // Then we have identified a corruption in the links between the
         // NFToken pages in the NFToken directory.
-        if ((before->key() & nft::kPAGE_MASK) != nft::kPAGE_MASK &&
+        if ((before->key() & nft::kPageMask) != nft::kPageMask &&
             before->isFieldPresent(sfNextPageMin) && !after->isFieldPresent(sfNextPageMin))
         {
             deletedLink_ = true;
diff --git a/src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp b/src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp
index 60cc897f99..93c1b2058e 100644
--- a/src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp
+++ b/src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp
@@ -77,7 +77,7 @@ ValidPermissionedDomain::finalize(
             return false;
         }
 
-        if (sleStatus.credentialsSize > kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE)
+        if (sleStatus.credentialsSize > kMaxPermissionedDomainCredentialsArraySize)
         {
             JLOG(j.fatal()) << "Invariant failed: permissioned domain bad "
                                "credentials size "
diff --git a/src/libxrpl/tx/invariants/VaultInvariant.cpp b/src/libxrpl/tx/invariants/VaultInvariant.cpp
index 0dad8c18a0..2947be3bd4 100644
--- a/src/libxrpl/tx/invariants/VaultInvariant.cpp
+++ b/src/libxrpl/tx/invariants/VaultInvariant.cpp
@@ -58,7 +58,7 @@ ValidVault::Shares::make(SLE const& from)
     ValidVault::Shares self;
     self.share = MPTIssue(makeMptID(from.getFieldU32(sfSequence), from.getAccountID(sfIssuer)));
     self.sharesTotal = from.at(sfOutstandingAmount);
-    self.sharesMaximum = from[~sfMaximumAmount].value_or(kMAX_MP_TOKEN_AMOUNT);
+    self.sharesMaximum = from[~sfMaximumAmount].value_or(kMaxMpTokenAmount);
     return self;
 }
 
@@ -81,7 +81,7 @@ ValidVault::visitEntry(
     // validation. It is used to validate that the change in account
     // balances matches the change in vault balances, stored to deltas_ at the
     // end of this function.
-    DeltaInfo balanceDelta{.delta = kNUM_ZERO, .scale = std::nullopt};
+    DeltaInfo balanceDelta{.delta = kNumZero, .scale = std::nullopt};
 
     std::int8_t sign = 0;
     if (before)
@@ -279,13 +279,13 @@ ValidVault::finalize(
                                "shares outstanding";
             result = false;
         }
-        if (beforeVault.assetsTotal != kZERO)
+        if (beforeVault.assetsTotal != kZero)
         {
             JLOG(j.fatal()) << "Invariant failed: deleted vault must have no "
                                "assets outstanding";
             result = false;
         }
-        if (beforeVault.assetsAvailable != kZERO)
+        if (beforeVault.assetsAvailable != kZero)
         {
             JLOG(j.fatal()) << "Invariant failed: deleted vault must have no "
                                "assets available";
@@ -348,13 +348,13 @@ ValidVault::finalize(
 
     if (updatedShares->sharesTotal == 0)
     {
-        if (afterVault.assetsTotal != kZERO)
+        if (afterVault.assetsTotal != kZero)
         {
             JLOG(j.fatal()) << "Invariant failed: updated zero sized "
                                "vault must have no assets outstanding";
             result = false;
         }
-        if (afterVault.assetsAvailable != kZERO)
+        if (afterVault.assetsAvailable != kZero)
         {
             JLOG(j.fatal()) << "Invariant failed: updated zero sized "
                                "vault must have no assets available";
@@ -369,7 +369,7 @@ ValidVault::finalize(
         result = false;
     }
 
-    if (afterVault.assetsAvailable < kZERO)
+    if (afterVault.assetsAvailable < kZero)
     {
         JLOG(j.fatal()) << "Invariant failed: assets available must be positive";
         result = false;
@@ -389,13 +389,13 @@ ValidVault::finalize(
         result = false;
     }
 
-    if (afterVault.assetsTotal < kZERO)
+    if (afterVault.assetsTotal < kZero)
     {
         JLOG(j.fatal()) << "Invariant failed: assets outstanding must be positive";
         result = false;
     }
 
-    if (afterVault.assetsMaximum < kZERO)
+    if (afterVault.assetsMaximum < kZero)
     {
         JLOG(j.fatal()) << "Invariant failed: assets maximum must be positive";
         result = false;
@@ -482,7 +482,7 @@ ValidVault::finalize(
             return ret;
 
         ret->delta += fee.drops();
-        if (ret->delta == kZERO)
+        if (ret->delta == kZero)
             return std::nullopt;
 
         return ret;
@@ -519,8 +519,8 @@ ValidVault::finalize(
                     result = false;
                 }
 
-                if (afterVault.assetsAvailable != kZERO || afterVault.assetsTotal != kZERO ||
-                    afterVault.lossUnrealized != kZERO || updatedShares->sharesTotal != 0)
+                if (afterVault.assetsAvailable != kZero || afterVault.assetsTotal != kZero ||
+                    afterVault.lossUnrealized != kZero || updatedShares->sharesTotal != 0)
                 {
                     JLOG(j.fatal())  //
                         << "Invariant failed: created vault must be empty";
@@ -586,7 +586,7 @@ ValidVault::finalize(
                     result = false;
                 }
 
-                if (afterVault.assetsMaximum > kZERO &&
+                if (afterVault.assetsMaximum > kZero &&
                     afterVault.assetsTotal > afterVault.assetsMaximum)
                 {
                     JLOG(j.fatal()) <<  //
@@ -652,7 +652,7 @@ ValidVault::finalize(
                     result = false;
                 }
 
-                if (vaultDeltaAssets <= kZERO)
+                if (vaultDeltaAssets <= kZero)
                 {
                     JLOG(j.fatal()) <<  //
                         "Invariant failed: deposit must increase vault balance";
@@ -685,7 +685,7 @@ ValidVault::finalize(
                     auto const localVaultDeltaAssets =
                         roundToAsset(vaultAsset, vaultDeltaAssets, localMinScale);
 
-                    if (accountDeltaAssets >= kZERO)
+                    if (accountDeltaAssets >= kZero)
                     {
                         JLOG(j.fatal()) <<  //
                             "Invariant failed: deposit must decrease depositor "
@@ -702,7 +702,7 @@ ValidVault::finalize(
                     }
                 }
 
-                if (afterVault.assetsMaximum > kZERO &&
+                if (afterVault.assetsMaximum > kZero &&
                     afterVault.assetsTotal > afterVault.assetsMaximum)
                 {
                     JLOG(j.fatal()) <<  //
@@ -721,7 +721,7 @@ ValidVault::finalize(
                 }
                 // We don't need to round shares, they are integral MPT
                 auto const& accountDeltaShares = *maybeAccDeltaShares;
-                if (accountDeltaShares.delta <= kZERO)
+                if (accountDeltaShares.delta <= kZero)
                 {
                     JLOG(j.fatal()) <<  //
                         "Invariant failed: deposit must increase depositor "
@@ -730,7 +730,7 @@ ValidVault::finalize(
                 }
 
                 auto const maybeVaultDeltaShares = deltaShares(afterVault.pseudoId);
-                if (!maybeVaultDeltaShares || maybeVaultDeltaShares->delta == kZERO)
+                if (!maybeVaultDeltaShares || maybeVaultDeltaShares->delta == kZero)
                 {
                     JLOG(j.fatal()) <<  //
                         "Invariant failed: deposit must change vault shares";
@@ -796,7 +796,7 @@ ValidVault::finalize(
                 auto const vaultPseudoDeltaAssets =
                     roundToAsset(vaultAsset, maybeVaultDeltaAssets->delta, minScale);
 
-                if (vaultPseudoDeltaAssets >= kZERO)
+                if (vaultPseudoDeltaAssets >= kZero)
                 {
                     JLOG(j.fatal()) << "Invariant failed: withdrawal must "
                                        "decrease vault balance";
@@ -841,7 +841,7 @@ ValidVault::finalize(
                     auto const roundedDestinationDelta =
                         roundToAsset(vaultAsset, destinationDelta.delta, localMinScale);
 
-                    if (roundedDestinationDelta <= kZERO)
+                    if (roundedDestinationDelta <= kZero)
                     {
                         JLOG(j.fatal()) <<  //
                             "Invariant failed: withdrawal must increase "
@@ -870,7 +870,7 @@ ValidVault::finalize(
                     return false;
                 }
 
-                if (accountDeltaShares->delta >= kZERO)
+                if (accountDeltaShares->delta >= kZero)
                 {
                     JLOG(j.fatal()) <<  //
                         "Invariant failed: withdrawal must decrease depositor "
@@ -880,7 +880,7 @@ ValidVault::finalize(
 
                 // We don't need to round shares, they are integral MPT
                 auto const vaultDeltaShares = deltaShares(afterVault.pseudoId);
-                if (!vaultDeltaShares || vaultDeltaShares->delta == kZERO)
+                if (!vaultDeltaShares || vaultDeltaShares->delta == kZero)
                 {
                     JLOG(j.fatal()) <<  //
                         "Invariant failed: withdrawal must change vault shares";
@@ -950,7 +950,7 @@ ValidVault::finalize(
                         computeCoarsestScale({*maybeVaultDeltaAssets, totalDelta, availableDelta});
                     auto const vaultDeltaAssets =
                         roundToAsset(vaultAsset, maybeVaultDeltaAssets->delta, minScale);
-                    if (vaultDeltaAssets >= kZERO)
+                    if (vaultDeltaAssets >= kZero)
                     {
                         JLOG(j.fatal()) <<  //
                             "Invariant failed: clawback must decrease vault "
@@ -995,7 +995,7 @@ ValidVault::finalize(
                         "Invariant failed: clawback must change holder shares";
                     return false;  // That's all we can do
                 }
-                if (maybeAccountDeltaShares->delta >= kZERO)
+                if (maybeAccountDeltaShares->delta >= kZero)
                 {
                     JLOG(j.fatal()) <<  //
                         "Invariant failed: clawback must decrease holder "
@@ -1005,7 +1005,7 @@ ValidVault::finalize(
 
                 // We don't need to round shares, they are integral MPT
                 auto const vaultDeltaShares = deltaShares(afterVault.pseudoId);
-                if (!vaultDeltaShares || vaultDeltaShares->delta == kZERO)
+                if (!vaultDeltaShares || vaultDeltaShares->delta == kZero)
                 {
                     JLOG(j.fatal()) <<  //
                         "Invariant failed: clawback must change vault shares";
@@ -1067,7 +1067,7 @@ ValidVault::computeCoarsestScale(std::vector<DeltaInfo> const& numbers)
         numbers, [](auto const& a, auto const& b) -> bool { return a.scale < b.scale; });
     XRPL_ASSERT_PARTS(
         max->scale, "xrpl::ValidVault::computeCoarsestScale", "scale set for destinationDelta");
-    return max->scale.value_or(STAmount::kMAX_OFFSET);
+    return max->scale.value_or(STAmount::kMaxOffset);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/tx/paths/AMMLiquidity.cpp b/src/libxrpl/tx/paths/AMMLiquidity.cpp
index 87eb29f104..0d1c66ead8 100644
--- a/src/libxrpl/tx/paths/AMMLiquidity.cpp
+++ b/src/libxrpl/tx/paths/AMMLiquidity.cpp
@@ -54,7 +54,7 @@ AMMLiquidity<TIn, TOut>::fetchBalances(ReadView const& view) const
     auto const amountIn = ammAccountHolds(view, ammAccountID_, assetIn_);
     auto const amountOut = ammAccountHolds(view, ammAccountID_, assetOut_);
     // This should not happen.
-    if (amountIn < beast::kZERO || amountOut < beast::kZERO)
+    if (amountIn < beast::kZero || amountOut < beast::kZero)
         Throw<std::runtime_error>("AMMLiquidity: invalid balances");
 
     return TAmounts{get<TIn>(amountIn), get<TOut>(amountOut)};
@@ -68,7 +68,7 @@ AMMLiquidity<TIn, TOut>::generateFibSeqOffer(TAmounts<TIn, TOut> const& balances
 
     cur.in = toAmount<TIn>(
         getAsset(balances.in),
-        kINITIAL_FIB_SEQ_PCT * initialBalances_.in,
+        kInitialFibSeqPct * initialBalances_.in,
         Number::RoundingMode::Upward);
     cur.out = swapAssetIn(initialBalances_, cur.in, tradingFee_);
 
@@ -76,7 +76,7 @@ AMMLiquidity<TIn, TOut>::generateFibSeqOffer(TAmounts<TIn, TOut> const& balances
         return cur;
 
     // clang-format off
-    constexpr std::uint32_t kFIB[AMMContext::kMAX_ITERATIONS] = {
+    static constexpr std::uint32_t kFib[AMMContext::kMaxIterations] = {
         1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987,
         1597, 2584, 4181, 6765, 10946, 17711, 28657, 46368, 75025, 121393,
         196418, 317811, 514229, 832040, 1346269};
@@ -88,7 +88,7 @@ AMMLiquidity<TIn, TOut>::generateFibSeqOffer(TAmounts<TIn, TOut> const& balances
 
     cur.out = toAmount<TOut>(
         getAsset(balances.out),
-        cur.out * kFIB[ammContext_.curIters() - 1],
+        cur.out * kFib[ammContext_.curIters() - 1],
         Number::RoundingMode::Downward);
     // swapAssetOut() returns negative in this case
     if (cur.out >= balances.out)
@@ -106,19 +106,19 @@ maxAmount()
 {
     if constexpr (std::is_same_v<T, XRPAmount>)
     {
-        return XRPAmount(STAmount::kMAX_NATIVE);
+        return XRPAmount(STAmount::kMaxNative);
     }
     else if constexpr (std::is_same_v<T, IOUAmount>)
     {
-        return IOUAmount(STAmount::kMAX_VALUE / 2, STAmount::kMAX_OFFSET);
+        return IOUAmount(STAmount::kMaxValue / 2, STAmount::kMaxOffset);
     }
     else if constexpr (std::is_same_v<T, STAmount>)
     {
-        return STAmount(STAmount::kMAX_VALUE / 2, STAmount::kMAX_OFFSET);
+        return STAmount(STAmount::kMaxValue / 2, STAmount::kMaxOffset);
     }
     else if constexpr (std::is_same_v<T, MPTAmount>)
     {
-        return MPTAmount(kMAX_MP_TOKEN_AMOUNT);
+        return MPTAmount(kMaxMpTokenAmount);
     }
 }
 
@@ -163,7 +163,7 @@ AMMLiquidity<TIn, TOut>::getOffer(ReadView const& view, std::optional<Quality> c
     auto const balances = fetchBalances(view);
 
     // Frozen accounts
-    if (balances.in == beast::kZERO || balances.out == beast::kZERO)
+    if (balances.in == beast::kZero || balances.out == beast::kZero)
     {
         JLOG(j_.debug()) << "AMMLiquidity::getOffer, frozen accounts";
         return std::nullopt;
@@ -239,7 +239,7 @@ AMMLiquidity<TIn, TOut>::getOffer(ReadView const& view, std::optional<Quality> c
 
     if (offer)
     {
-        if (offer->amount().in > beast::kZERO && offer->amount().out > beast::kZERO)
+        if (offer->amount().in > beast::kZero && offer->amount().out > beast::kZero)
         {
             JLOG(j_.trace()) << "AMMLiquidity::getOffer, created " << to_string(offer->amount().in)
                              << "/" << assetIn_ << " " << to_string(offer->amount().out) << "/"
diff --git a/src/libxrpl/tx/paths/BookStep.cpp b/src/libxrpl/tx/paths/BookStep.cpp
index 4fde4fe58e..0391aa5f77 100644
--- a/src/libxrpl/tx/paths/BookStep.cpp
+++ b/src/libxrpl/tx/paths/BookStep.cpp
@@ -57,7 +57,7 @@ class BookStep : public StepImp<TIn, TOut, BookStep<TIn, TOut, TDerived>>
 protected:
     enum class OfferType { Amm, Clob };
 
-    static constexpr uint32_t kMAX_OFFERS_TO_CONSUME{1000};
+    static constexpr uint32_t kMaxOffersToConsume{1000};
     Book book_;
     AccountID strandSrc_;
     AccountID strandDst_;
@@ -104,7 +104,7 @@ private:
         , strandDeliver_(ctx.strandDeliver)
     {
         if (auto const ammSle = ctx.view.read(keylet::amm(in, out));
-            ammSle && ammSle->getFieldAmount(sfLPTokenBalance) != beast::kZERO)
+            ammSle && ammSle->getFieldAmount(sfLPTokenBalance) != beast::kZero)
         {
             ammLiquidity_.emplace(
                 ctx.view,
@@ -350,12 +350,12 @@ public:
         // Calculate amount that goes to the taker and the amount charged the
         // offer owner
         auto const trIn =
-            redeems(prevStepDir) ? this->rate(v, this->book_.in, this->strandDst_) : kPARITY_RATE;
+            redeems(prevStepDir) ? this->rate(v, this->book_.in, this->strandDst_) : kParityRate;
         // Always charge the transfer fee, even if the owner is the issuer,
         // unless the fee is waived
         auto const trOut = (this->ownerPaysTransferFee_ && waiveFee == WaiveTransferFee::No)
             ? this->rate(v, this->book_.out, this->strandDst_)
-            : kPARITY_RATE;
+            : kParityRate;
 
         Quality const q1{getRate(STAmount(trOut.value), STAmount(trIn.value))};
         return composedQuality(q1, ofrQ);
@@ -537,9 +537,9 @@ public:
         }
 
         auto const trIn =
-            redeems(prevStepDir) ? this->rate(v, this->book_.in, this->strandDst_) : kPARITY_RATE;
+            redeems(prevStepDir) ? this->rate(v, this->book_.in, this->strandDst_) : kParityRate;
         // AMM doesn't pay the transfer fee on the out amount
-        auto const trOut = kPARITY_RATE;
+        auto const trOut = kParityRate;
 
         Quality const q1{getRate(STAmount(trOut.value), STAmount(trIn.value))};
         return composedQuality(q1, ofrQ);
@@ -598,10 +598,10 @@ BookStep<TIn, TOut, TDerived>::getQualityFunc(ReadView const& v, DebtDirection p
     // AMM
     if (!res->isConst())
     {
-        auto static const kQ_ONE = Quality{STAmount::kU_RATE_ONE};
+        auto static const kQOne = Quality{STAmount::kURateOne};
         auto const q = static_cast<TDerived const*>(this)->adjustQualityWithFees(
-            v, kQ_ONE, prevStepDir, WaiveTransferFee::Yes, OfferType::Amm, v.rules());
-        if (q == kQ_ONE)
+            v, kQOne, prevStepDir, WaiveTransferFee::Yes, OfferType::Amm, v.rules());
+        if (q == kQOne)
             return {res, dir};
         QualityFunction qf{q, QualityFunction::CLOBLikeTag{}};
         qf.combine(*res);
@@ -700,7 +700,7 @@ BookStep<TIn, TOut, TDerived>::forEachOffer(
     std::uint32_t const trOut =
         ownerPaysTransferFee_ ? rate(sb, book_.out, this->strandDst_).value : QUALITY_ONE;
 
-    typename FlowOfferStream<TIn, TOut>::StepCounter counter(kMAX_OFFERS_TO_CONSUME, j_);
+    typename FlowOfferStream<TIn, TOut>::StepCounter counter(kMaxOffersToConsume, j_);
 
     FlowOfferStream<TIn, TOut> offers(sb, afView, book_, sb.parentCloseTime(), counter, j_);
 
@@ -989,7 +989,7 @@ sum(TCollection const& col)
 {
     using TResult = std::decay_t<decltype(*col.begin())>;
     if (col.empty())
-        return TResult{beast::kZERO};
+        return TResult{beast::kZero};
     return std::accumulate(col.begin() + 1, col.end(), *col.begin());
 };
 
@@ -1003,7 +1003,7 @@ BookStep<TIn, TOut, TDerived>::revImp(
 {
     cache_.reset();
 
-    TAmounts<TIn, TOut> result(beast::kZERO, beast::kZERO);
+    TAmounts<TIn, TOut> result(beast::kZero, beast::kZero);
 
     auto remainingOut = out;
 
@@ -1022,7 +1022,7 @@ BookStep<TIn, TOut, TDerived>::revImp(
                          TOut const& ownerGives,
                          std::uint32_t transferRateIn,
                          std::uint32_t transferRateOut) mutable -> bool {
-        if (remainingOut <= beast::kZERO)
+        if (remainingOut <= beast::kZero)
             return false;
 
         if (stpAmt.out <= remainingOut)
@@ -1048,7 +1048,7 @@ BookStep<TIn, TOut, TDerived>::revImp(
             transferRateIn,
             transferRateOut,
             remainingOut);
-        remainingOut = beast::kZERO;
+        remainingOut = beast::kZero;
         savedIns.insert(stpAdjAmt.in);
         savedOuts.insert(remainingOut);
         result.in = sum(savedIns);
@@ -1076,7 +1076,7 @@ BookStep<TIn, TOut, TDerived>::revImp(
         setUnion(ofrsToRm, toRm);
 
         // Too many iterations, mark this strand as inactive
-        if (offersConsumed >= kMAX_OFFERS_TO_CONSUME)
+        if (offersConsumed >= kMaxOffersToConsume)
         {
             inactive_ = true;
         }
@@ -1089,8 +1089,8 @@ BookStep<TIn, TOut, TDerived>::revImp(
             // LCOV_EXCL_START
             JLOG(j_.error()) << "BookStep remainingOut < 0 " << to_string(remainingOut);
             UNREACHABLE("xrpl::BookStep::revImp : remaining less than zero");
-            cache_.emplace(beast::kZERO, beast::kZERO);
-            return {beast::kZERO, beast::kZERO};
+            cache_.emplace(beast::kZero, beast::kZero);
+            return {beast::kZero, beast::kZero};
             // LCOV_EXCL_STOP
         }
         case 0: {
@@ -1114,7 +1114,7 @@ BookStep<TIn, TOut, TDerived>::fwdImp(
 {
     XRPL_ASSERT(cache_, "xrpl::BookStep::fwdImp : cache is set");
 
-    TAmounts<TIn, TOut> result(beast::kZERO, beast::kZERO);
+    TAmounts<TIn, TOut> result(beast::kZero, beast::kZero);
 
     auto remainingIn = in;
 
@@ -1133,7 +1133,7 @@ BookStep<TIn, TOut, TDerived>::fwdImp(
                          std::uint32_t transferRateOut) mutable -> bool {
         XRPL_ASSERT(cache_, "xrpl::BookStep::fwdImp::eachOffer : cache is set");
 
-        if (remainingIn <= beast::kZERO)
+        if (remainingIn <= beast::kZero)
             return false;
 
         bool processMore = true;
@@ -1238,7 +1238,7 @@ BookStep<TIn, TOut, TDerived>::fwdImp(
         setUnion(ofrsToRm, toRm);
 
         // Too many iterations, mark this strand as inactive (dry)
-        if (offersConsumed >= kMAX_OFFERS_TO_CONSUME)
+        if (offersConsumed >= kMaxOffersToConsume)
         {
             inactive_ = true;
         }
@@ -1251,8 +1251,8 @@ BookStep<TIn, TOut, TDerived>::fwdImp(
             // something went very wrong
             JLOG(j_.error()) << "BookStep remainingIn < 0 " << to_string(remainingIn);
             UNREACHABLE("xrpl::BookStep::fwdImp : remaining less than zero");
-            cache_.emplace(beast::kZERO, beast::kZERO);
-            return {beast::kZERO, beast::kZERO};
+            cache_.emplace(beast::kZero, beast::kZero);
+            return {beast::kZero, beast::kZero};
             // LCOV_EXCL_STOP
         }
         case 0: {
@@ -1276,7 +1276,7 @@ BookStep<TIn, TOut, TDerived>::validFwd(
     if (!cache_)
     {
         JLOG(j_.trace()) << "Expected valid cache in validFwd";
-        return {false, EitherAmount(TOut(beast::kZERO))};
+        return {false, EitherAmount(TOut(beast::kZero))};
     }
 
     auto const savCache = *cache_;
@@ -1288,7 +1288,7 @@ BookStep<TIn, TOut, TDerived>::validFwd(
     }
     catch (FlowException const&)
     {
-        return {false, EitherAmount(TOut(beast::kZERO))};
+        return {false, EitherAmount(TOut(beast::kZero))};
     }
 
     // NOLINTBEGIN(bugprone-unchecked-optional-access) fwdImp sets cache_ on success
@@ -1386,7 +1386,7 @@ BookStep<TIn, TOut, TDerived>::rate(
 {
     auto const& issuer = asset.getIssuer();
     if (isXRP(issuer) || issuer == dstAccount)
-        return kPARITY_RATE;
+        return kParityRate;
     return asset.visit(
         [&](Issue const&) { return transferRate(view, issuer); },
         [&](MPTIssue const& issue) { return transferRate(view, issue.getMptID()); });
diff --git a/src/libxrpl/tx/paths/DirectStep.cpp b/src/libxrpl/tx/paths/DirectStep.cpp
index 0564e22947..a16c3afd6a 100644
--- a/src/libxrpl/tx/paths/DirectStep.cpp
+++ b/src/libxrpl/tx/paths/DirectStep.cpp
@@ -430,7 +430,7 @@ DirectIPaymentStep::check(StrandContext const& ctx, std::shared_ptr<const SLE> c
         auto const authField = (src_ > dst_) ? lsfHighAuth : lsfLowAuth;
 
         if (sleSrc->isFlag(lsfRequireAuth) && !sleLine->isFlag(authField) &&
-            (*sleLine)[sfBalance] == beast::kZERO)
+            (*sleLine)[sfBalance] == beast::kZero)
         {
             JLOG(j_.debug()) << "DirectStepI: can't receive IOUs from issuer without auth."
                              << " src: " << src_;
@@ -449,7 +449,7 @@ DirectIPaymentStep::check(StrandContext const& ctx, std::shared_ptr<const SLE> c
 
     {
         auto const owed = creditBalance(ctx.view, dst_, src_, currency_);
-        if (owed <= beast::kZERO)
+        if (owed <= beast::kZero)
         {
             auto const limit = creditLimit(ctx.view, dst_, src_, currency_);
             if (-owed >= limit)
@@ -526,8 +526,8 @@ DirectStepI<TDerived>::revImp(
     {
         JLOG(j_.trace()) << "DirectStepI::rev: dry";
         cache_.emplace(
-            IOUAmount(beast::kZERO), IOUAmount(beast::kZERO), IOUAmount(beast::kZERO), srcDebtDir);
-        return {beast::kZERO, beast::kZERO};
+            IOUAmount(beast::kZero), IOUAmount(beast::kZero), IOUAmount(beast::kZero), srcDebtDir);
+        return {beast::kZero, beast::kZero};
     }
 
     IOUAmount const srcToDst = mulRatio(out, QUALITY_ONE, dstQIn, /*roundUp*/ true);
@@ -639,8 +639,8 @@ DirectStepI<TDerived>::fwdImp(
     {
         JLOG(j_.trace()) << "DirectStepI::fwd: dry";
         cache_.emplace(
-            IOUAmount(beast::kZERO), IOUAmount(beast::kZERO), IOUAmount(beast::kZERO), srcDebtDir);
-        return {beast::kZERO, beast::kZERO};
+            IOUAmount(beast::kZero), IOUAmount(beast::kZero), IOUAmount(beast::kZero), srcDebtDir);
+        return {beast::kZero, beast::kZero};
     }
 
     IOUAmount const srcToDst = mulRatio(in, QUALITY_ONE, srcQOut, /*roundUp*/ false);
@@ -688,7 +688,7 @@ DirectStepI<TDerived>::validFwd(PaymentSandbox& sb, ApplyView& afView, EitherAmo
     if (!cache_)
     {
         JLOG(j_.trace()) << "Expected valid cache in validFwd";
-        return {false, EitherAmount(IOUAmount(beast::kZERO))};
+        return {false, EitherAmount(IOUAmount(beast::kZero))};
     }
 
     auto const savCache = *cache_;
@@ -706,7 +706,7 @@ DirectStepI<TDerived>::validFwd(PaymentSandbox& sb, ApplyView& afView, EitherAmo
     }
     catch (FlowException const&)
     {
-        return {false, EitherAmount(IOUAmount(beast::kZERO))};
+        return {false, EitherAmount(IOUAmount(beast::kZero))};
     }
 
     // NOLINTBEGIN(bugprone-unchecked-optional-access) fwdImp sets cache_ on success
diff --git a/src/libxrpl/tx/paths/MPTEndpointStep.cpp b/src/libxrpl/tx/paths/MPTEndpointStep.cpp
index 25c9062e47..65f8409379 100644
--- a/src/libxrpl/tx/paths/MPTEndpointStep.cpp
+++ b/src/libxrpl/tx/paths/MPTEndpointStep.cpp
@@ -385,7 +385,7 @@ MPTEndpointPaymentStep::check(StrandContext const& ctx, std::shared_ptr<const SL
         auto const owed = accountFunds(
             ctx.view, src_, mptIssue_, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
         // Already at MaximumAmount
-        if (owed <= beast::kZERO)
+        if (owed <= beast::kZero)
             return tecPATH_DRY;
     }
 
@@ -487,12 +487,12 @@ MPTEndpointStep<TDerived>::revImp(
     {
         JLOG(j_.trace()) << "MPTEndpointStep::rev: dry";
         resetCache(srcDebtDir);
-        return {beast::kZERO, beast::kZERO};
+        return {beast::kZero, beast::kZero};
     }
 
     if (auto const err = static_cast<TDerived*>(this)->checkCreateMPT(sb, srcDebtDir);
         !isTesSuccess(err))
-        return {beast::kZERO, beast::kZERO};
+        return {beast::kZero, beast::kZero};
 
     // Don't have to factor in dstQIn since it is always QUALITY_ONE
     MPTAmount const srcToDst = out;
@@ -512,7 +512,7 @@ MPTEndpointStep<TDerived>::revImp(
         {
             JLOG(j_.trace()) << "MPTEndpointStep::rev: error " << ter;
             resetCache(srcDebtDir);
-            return {beast::kZERO, beast::kZERO};
+            return {beast::kZero, beast::kZero};
         }
         JLOG(j_.trace()) << "MPTEndpointStep::rev: Non-limiting"
                          << " srcRedeems: " << redeems(srcDebtDir) << " in: " << to_string(in)
@@ -537,7 +537,7 @@ MPTEndpointStep<TDerived>::revImp(
     {
         JLOG(j_.trace()) << "MPTEndpointStep::rev: error " << ter;
         resetCache(srcDebtDir);
-        return {beast::kZERO, beast::kZERO};
+        return {beast::kZero, beast::kZero};
     }
     JLOG(j_.trace()) << "MPTEndpointStep::rev: Limiting"
                      << " srcRedeems: " << redeems(srcDebtDir) << " in: " << to_string(in)
@@ -618,12 +618,12 @@ MPTEndpointStep<TDerived>::fwdImp(
     {
         JLOG(j_.trace()) << "MPTEndpointStep::fwd: dry";
         resetCache(srcDebtDir);
-        return {beast::kZERO, beast::kZERO};
+        return {beast::kZero, beast::kZero};
     }
 
     if (auto const err = static_cast<TDerived*>(this)->checkCreateMPT(sb, srcDebtDir);
         !isTesSuccess(err))
-        return {beast::kZERO, beast::kZERO};
+        return {beast::kZero, beast::kZero};
 
     MPTAmount const srcToDst = mulRatio(in, QUALITY_ONE, srcQOut, /*roundUp*/ false);
 
@@ -643,7 +643,7 @@ MPTEndpointStep<TDerived>::fwdImp(
         {
             JLOG(j_.trace()) << "MPTEndpointStep::fwd: error " << ter;
             resetCache(srcDebtDir);
-            return {beast::kZERO, beast::kZERO};
+            return {beast::kZero, beast::kZero};
         }
         JLOG(j_.trace()) << "MPTEndpointStep::fwd: Non-limiting"
                          << " srcRedeems: " << redeems(srcDebtDir) << " in: " << to_string(in)
@@ -667,7 +667,7 @@ MPTEndpointStep<TDerived>::fwdImp(
         {
             JLOG(j_.trace()) << "MPTEndpointStep::fwd: error " << ter;
             resetCache(srcDebtDir);
-            return {beast::kZERO, beast::kZERO};
+            return {beast::kZero, beast::kZero};
         }
         JLOG(j_.trace()) << "MPTEndpointStep::fwd: Limiting"
                          << " srcRedeems: " << redeems(srcDebtDir) << " in: " << to_string(actualIn)
@@ -684,7 +684,7 @@ MPTEndpointStep<TDerived>::validFwd(PaymentSandbox& sb, ApplyView& afView, Eithe
     if (!cache_)
     {
         JLOG(j_.trace()) << "Expected valid cache in validFwd";
-        return {false, EitherAmount(MPTAmount(beast::kZERO))};
+        return {false, EitherAmount(MPTAmount(beast::kZero))};
     }
 
     auto const savCache = *cache_;
@@ -701,7 +701,7 @@ MPTEndpointStep<TDerived>::validFwd(PaymentSandbox& sb, ApplyView& afView, Eithe
     }
     catch (FlowException const&)
     {
-        return {false, EitherAmount(MPTAmount(beast::kZERO))};
+        return {false, EitherAmount(MPTAmount(beast::kZero))};
     }
 
     // NOLINTBEGIN(bugprone-unchecked-optional-access) fwdImp sets cache_ on success
@@ -893,7 +893,7 @@ template <class TDerived>
 void
 MPTEndpointStep<TDerived>::resetCache(xrpl::DebtDirection dir)
 {
-    cache_.emplace(MPTAmount(beast::kZERO), MPTAmount(beast::kZERO), MPTAmount(beast::kZERO), dir);
+    cache_.emplace(MPTAmount(beast::kZero), MPTAmount(beast::kZero), MPTAmount(beast::kZero), dir);
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/libxrpl/tx/paths/OfferStream.cpp b/src/libxrpl/tx/paths/OfferStream.cpp
index b5ac45503a..bfe2bbd1bb 100644
--- a/src/libxrpl/tx/paths/OfferStream.cpp
+++ b/src/libxrpl/tx/paths/OfferStream.cpp
@@ -138,10 +138,10 @@ TOfferStreamBase<TIn, TOut>::shouldRmSmallIncreasedQOffer() const
     // Consider removing the offer if:
     //  o `TakerPays` is XRP (because of XRP drops granularity) or
     //  o `TakerPays` and `TakerGets` are both IOU and `TakerPays`<`TakerGets`
-    constexpr bool const kIN_IS_XRP = std::is_same_v<TTakerPays, XRPAmount>;
-    constexpr bool const kOUT_IS_XRP = std::is_same_v<TTakerGets, XRPAmount>;
+    static constexpr bool kInIsXrp = std::is_same_v<TTakerPays, XRPAmount>;
+    static constexpr bool kOutIsXrp = std::is_same_v<TTakerGets, XRPAmount>;
 
-    if constexpr (kOUT_IS_XRP)
+    if constexpr (kOutIsXrp)
     {
         // If `TakerGets` is XRP, the worst this offer's quality can change is
         // to about 10^-81 `TakerPays` and 1 drop `TakerGets`. This will be
@@ -156,7 +156,7 @@ TOfferStreamBase<TIn, TOut>::shouldRmSmallIncreasedQOffer() const
     TAmounts<TTakerPays, TTakerGets> const ofrAmts{
         toAmount<TTakerPays>(offer_.amount().in), toAmount<TTakerGets>(offer_.amount().out)};
 
-    if constexpr (!kIN_IS_XRP && !kOUT_IS_XRP)
+    if constexpr (!kInIsXrp && !kOutIsXrp)
     {
         if (Number(ofrAmts.in) >= Number(ofrAmts.out))
             return false;
@@ -271,7 +271,7 @@ TOfferStreamBase<TIn, TOut>::step()
             j_);
 
         // Check for unfunded offer
-        if (*ownerFunds_ <= beast::kZERO)
+        if (*ownerFunds_ <= beast::kZero)
         {
             // If the owner's balance in the pristine view is the same,
             // we haven't modified the balance and therefore the
diff --git a/src/libxrpl/tx/paths/PaySteps.cpp b/src/libxrpl/tx/paths/PaySteps.cpp
index 2d6e89ce2c..0a5adeb77f 100644
--- a/src/libxrpl/tx/paths/PaySteps.cpp
+++ b/src/libxrpl/tx/paths/PaySteps.cpp
@@ -189,9 +189,9 @@ toStrand(
         (dst == noAccount()) || (deliver.getIssuer() == noAccount()))
         return {temBAD_PATH, Strand{}};
 
-    if ((deliver.holds<MPTIssue>() && deliver.getIssuer() == beast::kZERO) ||
+    if ((deliver.holds<MPTIssue>() && deliver.getIssuer() == beast::kZero) ||
         (sendMaxAsset && sendMaxAsset->holds<MPTIssue>() &&
-         sendMaxAsset->getIssuer() == beast::kZERO))
+         sendMaxAsset->getIssuer() == beast::kZero))
         return {temBAD_PATH, Strand{}};
 
     for (std::size_t i = 0; i < path.size(); ++i)
diff --git a/src/libxrpl/tx/paths/RippleCalc.cpp b/src/libxrpl/tx/paths/RippleCalc.cpp
index 06e386344d..cc497b7935 100644
--- a/src/libxrpl/tx/paths/RippleCalc.cpp
+++ b/src/libxrpl/tx/paths/RippleCalc.cpp
@@ -59,13 +59,13 @@ RippleCalc::rippleCalculate(
         bool const partialPayment = (pInputs == nullptr) ? false : pInputs->partialPaymentAllowed;
 
         auto const limitQuality = [&]() -> std::optional<Quality> {
-            if (pInputs && pInputs->limitQuality && saMaxAmountReq > beast::kZERO)
+            if (pInputs && pInputs->limitQuality && saMaxAmountReq > beast::kZero)
                 return Quality{Amounts(saMaxAmountReq, saDstAmountReq)};
             return std::nullopt;
         }();
 
         auto const sendMax = [&]() -> std::optional<STAmount> {
-            if (saMaxAmountReq >= beast::kZERO ||
+            if (saMaxAmountReq >= beast::kZero ||
                 !equalTokens(saMaxAmountReq.asset(), saDstAmountReq.asset()) ||
                 saMaxAmountReq.getIssuer() != uSrcAccountID)
             {
diff --git a/src/libxrpl/tx/paths/XRPEndpointStep.cpp b/src/libxrpl/tx/paths/XRPEndpointStep.cpp
index 244e1cffea..314780c3a7 100644
--- a/src/libxrpl/tx/paths/XRPEndpointStep.cpp
+++ b/src/libxrpl/tx/paths/XRPEndpointStep.cpp
@@ -253,7 +253,7 @@ template <class TDerived>
 std::pair<std::optional<Quality>, DebtDirection>
 XRPEndpointStep<TDerived>::qualityUpperBound(ReadView const& v, DebtDirection prevStepDir) const
 {
-    return {Quality{STAmount::kU_RATE_ONE}, this->debtDirection(v, StrandDirection::Forward)};
+    return {Quality{STAmount::kURateOne}, this->debtDirection(v, StrandDirection::Forward)};
 }
 
 template <class TDerived>
@@ -272,7 +272,7 @@ XRPEndpointStep<TDerived>::revImp(
     auto& receiver = isLast_ ? acc_ : xrpAccount();
     auto ter = accountSend(sb, sender, receiver, toSTAmount(result), j_);
     if (!isTesSuccess(ter))
-        return {XRPAmount{beast::kZERO}, XRPAmount{beast::kZERO}};
+        return {XRPAmount{beast::kZero}, XRPAmount{beast::kZero}};
 
     cache_.emplace(result);
     return {result, result};
@@ -295,7 +295,7 @@ XRPEndpointStep<TDerived>::fwdImp(
     auto& receiver = isLast_ ? acc_ : xrpAccount();
     auto ter = accountSend(sb, sender, receiver, toSTAmount(result), j_);
     if (!isTesSuccess(ter))
-        return {XRPAmount{beast::kZERO}, XRPAmount{beast::kZERO}};
+        return {XRPAmount{beast::kZero}, XRPAmount{beast::kZero}};
 
     cache_.emplace(result);
     return {result, result};
@@ -308,7 +308,7 @@ XRPEndpointStep<TDerived>::validFwd(PaymentSandbox& sb, ApplyView& afView, Eithe
     if (!cache_)
     {
         JLOG(j_.error()) << "Expected valid cache in validFwd";
-        return {false, EitherAmount(XRPAmount(beast::kZERO))};
+        return {false, EitherAmount(XRPAmount(beast::kZero))};
     }
 
     XRPL_ASSERT(in.holds<XRPAmount>(), "xrpl::XRPEndpointStep::validFwd : input is XRP");
diff --git a/src/libxrpl/tx/transactors/account/AccountDelete.cpp b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
index 7b72817aaa..809888e1f7 100644
--- a/src/libxrpl/tx/transactors/account/AccountDelete.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
@@ -275,8 +275,8 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
     //
     // We look at the account's Sequence rather than the transaction's
     // Sequence in preparation for Tickets.
-    constexpr std::uint32_t kSEQ_DELTA{255};
-    if ((*sleAccount)[sfSequence] + kSEQ_DELTA > ctx.view.seq())
+    static constexpr std::uint32_t kSeqDelta{255};
+    if ((*sleAccount)[sfSequence] + kSeqDelta > ctx.view.seq())
         return tecTOO_SOON;
 
     // We don't allow an account to be deleted if
@@ -291,7 +291,7 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
     // NFTokenSequence of this NFToken is the same as the one that the
     // authorized minter minted in a previous ledger.
     if ((*sleAccount)[~sfFirstNFTokenSequence].value_or(0) +
-            (*sleAccount)[~sfMintedNFTokens].value_or(0) + kSEQ_DELTA >
+            (*sleAccount)[~sfMintedNFTokens].value_or(0) + kSeqDelta >
         ctx.view.seq())
         return tecTOO_SOON;
 
@@ -303,7 +303,7 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
 
     std::shared_ptr<SLE const> sleDirNode{};
     unsigned int uDirEntry{0};
-    uint256 dirEntry{beast::kZERO};
+    uint256 dirEntry{beast::kZero};
 
     // Account has no directory at all.  This _should_ have been caught
     // by the dirIsEmpty() check earlier, but it's okay to catch it here.
@@ -333,7 +333,7 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
 
         // We found a deletable directory entry.  Count it.  If we find too
         // many deletable directory entries then bail out.
-        if (++deletableDirEntryCount > kMAX_DELETABLE_DIR_ENTRIES)
+        if (++deletableDirEntryCount > kMaxDeletableDirEntries)
             return tefTOO_BIG;
 
     } while (cdirNext(ctx.view, ownerDirKeylet.key, sleDirNode, uDirEntry, dirEntry));
diff --git a/src/libxrpl/tx/transactors/account/AccountSet.cpp b/src/libxrpl/tx/transactors/account/AccountSet.cpp
index c3cb8a72b8..69db85d8df 100644
--- a/src/libxrpl/tx/transactors/account/AccountSet.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountSet.cpp
@@ -137,7 +137,7 @@ AccountSet::preflight(PreflightContext const& ctx)
     {
         auto uTickSize = tx[sfTickSize];
         if ((uTickSize != 0u) &&
-            ((uTickSize < Quality::kMIN_TICK_SIZE) || (uTickSize > Quality::kMAX_TICK_SIZE)))
+            ((uTickSize < Quality::kMinTickSize) || (uTickSize > Quality::kMaxTickSize)))
         {
             JLOG(j.trace()) << "Malformed transaction: Bad tick size.";
             return temBAD_TICK_SIZE;
@@ -153,7 +153,7 @@ AccountSet::preflight(PreflightContext const& ctx)
         }
     }
 
-    if (auto const domain = tx[~sfDomain]; domain && domain->size() > kMAX_DOMAIN_LENGTH)
+    if (auto const domain = tx[~sfDomain]; domain && domain->size() > kMaxDomainLength)
     {
         JLOG(j.trace()) << "domain too long";
         return telBAD_DOMAIN;
@@ -559,7 +559,7 @@ AccountSet::doApply()
     if (tx.isFieldPresent(sfTickSize))
     {
         auto uTickSize = tx[sfTickSize];
-        if ((uTickSize == 0) || (uTickSize == Quality::kMAX_TICK_SIZE))
+        if ((uTickSize == 0) || (uTickSize == Quality::kMaxTickSize))
         {
             JLOG(j_.trace()) << "unset tick size";
             sle->makeFieldAbsent(sfTickSize);
diff --git a/src/libxrpl/tx/transactors/account/SignerListSet.cpp b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
index 92b6d18d40..5a399fee7c 100644
--- a/src/libxrpl/tx/transactors/account/SignerListSet.cpp
+++ b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
@@ -37,7 +37,7 @@ namespace xrpl {
 // We're prepared for there to be multiple signer lists in the future,
 // but we don't need them yet.  So for the time being we're manually
 // setting the sfSignerListID to zero in all cases.
-static std::uint32_t const kDEFAULT_SIGNER_LIST_ID = 0;
+static std::uint32_t const kDefaultSignerListId = 0;
 
 std::tuple<NotTEC, std::uint32_t, std::vector<SignerEntries::SignerEntry>, SignerListSet::Operation>
 SignerListSet::determineOperation(STTx const& tx, ApplyFlags flags, beast::Journal j)
@@ -168,10 +168,10 @@ signerCountBasedOwnerCountDelta(std::size_t entryCount, Rules const& rules)
     // be in the range from 1 to 32.
     // We've got a lot of room to grow.
     XRPL_ASSERT(
-        entryCount >= STTx::kMIN_MULTI_SIGNERS,
+        entryCount >= STTx::kMinMultiSigners,
         "xrpl::signerCountBasedOwnerCountDelta : minimum signers");
     XRPL_ASSERT(
-        entryCount <= STTx::kMAX_MULTI_SIGNERS,
+        entryCount <= STTx::kMaxMultiSigners,
         "xrpl::signerCountBasedOwnerCountDelta : maximum signers");
     return 2 + static_cast<int>(entryCount);
 }
@@ -249,7 +249,7 @@ SignerListSet::validateQuorumAndSignerEntries(
     // Reject if there are too many or too few entries in the list.
     {
         std::size_t const signerCount = signers.size();
-        if (signerCount < STTx::kMIN_MULTI_SIGNERS || signerCount > STTx::kMAX_MULTI_SIGNERS)
+        if (signerCount < STTx::kMinMultiSigners || signerCount > STTx::kMaxMultiSigners)
         {
             JLOG(j.trace()) << "Too many or too few signers in signer list.";
             return temMALFORMED;
@@ -318,10 +318,10 @@ SignerListSet::replaceSignerList()
     // Compute new reserve.  Verify the account has funds to meet the reserve.
     std::uint32_t const oldOwnerCount{(*sle)[sfOwnerCount]};
 
-    constexpr int kADDED_OWNER_COUNT = 1;
+    static constexpr int kAddedOwnerCount = 1;
     std::uint32_t const flags{lsfOneOwnerCount};
 
-    XRPAmount const newReserve{view().fees().accountReserve(oldOwnerCount + kADDED_OWNER_COUNT)};
+    XRPAmount const newReserve{view().fees().accountReserve(oldOwnerCount + kAddedOwnerCount)};
 
     // We check the reserve against the starting balance because we want to
     // allow dipping into the reserve to pay fees.  This behavior is consistent
@@ -349,7 +349,7 @@ SignerListSet::replaceSignerList()
 
     // If we succeeded, the new entry counts against the
     // creator's reserve.
-    adjustOwnerCount(view(), sle, kADDED_OWNER_COUNT, viewJ);
+    adjustOwnerCount(view(), sle, kAddedOwnerCount, viewJ);
     return tesSUCCESS;
 }
 
@@ -381,7 +381,7 @@ SignerListSet::writeSignersToSLE(SLE::pointer const& ledgerEntry, std::uint32_t
         ledgerEntry->setAccountID(sfOwner, account_);
     }
     ledgerEntry->setFieldU32(sfSignerQuorum, quorum_);
-    ledgerEntry->setFieldU32(sfSignerListID, kDEFAULT_SIGNER_LIST_ID);
+    ledgerEntry->setFieldU32(sfSignerListID, kDefaultSignerListId);
     if (flags != 0u)  // Only set flags if they are non-default (default is zero).
         ledgerEntry->setFieldU32(sfFlags, flags);
 
diff --git a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
index 75d6b30315..9d72311b2b 100644
--- a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
+++ b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
@@ -981,7 +981,7 @@ applyCreateAccountAttestations(
     {
         return tecXCHAIN_ACCOUNT_CREATE_PAST;
     }
-    if (attBegin->createCount >= claimCount + kXBRIDGE_MAX_ACCOUNT_CREATE_CLAIMS)
+    if (attBegin->createCount >= claimCount + kXbridgeMaxAccountCreateClaims)
     {
         // Limit the number of claims on the account
         return tecXCHAIN_ACCOUNT_CREATE_TOO_MANY;
@@ -1369,9 +1369,9 @@ XChainCreateBridge::preflight(PreflightContext const& ctx)
         // Issuing account must be the root account for XRP (which presumably
         // owns all the XRP). This is done so the issuing account can't "run
         // out" of wrapped tokens.
-        static auto const kROOT_ACCOUNT = calcAccountID(
+        static auto const kRootAccount = calcAccountID(
             generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase")).first);
-        if (bridgeSpec.issuingChainDoor() != kROOT_ACCOUNT)
+        if (bridgeSpec.issuingChainDoor() != kRootAccount)
         {
             return temXCHAIN_BRIDGE_BAD_ISSUES;
         }
@@ -1826,7 +1826,7 @@ XChainCommit::makeTxConsequences(PreflightContext const& ctx)
         auto const amount = ctx.tx[sfAmount];
         if (amount.native() && amount.signum() > 0)
             return amount.xrp();
-        return XRPAmount{beast::kZERO};
+        return XRPAmount{beast::kZero};
     }();
 
     return TxConsequences{ctx.tx, maxSpend};
diff --git a/src/libxrpl/tx/transactors/check/CheckCash.cpp b/src/libxrpl/tx/transactors/check/CheckCash.cpp
index a5cd224f1e..9ec4d0b5b0 100644
--- a/src/libxrpl/tx/transactors/check/CheckCash.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCash.cpp
@@ -371,12 +371,10 @@ CheckCash::doApply()
                 return optDeliverMin->asset().visit(
                     [&](Issue const&) {
                         return STAmount(
-                            optDeliverMin->asset(),
-                            STAmount::kMAX_VALUE / 2,
-                            STAmount::kMAX_OFFSET);
+                            optDeliverMin->asset(), STAmount::kMaxValue / 2, STAmount::kMaxOffset);
                     },
                     [&](MPTIssue const&) {
-                        return STAmount(optDeliverMin->asset(), kMAX_MP_TOKEN_AMOUNT / 2);
+                        return STAmount(optDeliverMin->asset(), kMaxMpTokenAmount / 2);
                     });
             };
             STAmount const flowDeliver{
@@ -475,7 +473,7 @@ CheckCash::doApply()
                     // Set the trust line limit to the highest possible
                     // value while flow runs.
                     STAmount const bigAmount(
-                        trustLineIssue, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
+                        trustLineIssue, STAmount::kMaxValue, STAmount::kMaxOffset);
                     sleTrustLine->at(tweakedLimit) = bigAmount;
 
                     return std::nullopt;
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
index 10c5334504..325425c46a 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
@@ -43,7 +43,7 @@ CredentialAccept::preflight(PreflightContext const& ctx)
     }
 
     auto const credType = ctx.tx[sfCredentialType];
-    if (credType.empty() || (credType.size() > kMAX_CREDENTIAL_TYPE_LENGTH))
+    if (credType.empty() || (credType.size() > kMaxCredentialTypeLength))
     {
         JLOG(ctx.j.trace()) << "Malformed transaction: invalid size of CredentialType.";
         return temMALFORMED;
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp b/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
index 9d6231afe1..ec4a5c7eaa 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
@@ -62,14 +62,14 @@ CredentialCreate::preflight(PreflightContext const& ctx)
     }
 
     auto const uri = tx[~sfURI];
-    if (uri && (uri->empty() || (uri->size() > kMAX_CREDENTIAL_URI_LENGTH)))
+    if (uri && (uri->empty() || (uri->size() > kMaxCredentialUriLength)))
     {
         JLOG(j.trace()) << "Malformed transaction: invalid size of URI.";
         return temMALFORMED;
     }
 
     auto const credType = tx[sfCredentialType];
-    if (credType.empty() || (credType.size() > kMAX_CREDENTIAL_TYPE_LENGTH))
+    if (credType.empty() || (credType.size() > kMaxCredentialTypeLength))
     {
         JLOG(j.trace()) << "Malformed transaction: invalid size of CredentialType.";
         return temMALFORMED;
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialDelete.cpp b/src/libxrpl/tx/transactors/credentials/CredentialDelete.cpp
index e83a8b09dc..da1b91b2f5 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialDelete.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialDelete.cpp
@@ -52,7 +52,7 @@ CredentialDelete::preflight(PreflightContext const& ctx)
     }
 
     auto const credType = ctx.tx[sfCredentialType];
-    if (credType.empty() || (credType.size() > kMAX_CREDENTIAL_TYPE_LENGTH))
+    if (credType.empty() || (credType.size() > kMaxCredentialTypeLength))
     {
         JLOG(ctx.j.trace()) << "Malformed transaction: invalid size of CredentialType.";
         return temMALFORMED;
diff --git a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
index feae97720f..085af8b4c7 100644
--- a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
+++ b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
@@ -25,7 +25,7 @@ NotTEC
 DelegateSet::preflight(PreflightContext const& ctx)
 {
     auto const& permissions = ctx.tx.getFieldArray(sfPermissions);
-    if (permissions.size() > kPERMISSION_MAX_SIZE)
+    if (permissions.size() > kPermissionMaxSize)
         return temARRAY_TOO_LARGE;
 
     // can not authorize self
diff --git a/src/libxrpl/tx/transactors/dex/AMMBid.cpp b/src/libxrpl/tx/transactors/dex/AMMBid.cpp
index 894e6a9451..9b1acc5571 100644
--- a/src/libxrpl/tx/transactors/dex/AMMBid.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMBid.cpp
@@ -77,7 +77,7 @@ AMMBid::preflight(PreflightContext const& ctx)
     if (ctx.tx.isFieldPresent(sfAuthAccounts))
     {
         auto const authAccounts = ctx.tx.getFieldArray(sfAuthAccounts);
-        if (authAccounts.size() > kAUCTION_SLOT_MAX_AUTH_ACCOUNTS)
+        if (authAccounts.size() > kAuctionSlotMaxAuthAccounts)
         {
             JLOG(ctx.j.debug()) << "AMM Bid: Invalid number of AuthAccounts.";
             return temMALFORMED;
@@ -113,7 +113,7 @@ AMMBid::preclaim(PreclaimContext const& ctx)
     }
 
     auto const lpTokensBalance = (*ammSle)[sfLPTokenBalance];
-    if (lpTokensBalance == beast::kZERO)
+    if (lpTokensBalance == beast::kZero)
         return tecAMM_EMPTY;
 
     if (ctx.tx.isFieldPresent(sfAuthAccounts))
@@ -130,7 +130,7 @@ AMMBid::preclaim(PreclaimContext const& ctx)
 
     auto const lpTokens = ammLPHolds(ctx.view, *ammSle, ctx.tx[sfAccount], ctx.j);
     // Not LP
-    if (lpTokens == beast::kZERO)
+    if (lpTokens == beast::kZero)
     {
         JLOG(ctx.j.debug()) << "AMM Bid: account is not LP.";
         return tecAMM_INVALID_TOKENS;
@@ -201,12 +201,12 @@ applyBid(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journa
     auto const current =
         duration_cast<seconds>(ctx.view().header().parentCloseTime.time_since_epoch()).count();
     // Auction slot discounted fee
-    auto const discountedFee = (*ammSle)[sfTradingFee] / kAUCTION_SLOT_DISCOUNTED_FEE_FRACTION;
+    auto const discountedFee = (*ammSle)[sfTradingFee] / kAuctionSlotDiscountedFeeFraction;
     auto const tradingFee = getFee((*ammSle)[sfTradingFee]);
     // Min price
-    auto const minSlotPrice = lptAMMBalance * tradingFee / kAUCTION_SLOT_MIN_FEE_FRACTION;
+    auto const minSlotPrice = lptAMMBalance * tradingFee / kAuctionSlotMinFeeFraction;
 
-    std::uint32_t constexpr kTAILING_SLOT = kAUCTION_SLOT_TIME_INTERVALS - 1;
+    static constexpr std::uint32_t kTailingSlot = kAuctionSlotTimeIntervals - 1;
 
     // If seated then it is the current slot-holder time slot, otherwise
     // the auction slot is not owned. Slot range is in {0-19}
@@ -216,12 +216,12 @@ applyBid(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journa
     auto validOwner = [&](AccountID const& account) {
         // Valid range is 0-19 but the tailing slot pays MinSlotPrice
         // and doesn't refund so the check is < instead of <= to optimize.
-        return timeSlot && *timeSlot < kTAILING_SLOT && sb.read(keylet::account(account));
+        return timeSlot && *timeSlot < kTailingSlot && sb.read(keylet::account(account));
     };
 
     auto updateSlot = [&](std::uint32_t fee, Number const& minPrice, Number const& burn) -> TER {
         auctionSlot.setAccountID(sfAccount, account);
-        auctionSlot.setFieldU32(sfExpiration, current + kTOTAL_TIME_SLOT_SECS);
+        auctionSlot.setFieldU32(sfExpiration, current + kTotalTimeSlotSecs);
         if (fee != 0)
         {
             auctionSlot.setFieldU16(sfDiscountedFee, fee);
@@ -322,7 +322,7 @@ applyBid(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journa
         STAmount const pricePurchased = auctionSlot[sfPrice];
         XRPL_ASSERT(timeSlot, "xrpl::applyBid : timeSlot is set");
         // NOLINTBEGIN(bugprone-unchecked-optional-access)
-        auto const fractionUsed = (Number(*timeSlot) + 1) / kAUCTION_SLOT_TIME_INTERVALS;
+        auto const fractionUsed = (Number(*timeSlot) + 1) / kAuctionSlotTimeIntervals;
         auto const fractionRemaining = Number(1) - fractionUsed;
         auto const computedPrice = [&]() -> Number {
             auto const p105 = Number(105, -2);
diff --git a/src/libxrpl/tx/transactors/dex/AMMClawback.cpp b/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
index f034180cd6..43abc6ae29 100644
--- a/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
@@ -92,7 +92,7 @@ AMMClawback::preflight(PreflightContext const& ctx)
         return temBAD_AMOUNT;
     }
 
-    if (clawAmount && *clawAmount <= beast::kZERO)
+    if (clawAmount && *clawAmount <= beast::kZero)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -187,7 +187,7 @@ AMMClawback::applyGuts(Sandbox& sb)
     {
         // retrieve LP token balance inside the amendment gate to avoid inconsistent error behavior
         auto const lpTokenBalance = ammLPHolds(sb, *ammSle, holder, j_);
-        if (lpTokenBalance == beast::kZERO)
+        if (lpTokenBalance == beast::kZero)
             return tecAMM_BALANCE;
 
         if (auto const res = verifyAndAdjustLPTokenBalance(sb, lpTokenBalance, ammSle, holder);
@@ -216,7 +216,7 @@ AMMClawback::applyGuts(Sandbox& sb)
     // calling a second time on purpose since `verifyAndAdjustLPTokenBalance` rounds and may adjust
     // the balance
     auto const holdLPtokens = ammLPHolds(sb, *ammSle, holder, j_);
-    if (holdLPtokens == beast::kZERO)
+    if (holdLPtokens == beast::kZero)
         return tecAMM_BALANCE;
 
     if (!clawAmount)
@@ -335,7 +335,7 @@ AMMClawback::equalWithdrawMatchingOneAmount(
         auto tokensAdj = getRoundedLPTokens(rules, lptAMMBalance, frac, IsDeposit::No);
 
         // LCOV_EXCL_START
-        if (tokensAdj == beast::kZERO)
+        if (tokensAdj == beast::kZero)
             return {tecAMM_INVALID_TOKENS, STAmount{}, STAmount{}, std::nullopt};
         // LCOV_EXCL_STOP
 
diff --git a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
index c6d7515542..325ca2988d 100644
--- a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
@@ -76,7 +76,7 @@ AMMCreate::preflight(PreflightContext const& ctx)
         return err;
     }
 
-    if (ctx.tx[sfTradingFee] > kTRADING_FEE_THRESHOLD)
+    if (ctx.tx[sfTradingFee] > kTradingFeeThreshold)
     {
         JLOG(ctx.j.debug()) << "AMM Instance: invalid trading fee.";
         return temBAD_FEE;
@@ -146,7 +146,7 @@ AMMCreate::preclaim(PreclaimContext const& ctx)
     // Check the reserve for LPToken trustline
     STAmount const xrpBalance = xrpLiquid(ctx.view, accountID, 1, ctx.j);
     // Insufficient reserve
-    if (xrpBalance <= beast::kZERO)
+    if (xrpBalance <= beast::kZero)
     {
         JLOG(ctx.j.debug()) << "AMM Instance: insufficient reserves";
         return tecINSUF_RESERVE_LINE;
@@ -187,7 +187,7 @@ AMMCreate::preclaim(PreclaimContext const& ctx)
     {
         if (auto const accountId =
                 pseudoAccountAddress(ctx.view, keylet::amm(amount.asset(), amount2.asset()).key);
-            accountId == beast::kZERO)
+            accountId == beast::kZero)
             return terADDRESS_COLLISION;
     }
 
@@ -368,7 +368,7 @@ applyCreate(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Jou
                     << lpTokens << " " << amount << " " << amount2;
     auto addOrderBook = [&](Asset const& assetIn, Asset const& assetOut, std::uint64_t uRate) {
         Book const book{assetIn, assetOut, std::nullopt};
-        auto const dir = keylet::quality(keylet::kBOOK(book), uRate);
+        auto const dir = keylet::quality(keylet::kBook(book), uRate);
         if (auto const bookExisted = static_cast<bool>(sb.read(dir)); !bookExisted)
             ctx.registry.get().getOrderBookDB().addOrderBook(book);
     };
diff --git a/src/libxrpl/tx/transactors/dex/AMMDelete.cpp b/src/libxrpl/tx/transactors/dex/AMMDelete.cpp
index d9056fcbc0..8a8cab1c03 100644
--- a/src/libxrpl/tx/transactors/dex/AMMDelete.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMDelete.cpp
@@ -46,7 +46,7 @@ AMMDelete::preclaim(PreclaimContext const& ctx)
     }
 
     auto const lpTokensBalance = (*ammSle)[sfLPTokenBalance];
-    if (lpTokensBalance != beast::kZERO)
+    if (lpTokensBalance != beast::kZero)
         return tecAMM_NOT_EMPTY;
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
index f8cdf1b29b..b19b6eff6c 100644
--- a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
@@ -124,7 +124,7 @@ AMMDeposit::preflight(PreflightContext const& ctx)
         return temBAD_AMM_TOKENS;
     }
 
-    if (lpTokens && *lpTokens <= beast::kZERO)
+    if (lpTokens && *lpTokens <= beast::kZero)
     {
         JLOG(ctx.j.debug()) << "AMM Deposit: invalid LPTokens";
         return temBAD_AMM_TOKENS;
@@ -166,7 +166,7 @@ AMMDeposit::preflight(PreflightContext const& ctx)
         }
     }
 
-    if (tradingFee > kTRADING_FEE_THRESHOLD)
+    if (tradingFee > kTradingFeeThreshold)
     {
         JLOG(ctx.j.debug()) << "AMM Deposit: invalid trading fee.";
         return temBAD_FEE;
@@ -200,9 +200,9 @@ AMMDeposit::preclaim(PreclaimContext const& ctx)
     auto const [amountBalance, amount2Balance, lptAMMBalance] = *expected;
     if (ctx.tx.isFlag(tfTwoAssetIfEmpty))
     {
-        if (lptAMMBalance != beast::kZERO)
+        if (lptAMMBalance != beast::kZero)
             return tecAMM_NOT_EMPTY;
-        if (amountBalance != beast::kZERO || amount2Balance != beast::kZERO)
+        if (amountBalance != beast::kZero || amount2Balance != beast::kZero)
         {
             // LCOV_EXCL_START
             JLOG(ctx.j.debug()) << "AMM Deposit: tokens balance is not zero.";
@@ -212,10 +212,10 @@ AMMDeposit::preclaim(PreclaimContext const& ctx)
     }
     else
     {
-        if (lptAMMBalance == beast::kZERO)
+        if (lptAMMBalance == beast::kZero)
             return tecAMM_EMPTY;
-        if (amountBalance <= beast::kZERO || amount2Balance <= beast::kZERO ||
-            lptAMMBalance < beast::kZERO)
+        if (amountBalance <= beast::kZero || amount2Balance <= beast::kZero ||
+            lptAMMBalance < beast::kZero)
         {
             // LCOV_EXCL_START
             JLOG(ctx.j.debug()) << "AMM Deposit: reserves or tokens balance is zero.";
@@ -357,11 +357,11 @@ AMMDeposit::preclaim(PreclaimContext const& ctx)
 
     // Check the reserve for LPToken trustline if not LP.
     // We checked above but need to check again if depositing IOU only.
-    if (ammLPHolds(ctx.view, *ammSle, accountID, ctx.j) == beast::kZERO)
+    if (ammLPHolds(ctx.view, *ammSle, accountID, ctx.j) == beast::kZero)
     {
         STAmount const xrpBalance = xrpLiquid(ctx.view, accountID, 1, ctx.j);
         // Insufficient reserve
-        if (xrpBalance <= beast::kZERO)
+        if (xrpBalance <= beast::kZero)
         {
             JLOG(ctx.j.debug()) << "AMM Instance: insufficient reserves";
             return tecINSUF_RESERVE_LINE;
@@ -401,7 +401,7 @@ AMMDeposit::applyGuts(Sandbox& sb)
     if (!expected)
         return {expected.error(), false};  // LCOV_EXCL_LINE
     auto const [amountBalance, amount2Balance, lptAMMBalance] = *expected;
-    auto const tfee = (lptAMMBalance == beast::kZERO)
+    auto const tfee = (lptAMMBalance == beast::kZero)
         ? ctx_.tx[~sfTradingFee].value_or(0)
         : getTradingFee(ctx_.view(), *ammSle, account_);
 
@@ -468,12 +468,12 @@ AMMDeposit::applyGuts(Sandbox& sb)
     if (isTesSuccess(result))
     {
         XRPL_ASSERT(
-            newLPTokenBalance > beast::kZERO,
+            newLPTokenBalance > beast::kZero,
             "xrpl::AMMDeposit::applyGuts : valid new LP token balance");
         ammSle->setFieldAmount(sfLPTokenBalance, newLPTokenBalance);
         // LP depositing into AMM empty state gets the auction slot
         // and the voting
-        if (lptAMMBalance == beast::kZERO)
+        if (lptAMMBalance == beast::kZero)
             initializeFeeAuctionVote(sb, ammSle, account_, lptAMMBalance.asset(), tfee);
 
         sb.update(ammSle);
@@ -513,7 +513,7 @@ AMMDeposit::deposit(
     // Check account has sufficient funds.
     // Return true if it does, false otherwise.
     auto checkBalance = [&](auto const& depositAmount) -> TER {
-        if (depositAmount <= beast::kZERO)
+        if (depositAmount <= beast::kZero)
             return temBAD_AMOUNT;
         if (isXRP(depositAmount))
         {
@@ -547,7 +547,7 @@ AMMDeposit::deposit(
             tfee,
             IsDeposit::Yes);
 
-    if (lpTokensDepositActual <= beast::kZERO)
+    if (lpTokensDepositActual <= beast::kZero)
     {
         JLOG(ctx_.journal.debug()) << "AMM Deposit: adjusted tokens zero";
         return {tecAMM_INVALID_TOKENS, STAmount{}};
@@ -642,7 +642,7 @@ AMMDeposit::equalDepositTokens(
     try
     {
         auto const tokensAdj = adjustLPTokensOut(view.rules(), lptAMMBalance, lpTokensDeposit);
-        if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+        if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
             return {tecAMM_INVALID_TOKENS, STAmount{}};
         auto const frac = divide(tokensAdj, lptAMMBalance, lptAMMBalance.asset());
         // amounts factor in the adjusted tokens
@@ -714,7 +714,7 @@ AMMDeposit::equalDepositLimit(
 {
     auto frac = Number{amount} / amountBalance;
     auto tokensAdj = getRoundedLPTokens(view.rules(), lptAMMBalance, frac, IsDeposit::Yes);
-    if (tokensAdj == beast::kZERO)
+    if (tokensAdj == beast::kZero)
     {
         if (!view.rules().enabled(fixAMMv1_3))
         {
@@ -743,7 +743,7 @@ AMMDeposit::equalDepositLimit(
     }
     frac = Number{amount2} / amount2Balance;
     tokensAdj = getRoundedLPTokens(view.rules(), lptAMMBalance, frac, IsDeposit::Yes);
-    if (tokensAdj == beast::kZERO)
+    if (tokensAdj == beast::kZero)
     {
         if (!view.rules().enabled(fixAMMv1_3))
         {
@@ -793,7 +793,7 @@ AMMDeposit::singleDeposit(
 {
     auto const tokens = adjustLPTokensOut(
         view.rules(), lptAMMBalance, lpTokensOut(amountBalance, amount, lptAMMBalance, tfee));
-    if (tokens == beast::kZERO)
+    if (tokens == beast::kZero)
     {
         if (!view.rules().enabled(fixAMMv1_3))
         {
@@ -805,7 +805,7 @@ AMMDeposit::singleDeposit(
     // factor in the adjusted tokens
     auto const [tokensAdj, amountDepositAdj] =
         adjustAssetInByTokens(view.rules(), amountBalance, amount, lptAMMBalance, tokens, tfee);
-    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
         return {tecAMM_INVALID_TOKENS, STAmount{}};  // LCOV_EXCL_LINE
     return deposit(
         view,
@@ -839,7 +839,7 @@ AMMDeposit::singleDepositTokens(
     std::uint16_t tfee)
 {
     auto const tokensAdj = adjustLPTokensOut(view.rules(), lptAMMBalance, lpTokensDeposit);
-    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
         return {tecAMM_INVALID_TOKENS, STAmount{}};
     // the adjusted tokens are factored in
     auto const amountDeposit = ammAssetIn(amountBalance, lptAMMBalance, tokensAdj, tfee);
@@ -894,11 +894,11 @@ AMMDeposit::singleDepositEPrice(
     STAmount const& ePrice,
     std::uint16_t tfee)
 {
-    if (amount != beast::kZERO)
+    if (amount != beast::kZero)
     {
         auto const tokens = adjustLPTokensOut(
             view.rules(), lptAMMBalance, lpTokensOut(amountBalance, amount, lptAMMBalance, tfee));
-        if (tokens <= beast::kZERO)
+        if (tokens <= beast::kZero)
         {
             if (!view.rules().enabled(fixAMMv1_3))
             {
@@ -910,7 +910,7 @@ AMMDeposit::singleDepositEPrice(
         // factor in the adjusted tokens
         auto const [tokensAdj, amountDepositAdj] =
             adjustAssetInByTokens(view.rules(), amountBalance, amount, lptAMMBalance, tokens, tfee);
-        if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+        if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
             return {tecAMM_INVALID_TOKENS, STAmount{}};  // LCOV_EXCL_LINE
         auto const ep = Number{amountDepositAdj} / tokensAdj;
         if (ep <= ePrice)
@@ -958,7 +958,7 @@ AMMDeposit::singleDepositEPrice(
     auto amtProdCb = [&] { return f1 * solveQuadraticEq(a1, b1, c1); };
     auto const amountDeposit =
         getRoundedAsset(view.rules(), amtNoRoundCb, amountBalance, amtProdCb, IsDeposit::Yes);
-    if (amountDeposit <= beast::kZERO)
+    if (amountDeposit <= beast::kZero)
         return {tecAMM_FAILED, STAmount{}};
     auto tokNoRoundCb = [&] { return amountDeposit / ePrice; };
     auto tokProdCb = [&] { return amountDeposit / ePrice; };
@@ -967,7 +967,7 @@ AMMDeposit::singleDepositEPrice(
     // factor in the adjusted tokens
     auto const [tokensAdj, amountDepositAdj] = adjustAssetInByTokens(
         view.rules(), amountBalance, amountDeposit, lptAMMBalance, tokens, tfee);
-    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
         return {tecAMM_INVALID_TOKENS, STAmount{}};  // LCOV_EXCL_LINE
 
     return deposit(
diff --git a/src/libxrpl/tx/transactors/dex/AMMVote.cpp b/src/libxrpl/tx/transactors/dex/AMMVote.cpp
index eb4a5e87be..30ae6004f0 100644
--- a/src/libxrpl/tx/transactors/dex/AMMVote.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMVote.cpp
@@ -47,7 +47,7 @@ AMMVote::preflight(PreflightContext const& ctx)
         return res;
     }
 
-    if (ctx.tx[sfTradingFee] > kTRADING_FEE_THRESHOLD)
+    if (ctx.tx[sfTradingFee] > kTradingFeeThreshold)
     {
         JLOG(ctx.j.debug()) << "AMM Vote: invalid trading fee.";
         return temBAD_FEE;
@@ -65,12 +65,12 @@ AMMVote::preclaim(PreclaimContext const& ctx)
         JLOG(ctx.j.debug()) << "AMM Vote: Invalid asset pair.";
         return terNO_AMM;
     }
-    if (ammSle->getFieldAmount(sfLPTokenBalance) == beast::kZERO)
+    if (ammSle->getFieldAmount(sfLPTokenBalance) == beast::kZero)
     {
         return tecAMM_EMPTY;
     }
     if (auto const lpTokensNew = ammLPHolds(ctx.view, *ammSle, ctx.tx[sfAccount], ctx.j);
-        lpTokensNew == beast::kZERO)
+        lpTokensNew == beast::kZero)
     {
         JLOG(ctx.j.debug()) << "AMM Vote: account is not LP.";
         return tecAMM_INVALID_TOKENS;
@@ -106,7 +106,7 @@ applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journ
     {
         auto const entryAccount = entry[sfAccount];
         auto lpTokens = ammLPHolds(sb, *ammSle, entryAccount, ctx.journal);
-        if (lpTokens == beast::kZERO)
+        if (lpTokens == beast::kZero)
         {
             JLOG(j.debug()) << "AMMVote::applyVote, account " << entryAccount << " is not LP";
             continue;
@@ -128,8 +128,7 @@ applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journ
             newEntry.setFieldU16(sfTradingFee, feeVal);
         newEntry.setFieldU32(
             sfVoteWeight,
-            static_cast<std::int64_t>(
-                Number(lpTokens) * kVOTE_WEIGHT_SCALE_FACTOR / lptAMMBalance));
+            static_cast<std::int64_t>(Number(lpTokens) * kVoteWeightScaleFactor / lptAMMBalance));
 
         // Find an entry with the least tokens/fee. Make the order deterministic
         // if the tokens/fees are equal.
@@ -156,7 +155,7 @@ applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journ
             newEntry.setFieldU32(
                 sfVoteWeight,
                 static_cast<std::int64_t>(
-                    Number(lpTokensNew) * kVOTE_WEIGHT_SCALE_FACTOR / lptAMMBalance));
+                    Number(lpTokensNew) * kVoteWeightScaleFactor / lptAMMBalance));
             newEntry.setAccountID(sfAccount, account);
             num += feeNew * lpTokensNew;
             den += lpTokensNew;
@@ -171,7 +170,7 @@ applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journ
         };
         // Add new entry if the number of the vote entries
         // is less than Max.
-        if (updatedVoteSlots.size() < kVOTE_MAX_SLOTS)
+        if (updatedVoteSlots.size() < kVoteMaxSlots)
         {
             update();
             // Add the entry if the account has more tokens than
@@ -209,7 +208,7 @@ applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journ
         if (ammSle->isFieldPresent(sfAuctionSlot))
         {
             auto& auctionSlot = ammSle->peekFieldObject(sfAuctionSlot);
-            if (auto const discountedFee = fee / kAUCTION_SLOT_DISCOUNTED_FEE_FRACTION)
+            if (auto const discountedFee = fee / kAuctionSlotDiscountedFeeFraction)
             {
                 auctionSlot.setFieldU16(sfDiscountedFee, discountedFee);
             }
diff --git a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
index b13297df33..60968227ea 100644
--- a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
@@ -134,7 +134,7 @@ AMMWithdraw::preflight(PreflightContext const& ctx)
         return temBAD_AMM_TOKENS;
     }
 
-    if (lpTokens && *lpTokens <= beast::kZERO)
+    if (lpTokens && *lpTokens <= beast::kZero)
     {
         JLOG(ctx.j.debug()) << "AMM Withdraw: invalid tokens.";
         return temBAD_AMM_TOKENS;
@@ -211,10 +211,10 @@ AMMWithdraw::preclaim(PreclaimContext const& ctx)
     if (!expected)
         return expected.error();
     auto const [amountBalance, amount2Balance, lptAMMBalance] = *expected;
-    if (lptAMMBalance == beast::kZERO)
+    if (lptAMMBalance == beast::kZero)
         return tecAMM_EMPTY;
-    if (amountBalance <= beast::kZERO || amount2Balance <= beast::kZERO ||
-        lptAMMBalance < beast::kZERO)
+    if (amountBalance <= beast::kZero || amount2Balance <= beast::kZero ||
+        lptAMMBalance < beast::kZero)
     {
         // LCOV_EXCL_START
         JLOG(ctx.j.debug()) << "AMM Withdraw: reserves or tokens balance is zero.";
@@ -273,7 +273,7 @@ AMMWithdraw::preclaim(PreclaimContext const& ctx)
     auto const lpTokens = ammLPHolds(ctx.view, *ammSle, ctx.tx[sfAccount], ctx.j);
     auto const lpTokensWithdraw = tokensWithdraw(lpTokens, ctx.tx[~sfLPTokenIn], ctx.tx.getFlags());
 
-    if (lpTokens <= beast::kZERO)
+    if (lpTokens <= beast::kZero)
     {
         JLOG(ctx.j.debug()) << "AMM Withdraw: tokens balance is zero.";
         return tecAMM_BALANCE;
@@ -517,7 +517,7 @@ AMMWithdraw::withdraw(
         return std::make_tuple(amountWithdraw, amount2Withdraw, lpTokensWithdraw);
     }();
 
-    if (lpTokensWithdrawActual <= beast::kZERO || lpTokensWithdrawActual > lpTokens)
+    if (lpTokensWithdrawActual <= beast::kZero || lpTokensWithdrawActual > lpTokens)
     {
         JLOG(journal.debug()) << "AMM Withdraw: failed to withdraw, invalid LP tokens: "
                               << lpTokensWithdrawActual << " " << lpTokens << " "
@@ -576,10 +576,10 @@ AMMWithdraw::withdraw(
     // or all balances are non-zero.
     if (view.rules().enabled(featureMPTokensV2))
     {
-        bool const newBalanceZero = (curBalance - amountWithdrawActual) == beast::kZERO;
+        bool const newBalanceZero = (curBalance - amountWithdrawActual) == beast::kZero;
         bool const newBalance2Zero =
-            (curBalance2 - amount2WithdrawActual.value_or(curBalance2.asset())) == beast::kZERO;
-        bool const newLPTokensZero = (lpTokensAMMBalance - lpTokensWithdrawActual) == beast::kZERO;
+            (curBalance2 - amount2WithdrawActual.value_or(curBalance2.asset())) == beast::kZero;
+        bool const newLPTokensZero = (lpTokensAMMBalance - lpTokensWithdrawActual) == beast::kZero;
         // newBalance2Zero can be zero if that side of the pool is frozen.
         // ignore newBalance2Zero if one-sided withdrawal.
         bool const valid = [&]() {
@@ -629,7 +629,7 @@ AMMWithdraw::withdraw(
 
             // See also TrustSet::doApply() and MPTokenAuthorize::authorize()
             XRPAmount const reserve(
-                (ownerCount < 2) ? XRPAmount(beast::kZERO)
+                (ownerCount < 2) ? XRPAmount(beast::kZero)
                                  : view.fees().accountReserve(ownerCount + 1));
 
             auto const balanceAdj = isIssue ? std::max(priorBalance, balance.xrp()) : priorBalance;
@@ -775,7 +775,7 @@ AMMWithdraw::deleteAMMAccountIfEmpty(
 {
     TER ter;
     bool updateBalance = true;
-    if (lpTokenBalance == beast::kZERO)
+    if (lpTokenBalance == beast::kZero)
     {
         ter = deleteAMMAccount(sb, asset1, asset2, journal);
         if (!isTesSuccess(ter) && ter != tecINCOMPLETE)
@@ -838,7 +838,7 @@ AMMWithdraw::equalWithdrawTokens(
 
         auto const tokensAdj =
             adjustLPTokensIn(view.rules(), lptAMMBalance, lpTokensWithdraw, withdrawAll);
-        if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+        if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
             return {tecAMM_INVALID_TOKENS, STAmount{}, STAmount{}, std::nullopt};
         // the adjusted tokens are factored in
         auto const frac = divide(tokensAdj, lptAMMBalance, noIssue());
@@ -850,7 +850,7 @@ AMMWithdraw::equalWithdrawTokens(
         // of LP tokens is likely too small and results in one-sided pool
         // withdrawal due to round off. Fail so the user withdraws
         // more tokens.
-        if (amountWithdraw == beast::kZERO || amount2Withdraw == beast::kZERO)
+        if (amountWithdraw == beast::kZero || amount2Withdraw == beast::kZero)
             return {tecAMM_FAILED, STAmount{}, STAmount{}, STAmount{}};
 
         return withdraw(
@@ -918,7 +918,7 @@ AMMWithdraw::equalWithdrawLimit(
 {
     auto frac = Number{amount} / amountBalance;
     auto tokensAdj = getRoundedLPTokens(view.rules(), lptAMMBalance, frac, IsDeposit::No);
-    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
         return {tecAMM_INVALID_TOKENS, STAmount{}};
     // factor in the adjusted tokens
     frac = adjustFracByTokens(view.rules(), lptAMMBalance, tokensAdj, frac);
@@ -940,7 +940,7 @@ AMMWithdraw::equalWithdrawLimit(
     frac = Number{amount2} / amount2Balance;
     auto amountWithdraw = getRoundedAsset(view.rules(), amountBalance, frac, IsDeposit::No);
     tokensAdj = getRoundedLPTokens(view.rules(), lptAMMBalance, frac, IsDeposit::No);
-    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
         return {tecAMM_INVALID_TOKENS, STAmount{}};  // LCOV_EXCL_LINE
     // factor in the adjusted tokens
     frac = adjustFracByTokens(view.rules(), lptAMMBalance, tokensAdj, frac);
@@ -989,7 +989,7 @@ AMMWithdraw::singleWithdraw(
         lptAMMBalance,
         lpTokensIn(amountBalance, amount, lptAMMBalance, tfee),
         isWithdrawAll(ctx_.tx));
-    if (tokens == beast::kZERO)
+    if (tokens == beast::kZero)
     {
         if (!view.rules().enabled(fixAMMv1_3))
         {
@@ -1001,7 +1001,7 @@ AMMWithdraw::singleWithdraw(
     // factor in the adjusted tokens
     auto const [tokensAdj, amountWithdrawAdj] =
         adjustAssetOutByTokens(view.rules(), amountBalance, amount, lptAMMBalance, tokens, tfee);
-    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
         return {tecAMM_INVALID_TOKENS, STAmount{}};  // LCOV_EXCL_LINE
     return withdraw(
         view,
@@ -1038,11 +1038,11 @@ AMMWithdraw::singleWithdrawTokens(
 {
     auto const tokensAdj =
         adjustLPTokensIn(view.rules(), lptAMMBalance, lpTokensWithdraw, isWithdrawAll(ctx_.tx));
-    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZERO)
+    if (view.rules().enabled(fixAMMv1_3) && tokensAdj == beast::kZero)
         return {tecAMM_INVALID_TOKENS, STAmount{}};
     // the adjusted tokens are factored in
     auto const amountWithdraw = ammAssetOut(amountBalance, lptAMMBalance, tokensAdj, tfee);
-    if (amount == beast::kZERO || amountWithdraw >= amount)
+    if (amount == beast::kZero || amountWithdraw >= amount)
     {
         return withdraw(
             view,
@@ -1107,7 +1107,7 @@ AMMWithdraw::singleWithdrawEPrice(
     auto tokProdCb = [&] { return (lptAMMBalance + ae * (f - 2)) / (lptAMMBalance * f - ae); };
     auto const tokensAdj =
         getRoundedLPTokens(view.rules(), tokNoRoundCb, lptAMMBalance, tokProdCb, IsDeposit::No);
-    if (tokensAdj <= beast::kZERO)
+    if (tokensAdj <= beast::kZero)
     {
         if (!view.rules().enabled(fixAMMv1_3))
         {
@@ -1121,7 +1121,7 @@ AMMWithdraw::singleWithdrawEPrice(
     // the adjusted tokens are factored in
     auto const amountWithdraw =
         getRoundedAsset(view.rules(), amtNoRoundCb, amount, amtProdCb, IsDeposit::No);
-    if (amount == beast::kZERO || amountWithdraw >= amount)
+    if (amount == beast::kZero || amountWithdraw >= amount)
     {
         return withdraw(
             view,
diff --git a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
index d6a83beb51..97121ce398 100644
--- a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
@@ -57,7 +57,7 @@ OfferCreate::makeTxConsequences(PreflightContext const& ctx)
 {
     auto calculateMaxXRPSpend = [](STTx const& tx) -> XRPAmount {
         auto const& amount{tx[sfTakerGets]};
-        return amount.native() ? amount.xrp() : beast::kZERO;
+        return amount.native() ? amount.xrp() : beast::kZero;
     };
 
     return TxConsequences{ctx.tx, calculateMaxXRPSpend(ctx.tx)};
@@ -128,7 +128,7 @@ OfferCreate::preflight(PreflightContext const& ctx)
         JLOG(j.debug()) << "Malformed offer: redundant (XRP for XRP)";
         return temBAD_OFFER;
     }
-    if (saTakerPays <= beast::kZERO || saTakerGets <= beast::kZERO)
+    if (saTakerPays <= beast::kZero || saTakerGets <= beast::kZero)
     {
         JLOG(j.debug()) << "Malformed offer: bad amount";
         return temBAD_OFFER;
@@ -196,7 +196,7 @@ OfferCreate::preclaim(PreclaimContext const& ctx)
             saTakerGets,
             FreezeHandling::ZeroIfFrozen,
             AuthHandling::ZeroIfUnauthorized,
-            viewJ) <= beast::kZERO)
+            viewJ) <= beast::kZero)
     {
         JLOG(ctx.j.debug()) << "delay: Offers must be at least partially funded.";
         return tecUNFUNDED_OFFER;
@@ -349,7 +349,7 @@ OfferCreate::flowCross(
         // Allow unfunded MPT issuer
         auto const disallowUnfunded =
             !inStartBalance.holds<MPTIssue>() || inStartBalance.getIssuer() != account_;
-        if (disallowUnfunded && inStartBalance <= beast::kZERO)
+        if (disallowUnfunded && inStartBalance <= beast::kZero)
         {
             // The account balance can't cover even part of the offer.
             JLOG(j_.debug()) << "Not crossing: taker is unfunded.";
@@ -409,7 +409,7 @@ OfferCreate::flowCross(
                 [&](Issue const& issue) {
                     if (issue.native())
                     {
-                        deliver = STAmount{STAmount::kMAX_NATIVE};
+                        deliver = STAmount{STAmount::kMaxNative};
                     }
                     // We can't use the maximum possible currency here because
                     // there might be a gateway transfer rate to account for.
@@ -418,12 +418,10 @@ OfferCreate::flowCross(
                     else
                     {
                         deliver =
-                            STAmount{deliverAsset, STAmount::kMAX_VALUE / 2, STAmount::kMAX_OFFSET};
+                            STAmount{deliverAsset, STAmount::kMaxValue / 2, STAmount::kMaxOffset};
                     }
                 },
-                [&](MPTIssue const&) {
-                    deliver = STAmount{deliverAsset, kMAX_MP_TOKEN_AMOUNT / 2};
-                });
+                [&](MPTIssue const&) { deliver = STAmount{deliverAsset, kMaxMpTokenAmount / 2}; });
         }
 
         // Call the payment engine's flow() to do the actual work.
@@ -463,7 +461,7 @@ OfferCreate::flowCross(
                 AuthHandling::ZeroIfUnauthorized,
                 j_);
 
-            if (disallowUnfunded && takerInBalance <= beast::kZERO)
+            if (disallowUnfunded && takerInBalance <= beast::kZero)
             {
                 // If offer crossing exhausted the account's funds don't
                 // create the offer.
@@ -494,8 +492,8 @@ OfferCreate::flowCross(
                     afterCross.in -= nonGatewayAmountIn;
 
                     // It's possible that the divRound will cause our subtract
-                    // to go slightly negative.  So limit afterCross.in to beast::kZERO.
-                    if (afterCross.in < beast::kZERO)
+                    // to go slightly negative.  So limit afterCross.in to beast::kZero.
+                    if (afterCross.in < beast::kZero)
                     {
                         // We should verify that the difference *is* small, but
                         // what is a good threshold to check?
@@ -512,9 +510,9 @@ OfferCreate::flowCross(
                     // Quality.
                     afterCross.out -= result.actualAmountOut;
                     XRPL_ASSERT(
-                        afterCross.out >= beast::kZERO,
+                        afterCross.out >= beast::kZero,
                         "xrpl::OfferCreate::flowCross : minimum offer");
-                    if (afterCross.out < beast::kZERO)
+                    if (afterCross.out < beast::kZero)
                         afterCross.out.clear();
                     afterCross.in = mulRound(afterCross.out, rate, takerAmount.in.asset(), true);
                 }
@@ -560,7 +558,7 @@ OfferCreate::applyHybrid(
     // if offer is hybrid, need to also place into open offer dir
     Book const book{saTakerPays.asset(), saTakerGets.asset(), std::nullopt};
 
-    auto dir = keylet::quality(keylet::kBOOK(book), getRate(saTakerGets, saTakerPays));
+    auto dir = keylet::quality(keylet::kBook(book), getRate(saTakerGets, saTakerPays));
     bool const bookExists = sb.exists(dir);
 
     auto const bookNode = sb.dirAppend(dir, offerKey, [&](SLE::ref sle) {
@@ -591,7 +589,7 @@ OfferCreate::applyHybrid(
 std::pair<TER, bool>
 OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
 {
-    using beast::kZERO;
+    using beast::kZero;
 
     bool const bPassive(ctx_.tx.isFlag(tfPassive));
     bool const bImmediateOrCancel(ctx_.tx.isFlag(tfImmediateOrCancel));
@@ -650,7 +648,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
         auto const& uPaysIssuerID = saTakerPays.getIssuer();
         auto const& uGetsIssuerID = saTakerGets.getIssuer();
 
-        std::uint8_t uTickSize = Quality::kMAX_TICK_SIZE;
+        std::uint8_t uTickSize = Quality::kMaxTickSize;
         // Not XRP or MPT
         if (!saTakerPays.integral())
         {
@@ -665,7 +663,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
             if (sle && sle->isFieldPresent(sfTickSize))
                 uTickSize = std::min(uTickSize, (*sle)[sfTickSize]);
         }
-        if (uTickSize < Quality::kMAX_TICK_SIZE)
+        if (uTickSize < Quality::kMaxTickSize)
         {
             auto const rate = Quality{saTakerGets, saTakerPays}.round(uTickSize).rate();
 
@@ -751,7 +749,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
 
         // The offer that we need to place after offer crossing should
         // never be negative. If it is, something went very very wrong.
-        if (placeOffer.in < kZERO || placeOffer.out < kZERO)
+        if (placeOffer.in < kZero || placeOffer.out < kZero)
         {
             JLOG(j_.fatal()) << "Cross left offer negative!"
                              << "     in: " << formatAmount(placeOffer.in)
@@ -759,7 +757,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
             return {tefINTERNAL, true};
         }
 
-        if (placeOffer.in == kZERO || placeOffer.out == kZERO)
+        if (placeOffer.in == kZero || placeOffer.out == kZero)
         {
             JLOG(j_.debug()) << "Offer fully crossed!";
             return {result, true};
@@ -773,7 +771,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
     }
 
     XRPL_ASSERT(
-        saTakerPays > beast::kZERO && saTakerGets > beast::kZERO,
+        saTakerPays > beast::kZero && saTakerGets > beast::kZero,
         "xrpl::OfferCreate::applyGuts : taker pays and gets positive");
 
     if (!isTesSuccess(result))
@@ -872,7 +870,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
     // Hybrid domain offer - BookDirectory points to domain directory,
     // and AdditionalBooks field stores one entry that points to the open
     // directory
-    auto dir = keylet::quality(keylet::kBOOK(book), uRate);
+    auto dir = keylet::quality(keylet::kBook(book), uRate);
     bool const bookExisted = static_cast<bool>(sb.peek(dir));
 
     auto setBookDir = [&](SLE::ref sle, std::optional<uint256> const& maybeDomain) {
diff --git a/src/libxrpl/tx/transactors/did/DIDSet.cpp b/src/libxrpl/tx/transactors/did/DIDSet.cpp
index fbed821280..f7276eac04 100644
--- a/src/libxrpl/tx/transactors/did/DIDSet.cpp
+++ b/src/libxrpl/tx/transactors/did/DIDSet.cpp
@@ -55,9 +55,8 @@ DIDSet::preflight(PreflightContext const& ctx)
         return false;
     };
 
-    if (isTooLong(sfURI, kMAX_DIDURI_LENGTH) ||
-        isTooLong(sfDIDDocument, kMAX_DID_DOCUMENT_LENGTH) ||
-        isTooLong(sfData, kMAX_DID_DATA_LENGTH))
+    if (isTooLong(sfURI, kMaxDidUriLength) || isTooLong(sfDIDDocument, kMaxDidDocumentLength) ||
+        isTooLong(sfData, kMaxDidDataLength))
         return temMALFORMED;
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
index 05d6a29454..d249bb8379 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
@@ -183,7 +183,7 @@ EscrowCancel::doApply()
                 [&]<typename T>(T const&) {
                     return escrowUnlockApplyHelper<T>(
                         ctx_.view(),
-                        kPARITY_RATE,
+                        kParityRate,
                         slep,
                         preFeeBalance_,
                         amount,
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
index e9c7857072..2e738d0de5 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
@@ -78,7 +78,7 @@ TxConsequences
 EscrowCreate::makeTxConsequences(PreflightContext const& ctx)
 {
     auto const amount = ctx.tx[sfAmount];
-    return TxConsequences{ctx.tx, isXRP(amount) ? amount.xrp() : beast::kZERO};
+    return TxConsequences{ctx.tx, isXRP(amount) ? amount.xrp() : beast::kZero};
 }
 
 template <ValidIssueType T>
@@ -90,7 +90,7 @@ NotTEC
 escrowCreatePreflightHelper<Issue>(PreflightContext const& ctx)
 {
     STAmount const amount = ctx.tx[sfAmount];
-    if (amount.native() || amount <= beast::kZERO)
+    if (amount.native() || amount <= beast::kZero)
         return temBAD_AMOUNT;
 
     if (badCurrency() == amount.get<Issue>().currency)
@@ -107,7 +107,7 @@ escrowCreatePreflightHelper<MPTIssue>(PreflightContext const& ctx)
         return temDISABLED;
 
     auto const amount = ctx.tx[sfAmount];
-    if (amount.native() || amount.mpt() > MPTAmount{kMAX_MP_TOKEN_AMOUNT} || amount <= beast::kZERO)
+    if (amount.native() || amount.mpt() > MPTAmount{kMaxMpTokenAmount} || amount <= beast::kZero)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -130,7 +130,7 @@ EscrowCreate::preflight(PreflightContext const& ctx)
     }
     else
     {
-        if (amount <= beast::kZERO)
+        if (amount <= beast::kZero)
             return temBAD_AMOUNT;
     }
 
@@ -205,11 +205,11 @@ escrowCreatePreclaimHelper<Issue>(
     STAmount const balance = (*sleRippleState)[sfBalance];
 
     // If balance is positive, issuer must have higher address than account
-    if (balance > beast::kZERO && issuer < account)
+    if (balance > beast::kZero && issuer < account)
         return tecNO_PERMISSION;  // LCOV_EXCL_LINE
 
     // If balance is negative, issuer must have lower address than account
-    if (balance < beast::kZERO && issuer > account)
+    if (balance < beast::kZero && issuer > account)
         return tecNO_PERMISSION;  // LCOV_EXCL_LINE
 
     // If the issuer has requireAuth set, check if the account is authorized
@@ -232,7 +232,7 @@ escrowCreatePreclaimHelper<Issue>(
         ctx.view, account, issue.currency, issuer, FreezeHandling::IgnoreFreeze, ctx.j);
 
     // If the balance is less than or equal to 0, return tecINSUFFICIENT_FUNDS
-    if (spendableAmount <= beast::kZERO)
+    if (spendableAmount <= beast::kZero)
         return tecINSUFFICIENT_FUNDS;
 
     // If the spendable amount is less than the amount, return
@@ -313,7 +313,7 @@ escrowCreatePreclaimHelper<MPTIssue>(
         ctx.j);
 
     // If the balance is less than or equal to 0, return tecINSUFFICIENT_FUNDS
-    if (spendableAmount <= beast::kZERO)
+    if (spendableAmount <= beast::kZero)
         return tecINSUFFICIENT_FUNDS;
 
     // If the spendable amount is less than the amount, return
@@ -467,7 +467,7 @@ EscrowCreate::doApply()
     if (ctx_.view().rules().enabled(featureTokenEscrow) && !isXRP(amount))
     {
         auto const xferRate = transferRate(ctx_.view(), amount);
-        if (xferRate != kPARITY_RATE)
+        if (xferRate != kParityRate)
             (*slep)[sfTransferRate] = xferRate.value;
     }
 
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
index fb6c77c61a..499db45794 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
@@ -39,8 +39,8 @@ namespace xrpl {
 // During an EscrowFinish, the transaction must specify both
 // a condition and a fulfillment. We track whether that
 // fulfillment matches and validates the condition.
-constexpr HashRouterFlags kSF_CF_INVALID = HashRouterFlags::PRIVATE5;
-constexpr HashRouterFlags kSF_CF_VALID = HashRouterFlags::PRIVATE6;
+constexpr HashRouterFlags kSfCfInvalid = HashRouterFlags::PRIVATE5;
+constexpr HashRouterFlags kSfCfValid = HashRouterFlags::PRIVATE6;
 
 //------------------------------------------------------------------------------
 
@@ -98,15 +98,15 @@ EscrowFinish::preflightSigValidated(PreflightContext const& ctx)
         // If we haven't checked the condition, check it
         // now. Whether it passes or not isn't important
         // in preflight.
-        if (!any(flags & (kSF_CF_INVALID | kSF_CF_VALID)))
+        if (!any(flags & (kSfCfInvalid | kSfCfValid)))
         {
             if (checkCondition(*fb, *cb))
             {
-                router.setFlags(id, kSF_CF_VALID);
+                router.setFlags(id, kSfCfValid);
             }
             else
             {
-                router.setFlags(id, kSF_CF_INVALID);
+                router.setFlags(id, kSfCfInvalid);
             }
         }
     }
@@ -261,7 +261,7 @@ EscrowFinish::doApply()
         // It's unlikely that the results of the check will
         // expire from the hash router, but if it happens,
         // simply re-run the check.
-        if (cb && !any(flags & (kSF_CF_INVALID | kSF_CF_VALID)))
+        if (cb && !any(flags & (kSfCfInvalid | kSfCfValid)))
         {
             // LCOV_EXCL_START
             auto const fb = ctx_.tx[~sfFulfillment];
@@ -271,11 +271,11 @@ EscrowFinish::doApply()
 
             if (checkCondition(*fb, *cb))
             {
-                flags = kSF_CF_VALID;
+                flags = kSfCfValid;
             }
             else
             {
-                flags = kSF_CF_INVALID;
+                flags = kSfCfInvalid;
             }
 
             ctx_.registry.get().getHashRouter().setFlags(id, flags);
@@ -284,7 +284,7 @@ EscrowFinish::doApply()
 
         // If the check failed, then simply return an error
         // and don't look at anything else.
-        if (any(flags & kSF_CF_INVALID))
+        if (any(flags & kSfCfInvalid))
             return tecCRYPTOCONDITION_ERROR;
 
         // Check against condition in the ledger entry:
@@ -353,7 +353,7 @@ EscrowFinish::doApply()
 
         Rate lockedRate = slep->isFieldPresent(sfTransferRate)
             ? xrpl::Rate(slep->getFieldU32(sfTransferRate))
-            : kPARITY_RATE;
+            : kParityRate;
         auto const issuer = amount.getIssuer();
         bool const createAsset = destID == account_;
         if (auto const ret = std::visit(
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
index c59a02d4c2..ab26353a1c 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
@@ -48,7 +48,7 @@ LoanBrokerCoverClawback::preflight(PreflightContext const& ctx)
     if (!brokerID && !amount)
         return temINVALID;
 
-    if (brokerID && *brokerID == beast::kZERO)
+    if (brokerID && *brokerID == beast::kZero)
         return temINVALID;
 
     if (amount)
@@ -58,7 +58,7 @@ LoanBrokerCoverClawback::preflight(PreflightContext const& ctx)
             return temBAD_AMOUNT;
 
         // Zero is OK, and indicates "take it all" (down to the minimum cover)
-        if (*amount < beast::kZERO)
+        if (*amount < beast::kZero)
             return temBAD_AMOUNT;
 
         // This should be redundant
@@ -75,7 +75,7 @@ LoanBrokerCoverClawback::preflight(PreflightContext const& ctx)
             // broker's pseudo-account, but we don't know yet whether it is, so
             // use a generic placeholder name.
             auto const holder = amount->getIssuer();
-            if (holder == account || holder == beast::kZERO)
+            if (holder == account || holder == beast::kZero)
                 return temINVALID;
         }
     }
@@ -171,13 +171,13 @@ determineClawAmount(
         NumberRoundModeGuard const mg2(Number::RoundingMode::Downward);
         return sleBroker[sfCoverAvailable] - minRequiredCover;
     }();
-    if (maxClawAmount <= beast::kZERO)
+    if (maxClawAmount <= beast::kZero)
         return Unexpected(tecINSUFFICIENT_FUNDS);
 
     // Use the vaultAsset here, because it will be the right type in all
     // circumstances. The amount may be an IOU indicating the pseudo-account's
     // asset, which is correct, but not what is needed here.
-    if (!amount || *amount == beast::kZERO)
+    if (!amount || *amount == beast::kZero)
         return STAmount{vaultAsset, maxClawAmount};
     Number const magnitude{*amount};
     if (magnitude > maxClawAmount)
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
index a35878f5c6..3ea37bbf27 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
@@ -27,11 +27,11 @@ LoanBrokerCoverDeposit::checkExtraFeatures(PreflightContext const& ctx)
 NotTEC
 LoanBrokerCoverDeposit::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfLoanBrokerID] == beast::kZERO)
+    if (ctx.tx[sfLoanBrokerID] == beast::kZero)
         return temINVALID;
 
     auto const dstAmount = ctx.tx[sfAmount];
-    if (dstAmount <= beast::kZERO)
+    if (dstAmount <= beast::kZero)
         return temBAD_AMOUNT;
 
     if (!isLegalNet(dstAmount))
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
index 127d23a270..824c6ea25c 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
@@ -32,11 +32,11 @@ LoanBrokerCoverWithdraw::checkExtraFeatures(PreflightContext const& ctx)
 NotTEC
 LoanBrokerCoverWithdraw::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfLoanBrokerID] == beast::kZERO)
+    if (ctx.tx[sfLoanBrokerID] == beast::kZero)
         return temINVALID;
 
     auto const dstAmount = ctx.tx[sfAmount];
-    if (dstAmount <= beast::kZERO)
+    if (dstAmount <= beast::kZero)
         return temBAD_AMOUNT;
 
     if (!isLegalNet(dstAmount))
@@ -44,7 +44,7 @@ LoanBrokerCoverWithdraw::preflight(PreflightContext const& ctx)
 
     if (auto const destination = ctx.tx[~sfDestination])
     {
-        if (*destination == beast::kZERO)
+        if (*destination == beast::kZero)
         {
             return temMALFORMED;
         }
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
index 2c5767f9cc..134e0090fa 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
@@ -30,7 +30,7 @@ LoanBrokerDelete::checkExtraFeatures(PreflightContext const& ctx)
 NotTEC
 LoanBrokerDelete::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfLoanBrokerID] == beast::kZERO)
+    if (ctx.tx[sfLoanBrokerID] == beast::kZero)
         return temINVALID;
 
     return tesSUCCESS;
@@ -75,7 +75,7 @@ LoanBrokerDelete::preclaim(PreclaimContext const& ctx)
 
     Asset const asset = vault->at(sfAsset);
 
-    if (auto const debtTotal = sleBroker->at(sfDebtTotal); debtTotal != beast::kZERO)
+    if (auto const debtTotal = sleBroker->at(sfDebtTotal); debtTotal != beast::kZero)
     {
         // Any remaining debt should have been wiped out by the last Loan
         // Delete. This check is purely defensive.
@@ -84,7 +84,7 @@ LoanBrokerDelete::preclaim(PreclaimContext const& ctx)
         auto const rounded =
             roundToAsset(asset, debtTotal, scale, Number::RoundingMode::TowardsZero);
 
-        if (rounded != beast::kZERO)
+        if (rounded != beast::kZero)
         {
             // LCOV_EXCL_START
             JLOG(ctx.j.warn()) << "LoanBrokerDelete: Debt total is " << debtTotal
@@ -97,7 +97,7 @@ LoanBrokerDelete::preclaim(PreclaimContext const& ctx)
     auto const coverAvailable = STAmount{asset, sleBroker->at(sfCoverAvailable)};
     // If there are assets in the cover, broker will receive them on deletion.
     // So we need to check if the broker owner is deep frozen for that asset.
-    if (coverAvailable > beast::kZERO)
+    if (coverAvailable > beast::kZero)
     {
         if (auto const ret = checkDeepFrozen(ctx.view, brokerOwner, asset))
         {
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
index 97ef73515a..2a40ed1429 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
@@ -38,15 +38,15 @@ LoanBrokerSet::preflight(PreflightContext const& ctx)
 
     auto const& tx = ctx.tx;
     if (auto const data = tx[~sfData];
-        data && !data->empty() && !validDataLength(tx[~sfData], kMAX_DATA_PAYLOAD_LENGTH))
+        data && !data->empty() && !validDataLength(tx[~sfData], kMaxDataPayloadLength))
         return temINVALID;
-    if (!validNumericRange(tx[~sfManagementFeeRate], kMAX_MANAGEMENT_FEE_RATE))
+    if (!validNumericRange(tx[~sfManagementFeeRate], kMaxManagementFeeRate))
         return temINVALID;
-    if (!validNumericRange(tx[~sfCoverRateMinimum], kMAX_COVER_RATE))
+    if (!validNumericRange(tx[~sfCoverRateMinimum], kMaxCoverRate))
         return temINVALID;
-    if (!validNumericRange(tx[~sfCoverRateLiquidation], kMAX_COVER_RATE))
+    if (!validNumericRange(tx[~sfCoverRateLiquidation], kMaxCoverRate))
         return temINVALID;
-    if (!validNumericRange(tx[~sfDebtMaximum], Number(kMAX_MP_TOKEN_AMOUNT), Number(0)))
+    if (!validNumericRange(tx[~sfDebtMaximum], Number(kMaxMpTokenAmount), Number(0)))
         return temINVALID;
 
     if (tx.isFieldPresent(sfLoanBrokerID))
@@ -57,13 +57,13 @@ LoanBrokerSet::preflight(PreflightContext const& ctx)
             tx.isFieldPresent(sfCoverRateLiquidation))
             return temINVALID;
 
-        if (tx[sfLoanBrokerID] == beast::kZERO)
+        if (tx[sfLoanBrokerID] == beast::kZero)
             return temINVALID;
     }
 
     if (auto const vaultID = tx.at(~sfVaultID))
     {
-        if (*vaultID == beast::kZERO)
+        if (*vaultID == beast::kZero)
             return temINVALID;
     }
 
@@ -83,9 +83,9 @@ LoanBrokerSet::preflight(PreflightContext const& ctx)
 std::vector<OptionaledField<STNumber>> const&
 LoanBrokerSet::getValueFields()
 {
-    static std::vector<OptionaledField<STNumber>> const kVALUE_FIELDS{~sfDebtMaximum};
+    static std::vector<OptionaledField<STNumber>> const kValueFields{~sfDebtMaximum};
 
-    return kVALUE_FIELDS;
+    return kValueFields;
 }
 
 TER
diff --git a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
index 928ba67db4..813700bd7a 100644
--- a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
@@ -29,7 +29,7 @@ LoanDelete::checkExtraFeatures(PreflightContext const& ctx)
 NotTEC
 LoanDelete::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfLoanID] == beast::kZERO)
+    if (ctx.tx[sfLoanID] == beast::kZero)
         return temINVALID;
 
     return tesSUCCESS;
@@ -117,14 +117,14 @@ LoanDelete::doApply()
     if (brokerSle->at(sfOwnerCount) == 0)
     {
         auto debtTotalProxy = brokerSle->at(sfDebtTotal);
-        if (*debtTotalProxy != beast::kZERO)
+        if (*debtTotalProxy != beast::kZero)
         {
             XRPL_ASSERT_PARTS(
                 roundToAsset(
                     vaultSle->at(sfAsset),
                     debtTotalProxy,
                     getAssetsTotalScale(vaultSle),
-                    Number::RoundingMode::TowardsZero) == beast::kZERO,
+                    Number::RoundingMode::TowardsZero) == beast::kZero,
                 "xrpl::LoanDelete::doApply",
                 "last loan, remaining debt rounds to zero");
             debtTotalProxy = 0;
diff --git a/src/libxrpl/tx/transactors/lending/LoanManage.cpp b/src/libxrpl/tx/transactors/lending/LoanManage.cpp
index 46c85c9f96..d3165006b5 100644
--- a/src/libxrpl/tx/transactors/lending/LoanManage.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanManage.cpp
@@ -45,7 +45,7 @@ LoanManage::getFlagsMask(PreflightContext const& ctx)
 NotTEC
 LoanManage::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfLoanID] == beast::kZERO)
+    if (ctx.tx[sfLoanID] == beast::kZero)
         return temINVALID;
 
     // Flags are mutually exclusive
diff --git a/src/libxrpl/tx/transactors/lending/LoanPay.cpp b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
index a9668d9f4c..89e7bee60b 100644
--- a/src/libxrpl/tx/transactors/lending/LoanPay.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
@@ -49,10 +49,10 @@ LoanPay::getFlagsMask(PreflightContext const& ctx)
 NotTEC
 LoanPay::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfLoanID] == beast::kZERO)
+    if (ctx.tx[sfLoanID] == beast::kZero)
         return temINVALID;
 
-    if (ctx.tx[sfAmount] <= beast::kZERO)
+    if (ctx.tx[sfAmount] <= beast::kZero)
         return temBAD_AMOUNT;
 
     // The loan payment flags are all mutually exclusive. If more than one is
@@ -97,7 +97,7 @@ LoanPay::calculateBaseFee(ReadView const& view, STTx const& tx)
         return normalCost;
     }
 
-    if (loanSle->at(sfPaymentRemaining) <= kLOAN_PAYMENTS_PER_FEE_INCREMENT)
+    if (loanSle->at(sfPaymentRemaining) <= kLoanPaymentsPerFeeIncrement)
     {
         // If there are fewer than loanPaymentsPerFeeIncrement payments left to
         // pay, we can skip the computations.
@@ -143,12 +143,12 @@ LoanPay::calculateBaseFee(ReadView const& view, STTx const& tx)
         tx.isFlag(tfLoanOverpayment) ? Number::RoundingMode::Upward
                                      : Number::RoundingMode::Downward);
 
-    static_assert(kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION % kLOAN_PAYMENTS_PER_FEE_INCREMENT == 0);
-    std::int64_t constexpr kMAX_FEE_INCREMENTS =
-        kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION / kLOAN_PAYMENTS_PER_FEE_INCREMENT;
+    static_assert(kLoanMaximumPaymentsPerTransaction % kLoanPaymentsPerFeeIncrement == 0);
+    static constexpr std::int64_t kMaxFeeIncrements =
+        kLoanMaximumPaymentsPerTransaction / kLoanPaymentsPerFeeIncrement;
 
     if (view.rules().enabled(fixCleanup3_1_3) &&
-        amount >= regularPayment * kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION)
+        amount >= regularPayment * kLoanMaximumPaymentsPerTransaction)
     {
         // The payment handler will never process more than
         // loanMaximumPaymentsPerTransaction payments (including overpayments),
@@ -156,7 +156,7 @@ LoanPay::calculateBaseFee(ReadView const& view, STTx const& tx)
         // loanPaymentsPerFeeIncrement, so don't charge more than
         // loanMaximumPaymentsPerTransaction / loanPaymentsPerFeeIncrement fee
         // increments.
-        return kMAX_FEE_INCREMENTS * normalCost;
+        return kMaxFeeIncrements * normalCost;
     }
 
     // Estimate how many payments will be made
@@ -167,9 +167,9 @@ LoanPay::calculateBaseFee(ReadView const& view, STTx const& tx)
     Number::setround(Number::RoundingMode::Upward);
     auto const feeIncrements = std::max(
         std::int64_t(1),
-        static_cast<std::int64_t>(numPaymentEstimate / kLOAN_PAYMENTS_PER_FEE_INCREMENT));
+        static_cast<std::int64_t>(numPaymentEstimate / kLoanPaymentsPerFeeIncrement));
     XRPL_ASSERT(
-        !view.rules().enabled(fixCleanup3_1_3) || feeIncrements <= kMAX_FEE_INCREMENTS,
+        !view.rules().enabled(fixCleanup3_1_3) || feeIncrements <= kMaxFeeIncrements,
         "xrpl::LoanPay::calculateBaseFee : number of fee increments is in "
         "range");
 
@@ -538,7 +538,7 @@ LoanPay::doApply()
         return tecPRECISION_LOSS;
         // LCOV_EXCL_STOP
     }
-    if (paymentParts->valueChange != beast::kZERO && assetsTotalAfter == assetsTotalBefore)
+    if (paymentParts->valueChange != beast::kZero && assetsTotalAfter == assetsTotalBefore)
     {
         // Non-zero valueChange with an unchanged assetsTotal indicates that the
         // actual value change rounded to zero. That should be impossible, but I
@@ -554,7 +554,7 @@ LoanPay::doApply()
         return tecPRECISION_LOSS;
         // LCOV_EXCL_STOP
     }
-    if (paymentParts->valueChange == beast::kZERO && assetsTotalAfter != assetsTotalBefore)
+    if (paymentParts->valueChange == beast::kZero && assetsTotalAfter != assetsTotalBefore)
     {
         // A change in assetsTotal when there was no valueChange indicates that
         // something really weird happened. That should be flat out impossible.
@@ -607,13 +607,13 @@ LoanPay::doApply()
                                                                    j_,
                                                                    SpendableHandling::FullBalance);
 
-    if (totalPaidToVaultRounded != beast::kZERO)
+    if (totalPaidToVaultRounded != beast::kZero)
     {
         if (auto const ter = requireAuth(view, asset, vaultPseudoAccount, AuthType::StrongAuth))
             return ter;
     }
 
-    if (totalPaidToBroker != beast::kZERO)
+    if (totalPaidToBroker != beast::kZero)
     {
         if (brokerPayee == account_)
         {
@@ -690,7 +690,7 @@ LoanPay::doApply()
         // First find the minimum and maximum exponent of all the non-zero balances, before and
         // after. If min and max are equal, use that value. If they are not, use "max + 1" to reduce
         // rounding discrepancies without making the result meaningless. Cap the scale at
-        // STAmount::kMAX_OFFSET, just in case the numbers are all very large.
+        // STAmount::kMaxOffset, just in case the numbers are all very large.
         std::vector<int> exponents;
         exponents.reserve(6);
 
@@ -704,7 +704,7 @@ LoanPay::doApply()
              })
         {
             // Exclude zeroes
-            if (a != beast::kZERO)
+            if (a != beast::kZero)
                 exponents.push_back(a.exponent());
         }
         if (exponents.empty())
@@ -720,7 +720,7 @@ LoanPay::doApply()
         // to round to such an extreme that it becomes meaningless.  e.g. Everything rounds to one
         // digit. So add 1 to the max (reducing the number of digits after the decimal point by 1)
         // if the scales are not already all the same.
-        return std::min(min == max ? max : max + 1, STAmount::kMAX_OFFSET);
+        return std::min(min == max ? max : max + 1, STAmount::kMaxOffset);
     }();
 
     // No object changes are made below this point
@@ -779,14 +779,14 @@ LoanPay::doApply()
                      << Number(totalBalanceChange) << ")";
 
     bool const goodRounding = totalBalanceBeforeRounded == totalBalanceAfterRounded ||
-        totalBalanceChangeRounded == beast::kZERO;
+        totalBalanceChangeRounded == beast::kZero;
     if (totalBalanceBeforeRounded != totalBalanceAfterRounded)
     {
         JLOG((goodRounding ? j_.debug() : j_.warn()))
             << "Total rounded balances don't match"
-            << (totalBalanceChangeRounded == beast::kZERO ? ", but total changes do" : "");
+            << (totalBalanceChangeRounded == beast::kZero ? ", but total changes do" : "");
     }
-    if (totalBalanceChangeRounded != beast::kZERO)
+    if (totalBalanceChangeRounded != beast::kZero)
     {
         JLOG((goodRounding ? j_.debug() : j_.warn()))
             << "Total balance changes don't match"
@@ -804,7 +804,7 @@ LoanPay::doApply()
         "xrpl::LoanPay::doApply",
         "account balance decreased");
     XRPL_ASSERT_PARTS(
-        vaultBalanceAfter >= beast::kZERO && brokerBalanceAfter >= beast::kZERO,
+        vaultBalanceAfter >= beast::kZero && brokerBalanceAfter >= beast::kZero,
         "xrpl::LoanPay::doApply",
         "positive vault and broker balances");
     XRPL_ASSERT_PARTS(
diff --git a/src/libxrpl/tx/transactors/lending/LoanSet.cpp b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
index 3f5bbfb1a3..83eccf1809 100644
--- a/src/libxrpl/tx/transactors/lending/LoanSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
@@ -85,7 +85,7 @@ LoanSet::preflight(PreflightContext const& ctx)
     }
 
     if (auto const data = tx[~sfData];
-        data && !data->empty() && !validDataLength(tx[~sfData], kMAX_DATA_PAYLOAD_LENGTH))
+        data && !data->empty() && !validDataLength(tx[~sfData], kMaxDataPayloadLength))
         return temINVALID;
     for (auto const& field : {&sfLoanServiceFee, &sfLatePaymentFee, &sfClosePaymentFee})
     {
@@ -98,27 +98,27 @@ LoanSet::preflight(PreflightContext const& ctx)
         return temINVALID;
     if (!validNumericRange(tx[~sfLoanOriginationFee], p))
         return temINVALID;
-    if (!validNumericRange(tx[~sfInterestRate], kMAX_INTEREST_RATE))
+    if (!validNumericRange(tx[~sfInterestRate], kMaxInterestRate))
         return temINVALID;
-    if (!validNumericRange(tx[~sfOverpaymentFee], kMAX_OVERPAYMENT_FEE))
+    if (!validNumericRange(tx[~sfOverpaymentFee], kMaxOverpaymentFee))
         return temINVALID;
-    if (!validNumericRange(tx[~sfLateInterestRate], kMAX_LATE_INTEREST_RATE))
+    if (!validNumericRange(tx[~sfLateInterestRate], kMaxLateInterestRate))
         return temINVALID;
-    if (!validNumericRange(tx[~sfCloseInterestRate], kMAX_CLOSE_INTEREST_RATE))
+    if (!validNumericRange(tx[~sfCloseInterestRate], kMaxCloseInterestRate))
         return temINVALID;
-    if (!validNumericRange(tx[~sfOverpaymentInterestRate], kMAX_OVERPAYMENT_INTEREST_RATE))
+    if (!validNumericRange(tx[~sfOverpaymentInterestRate], kMaxOverpaymentInterestRate))
         return temINVALID;
 
     if (auto const paymentTotal = tx[~sfPaymentTotal]; paymentTotal && *paymentTotal <= 0)
         return temINVALID;
 
     auto const paymentInterval = tx[~sfPaymentInterval];
-    if (!validNumericMinimum(paymentInterval, LoanSet::kMIN_PAYMENT_INTERVAL))
+    if (!validNumericMinimum(paymentInterval, LoanSet::kMinPaymentInterval))
         return temINVALID;  // Grace period is between min default value and payment interval
     if (auto const gracePeriod = tx[~sfGracePeriod]; !validNumericRange(
             gracePeriod,
-            paymentInterval.value_or(LoanSet::kDEFAULT_PAYMENT_INTERVAL),
-            kDEFAULT_GRACE_PERIOD))
+            paymentInterval.value_or(LoanSet::kDefaultPaymentInterval),
+            kDefaultGracePeriod))
     {
         return temINVALID;
     }
@@ -131,7 +131,7 @@ LoanSet::preflight(PreflightContext const& ctx)
             return *ret;
     }
 
-    if (auto const brokerID = ctx.tx[~sfLoanBrokerID]; brokerID && *brokerID == beast::kZERO)
+    if (auto const brokerID = ctx.tx[~sfLoanBrokerID]; brokerID && *brokerID == beast::kZero)
         return temINVALID;
 
     return tesSUCCESS;
@@ -195,7 +195,7 @@ LoanSet::calculateBaseFee(ReadView const& view, STTx const& tx)
 std::vector<OptionaledField<STNumber>> const&
 LoanSet::getValueFields()
 {
-    static std::vector<OptionaledField<STNumber>> const kVALUE_FIELDS{
+    static std::vector<OptionaledField<STNumber>> const kValueFields{
         ~sfPrincipalRequested,
         ~sfLoanOriginationFee,
         ~sfLoanServiceFee,
@@ -204,7 +204,7 @@ LoanSet::getValueFields()
         // Overpayment fee is really a rate. Don't check it here.
     };
 
-    return kVALUE_FIELDS;
+    return kValueFields;
 }
 
 static std::uint32_t
@@ -226,14 +226,14 @@ LoanSet::preclaim(PreclaimContext const& ctx)
         // overflows, and we kill the transaction.
         using timeType = decltype(sfNextPaymentDueDate)::type::value_type;
         static_assert(std::is_same_v<timeType, std::uint32_t>);
-        timeType constexpr kMAX_TIME = std::numeric_limits<timeType>::max();
-        static_assert(kMAX_TIME == 4'294'967'295);
+        constexpr timeType kMaxTime = std::numeric_limits<timeType>::max();
+        static_assert(kMaxTime == 4'294'967'295);
 
-        auto const timeAvailable = kMAX_TIME - getStartDate(ctx.view);
+        auto const timeAvailable = kMaxTime - getStartDate(ctx.view);
 
-        auto const interval = ctx.tx.at(~sfPaymentInterval).value_or(kDEFAULT_PAYMENT_INTERVAL);
-        auto const total = ctx.tx.at(~sfPaymentTotal).value_or(kDEFAULT_PAYMENT_TOTAL);
-        auto const grace = ctx.tx.at(~sfGracePeriod).value_or(kDEFAULT_GRACE_PERIOD);
+        auto const interval = ctx.tx.at(~sfPaymentInterval).value_or(kDefaultPaymentInterval);
+        auto const total = ctx.tx.at(~sfPaymentTotal).value_or(kDefaultPaymentTotal);
+        auto const grace = ctx.tx.at(~sfGracePeriod).value_or(kDefaultGracePeriod);
 
         // The grace period can't be larger than the interval. Check it first,
         // mostly so that unit tests can test that specific case.
@@ -414,8 +414,8 @@ LoanSet::doApply()
 
     TenthBips32 const interestRate{tx[~sfInterestRate].value_or(0)};
 
-    auto const paymentInterval = tx[~sfPaymentInterval].value_or(kDEFAULT_PAYMENT_INTERVAL);
-    auto const paymentTotal = tx[~sfPaymentTotal].value_or(kDEFAULT_PAYMENT_TOTAL);
+    auto const paymentInterval = tx[~sfPaymentInterval].value_or(kDefaultPaymentInterval);
+    auto const paymentTotal = tx[~sfPaymentTotal].value_or(kDefaultPaymentTotal);
 
     auto const properties = computeLoanProperties(
         view.rules(),
@@ -460,7 +460,7 @@ LoanSet::doApply()
     if (auto const ret = checkLoanGuards(
             vaultAsset,
             principalRequested,
-            interestRate != beast::kZERO,
+            interestRate != beast::kZero,
             paymentTotal,
             properties,
             j_))
@@ -537,7 +537,7 @@ LoanSet::doApply()
 
     // 2. Transfer originationFee, if any, from vault pseudo-account to
     // LoanBroker owner.
-    if (originationFee != beast::kZERO)
+    if (originationFee != beast::kZero)
     {
         // Create the holding if it doesn't already exist (necessary for MPTs).
         // The owner may have deleted their MPT / line at some point.
@@ -601,7 +601,7 @@ LoanSet::doApply()
     setLoanField(~sfLateInterestRate);
     setLoanField(~sfCloseInterestRate);
     setLoanField(~sfOverpaymentInterestRate);
-    setLoanField(~sfGracePeriod, kDEFAULT_GRACE_PERIOD);
+    setLoanField(~sfGracePeriod, kDefaultGracePeriod);
     // Set dynamic / computed fields to their initial values
     loan->at(sfPrincipalOutstanding) = principalRequested;
     loan->at(sfPeriodicPayment) = properties.periodicPayment;
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
index 0888066aef..00441795e2 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
@@ -44,7 +44,7 @@ NFTokenAcceptOffer::preflight(PreflightContext const& ctx)
         if (!bo || !so)
             return temMALFORMED;
 
-        if (*bf <= beast::kZERO)
+        if (*bf <= beast::kZero)
             return temMALFORMED;
     }
 
@@ -306,7 +306,7 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx)
         // give the NFToken issuer an undesired trust line.
         // Issuer doesn't need a trust line to accept their own currency.
         if (ctx.view.rules().enabled(fixEnforceNFTokenTrustline) &&
-            (nft::getFlags(tokenID) & nft::kFLAG_CREATE_TRUST_LINES) == 0 &&
+            (nft::getFlags(tokenID) & nft::kFlagCreateTrustLines) == 0 &&
             nftMinter != amount.getIssuer() &&
             !ctx.view.read(keylet::line(nftMinter, amount.get<Issue>())))
             return tecNO_LINE;
@@ -333,7 +333,7 @@ TER
 NFTokenAcceptOffer::pay(AccountID const& from, AccountID const& to, STAmount const& amount)
 {
     // This should never happen, but it's easy and quick to check.
-    if (amount < beast::kZERO)
+    if (amount < beast::kZero)
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
     auto const result = accountSend(view(), from, to, amount, j_);
@@ -412,7 +412,7 @@ NFTokenAcceptOffer::acceptOffer(std::shared_ptr<SLE> const& offer)
 
     auto const nftokenID = (*offer)[sfNFTokenID];
 
-    if (auto amount = offer->getFieldAmount(sfAmount); amount != beast::kZERO)
+    if (auto amount = offer->getFieldAmount(sfAmount); amount != beast::kZero)
     {
         // Calculate the issuer's cut from this sale, if any:
         if (auto const fee = nft::getTransferFee(nftokenID); fee != 0)
@@ -420,7 +420,7 @@ NFTokenAcceptOffer::acceptOffer(std::shared_ptr<SLE> const& offer)
             auto const cut = multiply(amount, nft::transferFeeAsRate(fee));
 
             if (auto const issuer = nft::getIssuer(nftokenID);
-                cut != beast::kZERO && seller != issuer && buyer != issuer)
+                cut != beast::kZero && seller != issuer && buyer != issuer)
             {
                 if (auto const r = pay(buyer, issuer, cut); !isTesSuccess(r))
                     return r;
@@ -526,7 +526,7 @@ NFTokenAcceptOffer::doApply()
         // being paid out than the seller authorized.  That would be bad!
 
         // Send the broker the amount they requested.
-        if (auto const cut = ctx_.tx[~sfNFTokenBrokerFee]; cut && cut.value() != beast::kZERO)
+        if (auto const cut = ctx_.tx[~sfNFTokenBrokerFee]; cut && cut.value() != beast::kZero)
         {
             if (auto const r = pay(buyer, account_, cut.value()); !isTesSuccess(r))
                 return r;
@@ -535,7 +535,7 @@ NFTokenAcceptOffer::doApply()
         }
 
         // Calculate the issuer's cut, if any.
-        if (auto const fee = nft::getTransferFee(nftokenID); amount != beast::kZERO && fee != 0)
+        if (auto const fee = nft::getTransferFee(nftokenID); amount != beast::kZero && fee != 0)
         {
             auto cut = multiply(amount, nft::transferFeeAsRate(fee));
 
@@ -549,7 +549,7 @@ NFTokenAcceptOffer::doApply()
         }
 
         // And send whatever remains to the seller.
-        if (amount > beast::kZERO)
+        if (amount > beast::kZero)
         {
             if (auto const r = pay(buyer, seller, amount); !isTesSuccess(r))
                 return r;
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenBurn.cpp b/src/libxrpl/tx/transactors/nft/NFTokenBurn.cpp
index 95791d220e..871a8e706a 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenBurn.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenBurn.cpp
@@ -40,7 +40,7 @@ NFTokenBurn::preclaim(PreclaimContext const& ctx)
     // do so if the token is marked as burnable.
     if (auto const account = ctx.tx[sfAccount]; owner != account)
     {
-        if ((nft::getFlags(ctx.tx[sfNFTokenID]) & nft::kFLAG_BURNABLE) == 0)
+        if ((nft::getFlags(ctx.tx[sfNFTokenID]) & nft::kFlagBurnable) == 0)
             return tecNO_PERMISSION;
 
         if (auto const issuer = nft::getIssuer(ctx.tx[sfNFTokenID]); issuer != account)
@@ -81,14 +81,14 @@ NFTokenBurn::doApply()
     // the number of buy offers, we prioritize the deletion of sell
     // offers in order to clean up sell offer directory
     std::size_t const deletedSellOffers = nft::removeTokenOffersWithLimit(
-        view(), keylet::nftSells(ctx_.tx[sfNFTokenID]), kMAX_DELETABLE_TOKEN_OFFER_ENTRIES);
+        view(), keylet::nftSells(ctx_.tx[sfNFTokenID]), kMaxDeletableTokenOfferEntries);
 
-    if (kMAX_DELETABLE_TOKEN_OFFER_ENTRIES > deletedSellOffers)
+    if (kMaxDeletableTokenOfferEntries > deletedSellOffers)
     {
         nft::removeTokenOffersWithLimit(
             view(),
             keylet::nftBuys(ctx_.tx[sfNFTokenID]),
-            kMAX_DELETABLE_TOKEN_OFFER_ENTRIES - deletedSellOffers);
+            kMaxDeletableTokenOfferEntries - deletedSellOffers);
     }
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp
index 9186d32424..924dc49269 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp
@@ -24,7 +24,7 @@ NotTEC
 NFTokenCancelOffer::preflight(PreflightContext const& ctx)
 {
     if (auto const& ids = ctx.tx[sfNFTokenOffers];
-        ids.empty() || (ids.size() > kMAX_TOKEN_OFFER_CANCEL_COUNT))
+        ids.empty() || (ids.size() > kMaxTokenOfferCancelCount))
         return temMALFORMED;
 
     // In order to prevent unnecessarily overlarge transactions, we
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
index 358e9b6bd6..621364dc79 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
@@ -86,7 +86,7 @@ NFTokenMint::preflight(PreflightContext const& ctx)
 {
     if (auto const f = ctx.tx[~sfTransferFee])
     {
-        if (f > kMAX_TRANSFER_FEE)
+        if (f > kMaxTransferFee)
             return temBAD_NFTOKEN_TRANSFER_FEE;
 
         // If a non-zero TransferFee is set then the tfTransferable flag
@@ -101,7 +101,7 @@ NFTokenMint::preflight(PreflightContext const& ctx)
 
     if (auto uri = ctx.tx[~sfURI])
     {
-        if (uri->empty() || uri->length() > kMAX_TOKEN_URI_LENGTH)
+        if (uri->empty() || uri->length() > kMaxTokenUriLength)
             return temMALFORMED;
     }
 
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp b/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp
index a21196ff57..7e3eeeefee 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp
@@ -26,7 +26,7 @@ NFTokenModify::preflight(PreflightContext const& ctx)
 
     if (auto uri = ctx.tx[~sfURI])
     {
-        if (uri->empty() || uri->length() > kMAX_TOKEN_URI_LENGTH)
+        if (uri->empty() || uri->length() > kMaxTokenUriLength)
             return temMALFORMED;
     }
 
@@ -43,7 +43,7 @@ NFTokenModify::preclaim(PreclaimContext const& ctx)
         return tecNO_ENTRY;
 
     // Check if the NFT is mutable
-    if ((nft::getFlags(ctx.tx[sfNFTokenID]) & nft::kFLAG_MUTABLE) == 0)
+    if ((nft::getFlags(ctx.tx[sfNFTokenID]) & nft::kFlagMutable) == 0)
         return tecNO_PERMISSION;
 
     // Verify permissions for the issuer
diff --git a/src/libxrpl/tx/transactors/oracle/OracleSet.cpp b/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
index ea828256b8..d0d488bbec 100644
--- a/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
+++ b/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
@@ -43,7 +43,7 @@ OracleSet::preflight(PreflightContext const& ctx)
     auto const& dataSeries = ctx.tx.getFieldArray(sfPriceDataSeries);
     if (dataSeries.empty())
         return temARRAY_EMPTY;
-    if (dataSeries.size() > kMAX_ORACLE_DATA_SERIES)
+    if (dataSeries.size() > kMaxOracleDataSeries)
         return temARRAY_TOO_LARGE;
 
     auto isInvalidLength = [&](auto const& sField, std::size_t length) {
@@ -51,9 +51,8 @@ OracleSet::preflight(PreflightContext const& ctx)
             (ctx.tx[sField].length() == 0 || ctx.tx[sField].length() > length);
     };
 
-    if (isInvalidLength(sfProvider, kMAX_ORACLE_PROVIDER) ||
-        isInvalidLength(sfURI, kMAX_ORACLE_URI) ||
-        isInvalidLength(sfAssetClass, kMAX_ORACLE_SYMBOL_CLASS))
+    if (isInvalidLength(sfProvider, kMaxOracleProvider) || isInvalidLength(sfURI, kMaxOracleUri) ||
+        isInvalidLength(sfAssetClass, kMaxOracleSymbolClass))
         return temMALFORMED;
 
     return tesSUCCESS;
@@ -72,13 +71,13 @@ OracleSet::preclaim(PreclaimContext const& ctx)
     std::size_t const closeTime =
         duration_cast<seconds>(ctx.view.header().closeTime.time_since_epoch()).count();
     std::size_t const lastUpdateTime = ctx.tx[sfLastUpdateTime];
-    if (lastUpdateTime < kEPOCH_OFFSET.count())
+    if (lastUpdateTime < kEpochOffset.count())
         return tecINVALID_UPDATE_TIME;
-    std::size_t const lastUpdateTimeEpoch = lastUpdateTime - kEPOCH_OFFSET.count();
-    if (closeTime < kMAX_LAST_UPDATE_TIME_DELTA)
+    std::size_t const lastUpdateTimeEpoch = lastUpdateTime - kEpochOffset.count();
+    if (closeTime < kMaxLastUpdateTimeDelta)
         return tecINTERNAL;  // LCOV_EXCL_LINE
-    if (lastUpdateTimeEpoch < (closeTime - kMAX_LAST_UPDATE_TIME_DELTA) ||
-        lastUpdateTimeEpoch > (closeTime + kMAX_LAST_UPDATE_TIME_DELTA))
+    if (lastUpdateTimeEpoch < (closeTime - kMaxLastUpdateTimeDelta) ||
+        lastUpdateTimeEpoch > (closeTime + kMaxLastUpdateTimeDelta))
         return tecINVALID_UPDATE_TIME;
 
     auto const sle =
@@ -96,7 +95,7 @@ OracleSet::preclaim(PreclaimContext const& ctx)
         auto const key = tokenPairKey(entry);
         if (pairs.contains(key) || pairsDel.contains(key))
             return temMALFORMED;
-        if (entry[~sfScale] > kMAX_PRICE_SCALE)
+        if (entry[~sfScale] > kMaxPriceScale)
             return temMALFORMED;
         if (entry.isFieldPresent(sfAssetPrice))
         {
@@ -166,7 +165,7 @@ OracleSet::preclaim(PreclaimContext const& ctx)
 
     if (pairs.empty())
         return tecARRAY_EMPTY;
-    if (pairs.size() > kMAX_ORACLE_DATA_SERIES)
+    if (pairs.size() > kMaxOracleDataSeries)
         return tecARRAY_TOO_LARGE;
 
     auto const reserve =
diff --git a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
index 2e298a70d5..ed6699936e 100644
--- a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
+++ b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
@@ -84,7 +84,7 @@ DepositPreauth::preflight(PreflightContext const& ctx)
         if (auto err = credentials::checkArray(
                 ctx.tx.getFieldArray(
                     authArrPresent ? sfAuthorizeCredentials : sfUnauthorizeCredentials),
-                kMAX_CREDENTIALS_ARRAY_SIZE,
+                kMaxCredentialsArraySize,
                 ctx.j);
             !isTesSuccess(err))
             return err;
diff --git a/src/libxrpl/tx/transactors/payment/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp
index fc7bf753b1..fa5f30785c 100644
--- a/src/libxrpl/tx/transactors/payment/Payment.cpp
+++ b/src/libxrpl/tx/transactors/payment/Payment.cpp
@@ -53,7 +53,7 @@ Payment::makeTxConsequences(PreflightContext const& ctx)
 
         // If there's no sfSendMax in XRP, and the sfAmount isn't
         // in XRP, then the transaction does not spend XRP.
-        return maxAmount.native() ? maxAmount.xrp() : beast::kZERO;
+        return maxAmount.native() ? maxAmount.xrp() : beast::kZero;
     };
 
     return TxConsequences{ctx.tx, calculateMaxXRPSpend(ctx.tx)};
@@ -78,7 +78,7 @@ getMaxSourceAmount(
                 Issue{issue.currency, account},
                 dstAmount.mantissa(),
                 dstAmount.exponent(),
-                dstAmount < beast::kZERO);
+                dstAmount < beast::kZero);
         });
 }
 
@@ -102,9 +102,9 @@ Payment::getFlagsMask(PreflightContext const& ctx)
     bool const isDstMPT = dstAmount.holds<MPTIssue>();
     bool const mpTokensV2 = ctx.rules.enabled(featureMPTokensV2);
 
-    constexpr std::uint32_t kTF_MPT_PAYMENT_MASK_V1 = ~(tfUniversal | tfPartialPayment);
+    static constexpr std::uint32_t kTfMptPaymentMaskV1 = ~(tfUniversal | tfPartialPayment);
     std::uint32_t const paymentMask =
-        (isDstMPT && !mpTokensV2) ? kTF_MPT_PAYMENT_MASK_V1 : tfPaymentMask;
+        (isDstMPT && !mpTokensV2) ? kTfMptPaymentMaskV1 : tfPaymentMask;
 
     return paymentMask;
 }
@@ -162,13 +162,13 @@ Payment::preflight(PreflightContext const& ctx)
                         << "Payment destination account not specified.";
         return temDST_NEEDED;
     }
-    if (hasMax && maxSourceAmount <= beast::kZERO)
+    if (hasMax && maxSourceAmount <= beast::kZero)
     {
         JLOG(j.trace()) << "Malformed transaction: bad max amount: "
                         << maxSourceAmount.getFullText();
         return temBAD_AMOUNT;
     }
-    if (dstAmount <= beast::kZERO)
+    if (dstAmount <= beast::kZero)
     {
         JLOG(j.trace()) << "Malformed transaction: bad dst amount: " << dstAmount.getFullText();
         return temBAD_AMOUNT;
@@ -239,7 +239,7 @@ Payment::preflight(PreflightContext const& ctx)
         }
 
         auto const dMin = *deliverMin;
-        if (!isLegalNet(dMin) || dMin <= beast::kZERO)
+        if (!isLegalNet(dMin) || dMin <= beast::kZero)
         {
             JLOG(j.trace()) << "Malformed transaction: Invalid " << jss::DeliverMin.cStr()
                             << " amount. " << dMin.getFullText();
@@ -371,8 +371,8 @@ Payment::preclaim(PreclaimContext const& ctx)
     {
         STPathSet const& paths = ctx.tx.getFieldPathSet(sfPaths);
 
-        if (paths.size() > kMAX_PATH_SIZE || std::ranges::any_of(paths, [](STPath const& path) {
-                return path.size() > kMAX_PATH_LENGTH;
+        if (paths.size() > kMaxPathSize || std::ranges::any_of(paths, [](STPath const& path) {
+                return path.size() > kMaxPathLength;
             }))
         {
             return telBAD_PATH_COUNT;
@@ -425,7 +425,7 @@ Payment::doApply()
         sleDst = std::make_shared<SLE>(k);
         sleDst->setAccountID(sfAccount, dstAccountID);
         sleDst->setFieldU32(sfSequence, view().seq());
-        sleDst->setFieldAmount(sfBalance, XRPAmount(beast::kZERO));
+        sleDst->setFieldAmount(sfBalance, XRPAmount(beast::kZero));
 
         view().insert(sleDst);
     }
diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp
index 272100d792..cc99b8f62d 100644
--- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp
+++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp
@@ -44,11 +44,11 @@ NotTEC
 PaymentChannelClaim::preflight(PreflightContext const& ctx)
 {
     auto const bal = ctx.tx[~sfBalance];
-    if (bal && (!isXRP(*bal) || *bal <= beast::kZERO))
+    if (bal && (!isXRP(*bal) || *bal <= beast::kZero))
         return temBAD_AMOUNT;
 
     auto const amt = ctx.tx[~sfAmount];
-    if (amt && (!isXRP(*amt) || *amt <= beast::kZERO))
+    if (amt && (!isXRP(*amt) || *amt <= beast::kZero))
         return temBAD_AMOUNT;
 
     if (bal && amt && *bal > *amt)
@@ -165,7 +165,7 @@ PaymentChannelClaim::doApply()
         (*slep)[sfBalance] = ctx_.tx[sfBalance];
         XRPAmount const reqDelta = reqBalance - chanBalance;
         XRPL_ASSERT(
-            reqDelta >= beast::kZERO, "xrpl::PaymentChannelClaim::doApply : minimum balance delta");
+            reqDelta >= beast::kZero, "xrpl::PaymentChannelClaim::doApply : minimum balance delta");
         (*sled)[sfBalance] = (*sled)[sfBalance] + reqDelta;
         ctx_.view().update(sled);
         ctx_.view().update(slep);
diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
index 13670b7f80..7ce25b6d15 100644
--- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
+++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelCreate.cpp
@@ -56,7 +56,7 @@ PaymentChannelCreate::makeTxConsequences(PreflightContext const& ctx)
 NotTEC
 PaymentChannelCreate::preflight(PreflightContext const& ctx)
 {
-    if (!isXRP(ctx.tx[sfAmount]) || (ctx.tx[sfAmount] <= beast::kZERO))
+    if (!isXRP(ctx.tx[sfAmount]) || (ctx.tx[sfAmount] <= beast::kZero))
         return temBAD_AMOUNT;
 
     if (ctx.tx[sfAccount] == ctx.tx[sfDestination])
diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp
index e392df213a..41906aa3da 100644
--- a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp
+++ b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelFund.cpp
@@ -31,7 +31,7 @@ PaymentChannelFund::makeTxConsequences(PreflightContext const& ctx)
 NotTEC
 PaymentChannelFund::preflight(PreflightContext const& ctx)
 {
-    if (!isXRP(ctx.tx[sfAmount]) || (ctx.tx[sfAmount] <= beast::kZERO))
+    if (!isXRP(ctx.tx[sfAmount]) || (ctx.tx[sfAmount] <= beast::kZero))
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
index 0f62c5d28f..b8de9b911e 100644
--- a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
+++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
@@ -20,7 +20,7 @@ NotTEC
 PermissionedDomainDelete::preflight(PreflightContext const& ctx)
 {
     auto const domain = ctx.tx.getFieldH256(sfDomainID);
-    if (domain == beast::kZERO)
+    if (domain == beast::kZero)
         return temMALFORMED;
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
index 83921e8526..bd7f6a33a1 100644
--- a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
+++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
@@ -33,13 +33,13 @@ PermissionedDomainSet::preflight(PreflightContext const& ctx)
 {
     if (auto err = credentials::checkArray(
             ctx.tx.getFieldArray(sfAcceptedCredentials),
-            kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE,
+            kMaxPermissionedDomainCredentialsArraySize,
             ctx.j);
         !isTesSuccess(err))
         return err;
 
     auto const domain = ctx.tx.at(~sfDomainID);
-    if (domain && *domain == beast::kZERO)
+    if (domain && *domain == beast::kZero)
         return temMALFORMED;
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/system/Batch.cpp b/src/libxrpl/tx/transactors/system/Batch.cpp
index a278b838b9..b9440e3273 100644
--- a/src/libxrpl/tx/transactors/system/Batch.cpp
+++ b/src/libxrpl/tx/transactors/system/Batch.cpp
@@ -62,7 +62,7 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
     if (baseFee > maxAmount - view.fees().base)
     {
         JLOG(debugLog().error()) << "BatchTrace: Base fee overflow detected.";
-        return XRPAmount{kINITIAL_XRP};
+        return XRPAmount{kInitialXrp};
     }
     // LCOV_EXCL_STOP
 
@@ -75,10 +75,10 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
         auto const& txns = tx.getFieldArray(sfRawTransactions);
 
         // LCOV_EXCL_START
-        if (txns.size() > kMAX_BATCH_TX_COUNT)
+        if (txns.size() > kMaxBatchTxCount)
         {
             JLOG(debugLog().error()) << "BatchTrace: Raw Transactions array exceeds max entries.";
-            return XRPAmount{kINITIAL_XRP};
+            return XRPAmount{kInitialXrp};
         }
         // LCOV_EXCL_STOP
 
@@ -90,7 +90,7 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
             if (stx.getTxnType() == ttBATCH)
             {
                 JLOG(debugLog().error()) << "BatchTrace: Inner Batch transaction found.";
-                return XRPAmount{kINITIAL_XRP};
+                return XRPAmount{kInitialXrp};
             }
             // LCOV_EXCL_STOP
 
@@ -100,7 +100,7 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
             {
                 JLOG(debugLog().error())
                     << "BatchTrace: XRPAmount overflow in txnFees calculation.";
-                return XRPAmount{kINITIAL_XRP};
+                return XRPAmount{kInitialXrp};
             }
             // LCOV_EXCL_STOP
             txnFees += fee;
@@ -114,10 +114,10 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
         auto const& signers = tx.getFieldArray(sfBatchSigners);
 
         // LCOV_EXCL_START
-        if (signers.size() > kMAX_BATCH_TX_COUNT)
+        if (signers.size() > kMaxBatchTxCount)
         {
             JLOG(debugLog().error()) << "BatchTrace: Batch Signers array exceeds max entries.";
-            return XRPAmount{kINITIAL_XRP};
+            return XRPAmount{kInitialXrp};
         }
         // LCOV_EXCL_STOP
 
@@ -138,7 +138,7 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
     if (signerCount > 0 && view.fees().base > maxAmount / signerCount)
     {
         JLOG(debugLog().error()) << "BatchTrace: XRPAmount overflow in signerCount calculation.";
-        return XRPAmount{kINITIAL_XRP};
+        return XRPAmount{kInitialXrp};
     }
     // LCOV_EXCL_STOP
 
@@ -148,12 +148,12 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
     if (signerFees > maxAmount - txnFees)
     {
         JLOG(debugLog().error()) << "BatchTrace: XRPAmount overflow in signerFees calculation.";
-        return XRPAmount{kINITIAL_XRP};
+        return XRPAmount{kInitialXrp};
     }
     if (txnFees + signerFees > maxAmount - batchBase)
     {
         JLOG(debugLog().error()) << "BatchTrace: XRPAmount overflow in total fee calculation.";
-        return XRPAmount{kINITIAL_XRP};
+        return XRPAmount{kInitialXrp};
     }
     // LCOV_EXCL_STOP
 
@@ -221,7 +221,7 @@ Batch::preflight(PreflightContext const& ctx)
         return temARRAY_EMPTY;
     }
 
-    if (rawTxns.size() > kMAX_BATCH_TX_COUNT)
+    if (rawTxns.size() > kMaxBatchTxCount)
     {
         JLOG(ctx.j.debug()) << "BatchTrace[" << parentBatchId << "]:"
                             << "txns array exceeds 8 entries.";
@@ -282,7 +282,7 @@ Batch::preflight(PreflightContext const& ctx)
         }
 
         if (std::ranges::any_of(
-                kDISABLED_TX_TYPES, [txType](auto const& disabled) { return txType == disabled; }))
+                kDisabledTxTypes, [txType](auto const& disabled) { return txType == disabled; }))
         {
             return temINVALID_INNER_BATCH;
         }
@@ -311,7 +311,7 @@ Batch::preflight(PreflightContext const& ctx)
         }
 
         // Check that the Fee is native asset (XRP) and zero
-        if (auto const fee = stx.getFieldAmount(sfFee); !fee.native() || fee.xrp() != beast::kZERO)
+        if (auto const fee = stx.getFieldAmount(sfFee); !fee.native() || fee.xrp() != beast::kZero)
         {
             JLOG(ctx.j.debug()) << "BatchTrace[" << parentBatchId << "]: "
                                 << "inner txn must have a fee of 0. "
@@ -413,7 +413,7 @@ Batch::preflightSigValidated(PreflightContext const& ctx)
         STArray const& signers = ctx.tx.getFieldArray(sfBatchSigners);
 
         // Check that the batch signers array is not too large.
-        if (signers.size() > kMAX_BATCH_TX_COUNT)
+        if (signers.size() > kMaxBatchTxCount)
         {
             JLOG(ctx.j.debug()) << "BatchTrace[" << parentBatchId << "]: "
                                 << "signers array exceeds 8 entries.";
diff --git a/src/libxrpl/tx/transactors/system/Change.cpp b/src/libxrpl/tx/transactors/system/Change.cpp
index 151e7f7256..9e9850f5a1 100644
--- a/src/libxrpl/tx/transactors/system/Change.cpp
+++ b/src/libxrpl/tx/transactors/system/Change.cpp
@@ -42,7 +42,7 @@ Transactor::invokePreflight<Change>(PreflightContext const& ctx)
         return ret;
 
     auto account = ctx.tx.getAccountID(sfAccount);
-    if (account != beast::kZERO)
+    if (account != beast::kZero)
     {
         JLOG(ctx.j.warn()) << "Change: Bad source id";
         return temBAD_SRC_ACCOUNT;
@@ -50,7 +50,7 @@ Transactor::invokePreflight<Change>(PreflightContext const& ctx)
 
     // No point in going any further if the transaction fee is malformed.
     auto const fee = ctx.tx.getFieldAmount(sfFee);
-    if (!fee.native() || fee != beast::kZERO)
+    if (!fee.native() || fee != beast::kZero)
     {
         JLOG(ctx.j.warn()) << "Change: invalid fee";
         return temBAD_FEE;
@@ -154,7 +154,7 @@ Change::doApply()
 void
 Change::preCompute()
 {
-    XRPL_ASSERT(account_ == beast::kZERO, "xrpl::Change::preCompute : zero account");
+    XRPL_ASSERT(account_ == beast::kZero, "xrpl::Change::preCompute : zero account");
 }
 
 TER
diff --git a/src/libxrpl/tx/transactors/system/TicketCreate.cpp b/src/libxrpl/tx/transactors/system/TicketCreate.cpp
index f690243d86..e7673e0bff 100644
--- a/src/libxrpl/tx/transactors/system/TicketCreate.cpp
+++ b/src/libxrpl/tx/transactors/system/TicketCreate.cpp
@@ -32,7 +32,7 @@ NotTEC
 TicketCreate::preflight(PreflightContext const& ctx)
 {
     if (std::uint32_t const count = ctx.tx[sfTicketCount];
-        count < kMIN_VALID_COUNT || count > kMAX_VALID_COUNT)
+        count < kMinValidCount || count > kMaxValidCount)
         return temINVALID_COUNT;
 
     return tesSUCCESS;
@@ -58,7 +58,7 @@ TicketCreate::preclaim(PreclaimContext const& ctx)
     //  o consumedTickets  <= 1
     // So in the worst case addedTickets == consumedTickets and the
     // computation yields curTicketCount.
-    if (curTicketCount + addedTickets - consumedTickets > kMAX_TICKET_THRESHOLD)
+    if (curTicketCount + addedTickets - consumedTickets > kMaxTicketThreshold)
         return tecDIR_FULL;
 
     return tesSUCCESS;
@@ -100,7 +100,7 @@ TicketCreate::doApply()
     for (std::uint32_t i = 0; i < ticketCount; ++i)
     {
         std::uint32_t const curTicketSeq = firstTicketSeq + i;
-        Keylet const ticketKeylet = keylet::kTICKET(account_, curTicketSeq);
+        Keylet const ticketKeylet = keylet::kTicket(account_, curTicketSeq);
         SLE::pointer const sleTicket = std::make_shared<SLE>(ticketKeylet);
 
         sleTicket->setAccountID(sfAccount, account_);
diff --git a/src/libxrpl/tx/transactors/token/Clawback.cpp b/src/libxrpl/tx/transactors/token/Clawback.cpp
index 99c933d1c4..8532f97995 100644
--- a/src/libxrpl/tx/transactors/token/Clawback.cpp
+++ b/src/libxrpl/tx/transactors/token/Clawback.cpp
@@ -45,7 +45,7 @@ preflightHelper<Issue>(PreflightContext const& ctx)
     // The issuer field is used for the token holder instead
     AccountID const& holder = clawAmount.getIssuer();
 
-    if (issuer == holder || isXRP(clawAmount) || clawAmount <= beast::kZERO)
+    if (issuer == holder || isXRP(clawAmount) || clawAmount <= beast::kZero)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -68,7 +68,7 @@ preflightHelper<MPTIssue>(PreflightContext const& ctx)
     if (ctx.tx[sfAccount] == *mptHolder)
         return temMALFORMED;
 
-    if (clawAmount.mpt() > MPTAmount{kMAX_MP_TOKEN_AMOUNT} || clawAmount <= beast::kZERO)
+    if (clawAmount.mpt() > MPTAmount{kMaxMpTokenAmount} || clawAmount <= beast::kZero)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -117,11 +117,11 @@ preclaimHelper<Issue>(
     STAmount const balance = (*sleRippleState)[sfBalance];
 
     // If balance is positive, issuer must have higher address than holder
-    if (balance > beast::kZERO && issuer < holder)
+    if (balance > beast::kZero && issuer < holder)
         return tecNO_PERMISSION;
 
     // If balance is negative, issuer must have lower address than holder
-    if (balance < beast::kZERO && issuer > holder)
+    if (balance < beast::kZero && issuer > holder)
         return tecNO_PERMISSION;
 
     // At this point, we know that issuer and holder accounts
@@ -139,7 +139,7 @@ preclaimHelper<Issue>(
             clawAmount.get<Issue>().currency,
             issuer,
             FreezeHandling::IgnoreFreeze,
-            ctx.j) <= beast::kZERO)
+            ctx.j) <= beast::kZero)
         return tecINSUFFICIENT_FUNDS;
 
     return tesSUCCESS;
@@ -174,7 +174,7 @@ preclaimHelper<MPTIssue>(
             clawAmount.get<MPTIssue>(),
             FreezeHandling::IgnoreFreeze,
             AuthHandling::IgnoreAuth,
-            ctx.j) <= beast::kZERO)
+            ctx.j) <= beast::kZero)
         return tecINSUFFICIENT_FUNDS;
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
index 430d513670..aa1cb559d2 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
@@ -57,7 +57,7 @@ MPTokenIssuanceCreate::preflight(PreflightContext const& ctx)
 
     if (auto const fee = ctx.tx[~sfTransferFee])
     {
-        if (fee > kMAX_TRANSFER_FEE)
+        if (fee > kMaxTransferFee)
             return temBAD_TRANSFER_FEE;
 
         // If a non-zero TransferFee is set then the tfTransferable flag
@@ -68,7 +68,7 @@ MPTokenIssuanceCreate::preflight(PreflightContext const& ctx)
 
     if (auto const domain = ctx.tx[~sfDomainID])
     {
-        if (*domain == beast::kZERO)
+        if (*domain == beast::kZero)
             return temMALFORMED;
 
         // Domain present implies that MPTokenIssuance is not public
@@ -78,7 +78,7 @@ MPTokenIssuanceCreate::preflight(PreflightContext const& ctx)
 
     if (auto const metadata = ctx.tx[~sfMPTokenMetadata])
     {
-        if (metadata->empty() || metadata->length() > kMAX_MP_TOKEN_METADATA_LENGTH)
+        if (metadata->empty() || metadata->length() > kMaxMpTokenMetadataLength)
             return temMALFORMED;
     }
 
@@ -88,7 +88,7 @@ MPTokenIssuanceCreate::preflight(PreflightContext const& ctx)
         if (maxAmt == 0)
             return temMALFORMED;
 
-        if (maxAmt > kMAX_MP_TOKEN_AMOUNT)
+        if (maxAmt > kMaxMpTokenAmount)
             return temMALFORMED;
     }
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp
index 438d7614c5..d8b62acf3f 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp
@@ -52,7 +52,7 @@ struct MPTMutabilityFlags
     std::uint32_t canMutateFlag;
 };
 
-static constexpr std::array<MPTMutabilityFlags, 6> kMPT_MUTABILITY_FLAGS = {
+static constexpr std::array<MPTMutabilityFlags, 6> kMptMutabilityFlags = {
     {{.setFlag = tmfMPTSetCanLock,
       .clearFlag = tmfMPTClearCanLock,
       .canMutateFlag = lsmfMPTCanMutateCanLock},
@@ -112,10 +112,10 @@ MPTokenIssuanceSet::preflight(PreflightContext const& ctx)
         if (isMutate && ((ctx.tx.getFlags() & tfUniversalMask) != 0u))
             return temMALFORMED;
 
-        if (transferFee && *transferFee > kMAX_TRANSFER_FEE)
+        if (transferFee && *transferFee > kMaxTransferFee)
             return temBAD_TRANSFER_FEE;
 
-        if (metadata && metadata->length() > kMAX_MP_TOKEN_METADATA_LENGTH)
+        if (metadata && metadata->length() > kMaxMpTokenMetadataLength)
             return temMALFORMED;
 
         if (mutableFlags)
@@ -124,7 +124,7 @@ MPTokenIssuanceSet::preflight(PreflightContext const& ctx)
                 return temINVALID_FLAG;
 
             // Can not set and clear the same flag
-            if (std::ranges::any_of(kMPT_MUTABILITY_FLAGS, [mutableFlags](auto const& f) {
+            if (std::ranges::any_of(kMptMutabilityFlags, [mutableFlags](auto const& f) {
                     return (*mutableFlags & f.setFlag) && (*mutableFlags & f.clearFlag);
                 }))
                 return temINVALID_FLAG;
@@ -214,7 +214,7 @@ MPTokenIssuanceSet::preclaim(PreclaimContext const& ctx)
         if (not sleMptIssuance->isFlag(lsfMPTRequireAuth))
             return tecNO_PERMISSION;
 
-        if (*domain != beast::kZERO)
+        if (*domain != beast::kZero)
         {
             auto const sleDomain = ctx.view.read(keylet::permissionedDomain(*domain));
             if (!sleDomain)
@@ -232,11 +232,10 @@ MPTokenIssuanceSet::preclaim(PreclaimContext const& ctx)
 
     if (auto const mutableFlags = ctx.tx[~sfMutableFlags])
     {
-        if (std::ranges::any_of(
-                kMPT_MUTABILITY_FLAGS, [mutableFlags, &isMutableFlag](auto const& f) {
-                    return !isMutableFlag(f.canMutateFlag) &&
-                        ((*mutableFlags & (f.setFlag | f.clearFlag)));
-                }))
+        if (std::ranges::any_of(kMptMutabilityFlags, [mutableFlags, &isMutableFlag](auto const& f) {
+                return !isMutableFlag(f.canMutateFlag) &&
+                    ((*mutableFlags & (f.setFlag | f.clearFlag)));
+            }))
             return tecNO_PERMISSION;
 
         // Clearing lsfMPTRequireAuth is invalid when the issuance already has
@@ -299,7 +298,7 @@ MPTokenIssuanceSet::doApply()
 
     if (auto const mutableFlags = ctx_.tx[~sfMutableFlags].value_or(0))
     {
-        for (auto const& f : kMPT_MUTABILITY_FLAGS)
+        for (auto const& f : kMptMutabilityFlags)
         {
             if ((mutableFlags & f.setFlag) != 0u)
             {
@@ -357,7 +356,7 @@ MPTokenIssuanceSet::doApply()
             sle->getType() == ltMPTOKEN_ISSUANCE,
             "MPTokenIssuanceSet::doApply : modifying MPTokenIssuance");
 
-        if (*domainID != beast::kZERO)
+        if (*domainID != beast::kZero)
         {
             sle->setFieldH256(sfDomainID, *domainID);
         }
diff --git a/src/libxrpl/tx/transactors/token/TrustSet.cpp b/src/libxrpl/tx/transactors/token/TrustSet.cpp
index d260281304..7c99085071 100644
--- a/src/libxrpl/tx/transactors/token/TrustSet.cpp
+++ b/src/libxrpl/tx/transactors/token/TrustSet.cpp
@@ -106,7 +106,7 @@ TrustSet::preflight(PreflightContext const& ctx)
         return temBAD_CURRENCY;
     }
 
-    if (saLimitAmount < beast::kZERO)
+    if (saLimitAmount < beast::kZero)
     {
         JLOG(j.trace()) << "Malformed transaction: Negative credit limit.";
         return temBAD_LIMIT;
@@ -252,7 +252,7 @@ TrustSet::preclaim(PreclaimContext const& ctx)
             else if (auto const ammSle = ctx.view.read({ltAMM, sleDst->getFieldH256(sfAMMID)}))
             {
                 auto const lpTokens = ammSle->getFieldAmount(sfLPTokenBalance);
-                if (lpTokens == beast::kZERO)
+                if (lpTokens == beast::kZero)
                 {
                     return tecAMM_EMPTY;
                 }
@@ -363,7 +363,7 @@ TrustSet::doApply()
     // could use the extra XRP for their own purposes.
 
     XRPAmount const reserveCreate(
-        (uOwnerCount < 2) ? XRPAmount(beast::kZERO)
+        (uOwnerCount < 2) ? XRPAmount(beast::kZero)
                           : view().fees().accountReserve(uOwnerCount + 1));
 
     std::uint32_t const uQualityIn(bQualityIn ? ctx_.tx.getFieldU32(sfQualityIn) : 0);
@@ -498,7 +498,7 @@ TrustSet::doApply()
 
         if (bSetNoRipple && !bClearNoRipple)
         {
-            if ((bHigh ? saHighBalance : saLowBalance) >= beast::kZERO)
+            if ((bHigh ? saHighBalance : saLowBalance) >= beast::kZero)
             {
                 uFlagsOut |= (bHigh ? lsfHighNoRipple : lsfLowNoRipple);
             }
@@ -535,12 +535,12 @@ TrustSet::doApply()
 
         bool const bLowReserveSet = (uLowQualityIn != 0u) || (uLowQualityOut != 0u) ||
             ((uFlagsOut & lsfLowNoRipple) == 0) != bLowDefRipple ||
-            ((uFlagsOut & lsfLowFreeze) != 0u) || saLowLimit || saLowBalance > beast::kZERO;
+            ((uFlagsOut & lsfLowFreeze) != 0u) || saLowLimit || saLowBalance > beast::kZero;
         bool const bLowReserveClear = !bLowReserveSet;
 
         bool const bHighReserveSet = (uHighQualityIn != 0u) || (uHighQualityOut != 0u) ||
             ((uFlagsOut & lsfHighNoRipple) == 0) != bHighDefRipple ||
-            ((uFlagsOut & lsfHighFreeze) != 0u) || saHighLimit || saHighBalance > beast::kZERO;
+            ((uFlagsOut & lsfHighFreeze) != 0u) || saHighLimit || saHighBalance > beast::kZero;
         bool const bHighReserveClear = !bHighReserveSet;
 
         bool const bDefault = bLowReserveClear && bHighReserveClear;
diff --git a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
index 8bd8e6112e..1bd61a0175 100644
--- a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
@@ -35,7 +35,7 @@ namespace xrpl {
 NotTEC
 VaultClawback::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfVaultID] == beast::kZERO)
+    if (ctx.tx[sfVaultID] == beast::kZero)
     {
         JLOG(ctx.j.debug()) << "VaultClawback: zero/empty vault ID.";
         return temMALFORMED;
@@ -45,7 +45,7 @@ VaultClawback::preflight(PreflightContext const& ctx)
     if (amount)
     {
         // Note, zero amount is valid, it means "all". It is also the default.
-        if (*amount < beast::kZERO)
+        if (*amount < beast::kZero)
         {
             return temBAD_AMOUNT;
         }
@@ -133,7 +133,7 @@ VaultClawback::preclaim(PreclaimContext const& ctx)
         }
 
         // If amount is non-zero, the VaultOwner must burn all shares
-        if (amount != beast::kZERO)
+        if (amount != beast::kZero)
         {
             Number const& sharesHeld = accountHolds(
                 ctx.view,
@@ -243,7 +243,7 @@ VaultClawback::assetsToClawback(
     // clamping to assetsAvailable, allowing more assets to be recovered
     // than available when there was an outstanding loan. Retained for
     // ledger replay compatibility.
-    if (!ctx_.view().rules().enabled(fixCleanup3_1_3) && clawbackAmount == beast::kZERO)
+    if (!ctx_.view().rules().enabled(fixCleanup3_1_3) && clawbackAmount == beast::kZero)
     {
         auto const sharesDestroyed = accountHolds(
             view(), holder, share, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
@@ -259,7 +259,7 @@ VaultClawback::assetsToClawback(
 
     try
     {
-        if (clawbackAmount == beast::kZERO)
+        if (clawbackAmount == beast::kZero)
         {
             sharesDestroyed = accountHolds(
                 view(), holder, share, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
@@ -381,7 +381,7 @@ VaultClawback::doApply()
         sharesDestroyed = clawbackParts->second;
     }
 
-    if (sharesDestroyed == beast::kZERO)
+    if (sharesDestroyed == beast::kZero)
         return tecPRECISION_LOSS;
 
     assetsTotal -= assetsRecovered;
@@ -422,7 +422,7 @@ VaultClawback::doApply()
         // else quietly ignore, holder balance is not zero
     }
 
-    if (assetsRecovered > beast::kZERO)
+    if (assetsRecovered > beast::kZero)
     {
         // Transfer assets from vault to issuer.
         if (auto const ter = accountSend(
@@ -437,7 +437,7 @@ VaultClawback::doApply()
                 assetsRecovered.asset(),
                 FreezeHandling::IgnoreFreeze,
                 AuthHandling::IgnoreAuth,
-                j_) < beast::kZERO)
+                j_) < beast::kZero)
         {
             // LCOV_EXCL_START
             JLOG(j_.error()) << "VaultClawback: negative balance of vault assets.";
diff --git a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
index ca7d0cc5fa..e1e321b2c6 100644
--- a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
@@ -52,19 +52,19 @@ VaultCreate::getFlagsMask(PreflightContext const& ctx)
 NotTEC
 VaultCreate::preflight(PreflightContext const& ctx)
 {
-    if (!validDataLength(ctx.tx[~sfData], kMAX_DATA_PAYLOAD_LENGTH))
+    if (!validDataLength(ctx.tx[~sfData], kMaxDataPayloadLength))
         return temMALFORMED;
 
     if (auto const withdrawalPolicy = ctx.tx[~sfWithdrawalPolicy])
     {
         // Enforce valid withdrawal policy
-        if (*withdrawalPolicy != kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE)
+        if (*withdrawalPolicy != kVaultStrategyFirstComeFirstServe)
             return temMALFORMED;
     }
 
     if (auto const domain = ctx.tx[~sfDomainID])
     {
-        if (*domain == beast::kZERO)
+        if (*domain == beast::kZero)
         {
             return temMALFORMED;
         }
@@ -76,13 +76,13 @@ VaultCreate::preflight(PreflightContext const& ctx)
 
     if (auto const assetMax = ctx.tx[~sfAssetsMaximum])
     {
-        if (*assetMax < beast::kZERO)
+        if (*assetMax < beast::kZero)
             return temMALFORMED;
     }
 
     if (auto const metadata = ctx.tx[~sfMPTokenMetadata])
     {
-        if (metadata->empty() || metadata->length() > kMAX_MP_TOKEN_METADATA_LENGTH)
+        if (metadata->empty() || metadata->length() > kMaxMpTokenMetadataLength)
             return temMALFORMED;
     }
 
@@ -92,7 +92,7 @@ VaultCreate::preflight(PreflightContext const& ctx)
         if (vaultAsset.holds<MPTIssue>() || vaultAsset.native())
             return temMALFORMED;
 
-        if (scale > kVAULT_MAXIMUM_IOU_SCALE)
+        if (scale > kVaultMaximumIouScale)
             return temMALFORMED;
     }
 
@@ -130,7 +130,7 @@ VaultCreate::preclaim(PreclaimContext const& ctx)
 
     auto const sequence = ctx.tx.getSeqValue();
     if (auto const accountId = pseudoAccountAddress(ctx.view, keylet::vault(account, sequence).key);
-        accountId == beast::kZERO)
+        accountId == beast::kZero)
         return terADDRESS_COLLISION;
 
     return tesSUCCESS;
@@ -171,7 +171,7 @@ VaultCreate::doApply()
 
     std::uint8_t const scale = (asset.holds<MPTIssue>() || asset.native())
         ? 0
-        : ctx_.tx[~sfScale].value_or(kVAULT_DEFAULT_IOU_SCALE);
+        : ctx_.tx[~sfScale].value_or(kVaultDefaultIouScale);
 
     std::uint32_t mptFlags = 0;
     if (!tx.isFlag(tfVaultShareNonTransferable))
@@ -222,7 +222,7 @@ VaultCreate::doApply()
     }
     else
     {
-        vault->at(sfWithdrawalPolicy) = kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE;
+        vault->at(sfWithdrawalPolicy) = kVaultStrategyFirstComeFirstServe;
     }
     if (scale != 0u)
         vault->at(sfScale) = scale;
diff --git a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
index 20415b7816..fc34aba150 100644
--- a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
@@ -24,7 +24,7 @@ namespace xrpl {
 NotTEC
 VaultDelete::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfVaultID] == beast::kZERO)
+    if (ctx.tx[sfVaultID] == beast::kZero)
     {
         JLOG(ctx.j.debug()) << "VaultDelete: zero/empty vault ID.";
         return temMALFORMED;
diff --git a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
index 4b8d8b5c18..a378c4b991 100644
--- a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
@@ -28,13 +28,13 @@ namespace xrpl {
 NotTEC
 VaultDeposit::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfVaultID] == beast::kZERO)
+    if (ctx.tx[sfVaultID] == beast::kZero)
     {
         JLOG(ctx.j.debug()) << "VaultDeposit: zero/empty vault ID.";
         return temMALFORMED;
     }
 
-    if (ctx.tx[sfAmount] <= beast::kZERO)
+    if (ctx.tx[sfAmount] <= beast::kZero)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -204,7 +204,7 @@ VaultDeposit::doApply()
                 return tecINTERNAL;  // LCOV_EXCL_LINE
             sharesCreated = *maybeShares;
         }
-        if (sharesCreated == beast::kZERO)
+        if (sharesCreated == beast::kZero)
             return tecPRECISION_LOSS;
 
         auto const maybeAssets = sharesToAssetsDeposit(vault, sleIssuance, sharesCreated);
@@ -259,7 +259,7 @@ VaultDeposit::doApply()
             assetsDeposited.asset(),
             FreezeHandling::IgnoreFreeze,
             AuthHandling::IgnoreAuth,
-            j_) < beast::kZERO)
+            j_) < beast::kZero)
     {
         // LCOV_EXCL_START
         JLOG(j_.error()) << "VaultDeposit: negative balance of account assets.";
diff --git a/src/libxrpl/tx/transactors/vault/VaultSet.cpp b/src/libxrpl/tx/transactors/vault/VaultSet.cpp
index 684413399d..f384fd3fb1 100644
--- a/src/libxrpl/tx/transactors/vault/VaultSet.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultSet.cpp
@@ -28,7 +28,7 @@ VaultSet::checkExtraFeatures(PreflightContext const& ctx)
 NotTEC
 VaultSet::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfVaultID] == beast::kZERO)
+    if (ctx.tx[sfVaultID] == beast::kZero)
     {
         JLOG(ctx.j.debug()) << "VaultSet: zero/empty vault ID.";
         return temMALFORMED;
@@ -36,7 +36,7 @@ VaultSet::preflight(PreflightContext const& ctx)
 
     if (auto const data = ctx.tx[~sfData])
     {
-        if (data->empty() || data->length() > kMAX_DATA_PAYLOAD_LENGTH)
+        if (data->empty() || data->length() > kMaxDataPayloadLength)
         {
             JLOG(ctx.j.debug()) << "VaultSet: invalid data payload size.";
             return temMALFORMED;
@@ -45,7 +45,7 @@ VaultSet::preflight(PreflightContext const& ctx)
 
     if (auto const assetMax = ctx.tx[~sfAssetsMaximum])
     {
-        if (*assetMax < beast::kZERO)
+        if (*assetMax < beast::kZero)
         {
             JLOG(ctx.j.debug()) << "VaultSet: invalid max assets.";
             return temMALFORMED;
@@ -95,7 +95,7 @@ VaultSet::preclaim(PreclaimContext const& ctx)
             return tecNO_PERMISSION;
         }
 
-        if (*domain != beast::kZERO)
+        if (*domain != beast::kZero)
         {
             auto const sleDomain = ctx.view.read(keylet::permissionedDomain(*domain));
             if (!sleDomain)
@@ -153,7 +153,7 @@ VaultSet::doApply()
 
     if (auto const domainId = tx[~sfDomainID]; domainId)
     {
-        if (*domainId != beast::kZERO)
+        if (*domainId != beast::kZero)
         {
             // In VaultSet::preclaim we enforce that lsfVaultPrivate must have
             // been set in the vault. We currently do not support making such a
diff --git a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
index 5b4949ccf6..ddfc788928 100644
--- a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
@@ -29,18 +29,18 @@ namespace xrpl {
 NotTEC
 VaultWithdraw::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfVaultID] == beast::kZERO)
+    if (ctx.tx[sfVaultID] == beast::kZero)
     {
         JLOG(ctx.j.debug()) << "VaultWithdraw: zero/empty vault ID.";
         return temMALFORMED;
     }
 
-    if (ctx.tx[sfAmount] <= beast::kZERO)
+    if (ctx.tx[sfAmount] <= beast::kZero)
         return temBAD_AMOUNT;
 
     if (auto const destination = ctx.tx[~sfDestination])
     {
-        if (*destination == beast::kZERO)
+        if (*destination == beast::kZero)
         {
             return temMALFORMED;
         }
@@ -72,7 +72,7 @@ VaultWithdraw::preclaim(PreclaimContext const& ctx)
     }
 
     // Enforce valid withdrawal policy
-    if (vault->at(sfWithdrawalPolicy) != kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE)
+    if (vault->at(sfWithdrawalPolicy) != kVaultStrategyFirstComeFirstServe)
     {
         // LCOV_EXCL_START
         JLOG(ctx.j.error()) << "VaultWithdraw: invalid withdrawal policy.";
@@ -187,7 +187,7 @@ VaultWithdraw::doApply()
                 sharesRedeemed = *maybeShares;
             }
 
-            if (sharesRedeemed == beast::kZERO)
+            if (sharesRedeemed == beast::kZero)
                 return tecPRECISION_LOSS;
             auto const maybeAssets = sharesToAssetsWithdraw(vault, sleIssuance, sharesRedeemed);
             if (!maybeAssets)
diff --git a/src/test/app/AMMClawbackMPT_test.cpp b/src/test/app/AMMClawbackMPT_test.cpp
index 6f0fff0282..6facafde4a 100644
--- a/src/test/app/AMMClawbackMPT_test.cpp
+++ b/src/test/app/AMMClawbackMPT_test.cpp
@@ -52,7 +52,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             auto const usd = gw["USD"];
             env.trust(usd(10000), alice);
@@ -167,7 +167,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw2,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM const amm(env, alice, btc(100), usd(100));
             env.close();
@@ -197,7 +197,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM const amm(env, alice, btc(100), XRP(100));
             env.close();
@@ -225,7 +225,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
              .issuer = gw,
              .holders = {alice},
              .pay = 10'000,
-             .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+             .flags = tfMPTCanClawback | kMptDexFlags});
 
         AMM const amm(env, alice, XRP(1'000), btc(1'000));
 
@@ -272,7 +272,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw2,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM const amm(env, alice, btc(1000000000), usd(2000));
             env.close();
@@ -334,7 +334,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(1000000000), XRP(2000));
             env.close();
@@ -431,14 +431,14 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice, bob},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(2'000'000000), eth(3'000'000000));
             env.close();
@@ -535,7 +535,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw2,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(2000000000), usd(2000));
             env.close();
@@ -589,7 +589,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(5000), XRP(10'000));
             env.close();
@@ -646,14 +646,14 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice, bob},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(20'000), eth(50'000));
             env.close();
@@ -722,7 +722,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(1'000'000000), usd(2000));
             env.close();
@@ -811,14 +811,14 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(2'000'000000), eth(3'000'000000));
             env.close();
@@ -914,7 +914,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(2'000'000000), usd(8'000));
             env.close();
@@ -969,14 +969,14 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, btc(20'000), eth(10'000));
             env.close();
@@ -1048,7 +1048,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw2,
                  .holders = {alice, gw},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, gw, usd(1000), btc(2000));
             env.close();
@@ -1134,14 +1134,14 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {gw2, alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {gw, alice},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, gw, btc(10'000), eth(50'000));
             env.close();
@@ -1217,7 +1217,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 30'000,
-                 .flags = tfMPTCanClawback | tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | tfMPTCanLock | kMptDexFlags});
             AMM const ammAlice(env, alice, usd(10'000), btc(10'000));
             BEAST_EXPECT(ammAlice.expectBalances(usd(10'000), btc(10'000), IOUAmount(10'000)));
             env.close();
@@ -1288,7 +1288,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 30'000,
-                 .flags = tfMPTCanClawback | tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | tfMPTCanLock | kMptDexFlags});
             AMM const ammAlice(env, alice, usd(10'000), btc(10'000));
             BEAST_EXPECT(ammAlice.expectBalances(usd(10'000), btc(10'000), IOUAmount(10'000)));
             env.close();
@@ -1354,7 +1354,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             // gw creates AMM pool of BTC/XRP.
             AMM amm(env, gw, XRP(100), btc(400), Ter(tesSUCCESS));
@@ -1400,7 +1400,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             // gw creates AMM pool of BTC/USD.
             AMM amm(env, gw, usd(100), btc(400), Ter(tesSUCCESS));
@@ -1448,14 +1448,14 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             // gw creates AMM pool of BTC/USD.
             AMM amm(env, gw, usd(100), btc(400), Ter(tesSUCCESS));
@@ -1517,7 +1517,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, usd(2), eur(1));
             amm.deposit(alice, IOUAmount{1'576123487565916, -15});
@@ -1580,14 +1580,14 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             MPT const eur = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM amm(env, alice, usd(2), eur(1));
             amm.deposit(alice, IOUAmount{1'576123487565916, -15});
@@ -1697,7 +1697,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             // Asset USD is not clawable without asfAllowTrustLineClawback.
             AMM const amm(env, alice, usd(200), btc(100));
@@ -1737,7 +1737,7 @@ class AMMClawbackMPT_test : public beast::unit_test::Suite
                  .issuer = gw2,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
 
             AMM const amm(env, alice, usd(200), btc(100));
 
diff --git a/src/test/app/AMMExtendedMPT_test.cpp b/src/test/app/AMMExtendedMPT_test.cpp
index 62b4905c8f..cf1210901f 100644
--- a/src/test/app/AMMExtendedMPT_test.cpp
+++ b/src/test/app/AMMExtendedMPT_test.cpp
@@ -85,14 +85,14 @@ private:
              .issuer = gw_,
              .holders = {alice_, bob_, carol_},
              .pay = 200'000'000'000'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         MPTTester const btc(
             {.env = env,
              .issuer = gw_,
              .holders = {alice_, bob_, carol_},
              .pay = 2'000'000'000'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         // Must be two offers at the same quality
         // "taker gets" must be XRP
@@ -240,7 +240,7 @@ private:
              .issuer = gw_,
              .holders = {alice_, bob_},
              .pay = 100'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         AMM const ammAlice(env, alice_, XRP(150'000), btc(50'000'000));
 
@@ -272,7 +272,7 @@ private:
         env.close();
 
         MPTTester const btc(
-            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMptDexFlags});
         env(pay(gw_, alice_, btc(500'000'000)));
 
         AMM const ammAlice(env, alice_, XRP(150'000), btc(51'000'000));
@@ -297,7 +297,7 @@ private:
         env.require(Owners(bob_, 0));
 
         MPTTester const btc(
-            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMptDexFlags});
         env(pay(gw_, bob_, btc(1'000'000'000)));
 
         env.require(Owners(alice_, 1), Owners(bob_, 1));
@@ -330,7 +330,7 @@ private:
              .issuer = gw_,
              .holders = {alice_, bob_},
              .pay = 30'000'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
         env(pay(gw_, alice_, btc(10'000'000'000)));
 
         AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000'000'000));
@@ -368,7 +368,7 @@ private:
         env.fund(XRP(1'000), bob_);
 
         MPTTester const btc(
-            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMptDexFlags});
         env(pay(gw_, alice_, btc(10'100'000'000)));
 
         AMM const ammAlice(env, alice_, XRP(10'000), btc(10'100'000'000));
@@ -392,7 +392,7 @@ private:
         env.fund(XRP(1'000), bob_);
 
         MPTTester const btc(
-            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMptDexFlags});
         env(pay(gw_, alice_, btc(40'000'000'000)));
 
         AMM const ammAlice(env, alice_, XRP(10'100), btc(10'000'000'000));
@@ -470,11 +470,11 @@ private:
         env.close();
 
         MPTTester const btc(
-            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMptDexFlags});
 
         // Created only to increase one reserve count for alice
         MPTTester const eth(
-            {.env = env, .issuer = gw_, .holders = {alice_}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_}, .flags = kMptDexFlags});
 
         env(pay(gw_, bob_, btc(1'200'000'000'000'000)));
 
@@ -508,7 +508,7 @@ private:
              .issuer = gw_,
              .holders = {alice_, bob_},
              .transferFee = 500,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         env(pay(gw_, bob_, btc(1'000'000'000'000)));
         env(pay(gw_, alice_, btc(200'000'000'000'000)));
@@ -539,7 +539,7 @@ private:
              .issuer = gw_,
              .holders = {alice_, bob_, carol_},
              .pay = 30'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
         env(pay(gw_, alice_, btc(10'100)));
 
         AMM const ammAlice(env, alice_, XRP(9'900), btc(10'100));
@@ -569,7 +569,7 @@ private:
         env.close();
 
         MPTTester const btc(
-            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMptDexFlags});
         env(pay(gw_, bob_, btc(2'200'000'000)));
 
         AMM const ammBob(env, bob_, XRP(1'000), btc(2'200'000'000));
@@ -602,13 +602,13 @@ private:
              .issuer = gw_,
              .holders = {alice_, bob_},
              .pay = 1'000'000'000'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
         MPTTester const xxx(
             {.env = env,
              .issuer = gw_,
              .holders = {alice_, bob_},
              .pay = 1'000'000'000'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         AMM const ammAlice(env, alice_, xts(1'000'000'000'000'000), xxx(1'000'000'000'000'000));
 
@@ -649,13 +649,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             // The scenario:
             //   o BTC/XRP AMM is created.
@@ -688,13 +688,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             // The scenario:
             //   o BTC/XRP AMM is created.
@@ -729,13 +729,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             // The scenario:
             //   o BTC/XRP offer is created.
@@ -779,7 +779,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_},
                  .pay = 20'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammBob(env, bob_, XRP(20'000), btc(200'000'000));
             // alice submits a tfSell | tfFillOrKill offer that does not cross.
             env(offer(alice_, btc(2'100'000), XRP(210), tfSell | tfFillOrKill), Ter(tecKILLED));
@@ -796,7 +796,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_},
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammBob(env, bob_, XRP(20'000), btc(200'000'000'000'000));
             // alice submits a tfSell | tfFillOrKill offer that crosses.
             // Even though tfSell is present it doesn't matter this time.
@@ -818,7 +818,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_},
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammBob(env, bob_, XRP(20'000), btc(200'000'000'000'000));
 
             env(offer(alice_, btc(10'000'000'000'000), XRP(1'500), tfSell | tfFillOrKill));
@@ -843,7 +843,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_},
                  .pay = 10'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammBob(env, bob_, XRP(5000), btc(10'000'000));
 
             env(offer(alice_, btc(1'000'000), XRP(501), tfSell | tfFillOrKill), Ter(tecKILLED));
@@ -872,7 +872,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             env(pay(gw_, alice_, btc(10'100'000)));
 
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'100'000));
@@ -898,7 +898,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             env(pay(gw_, alice_, btc(10'000'000)));
 
             AMM const ammAlice(env, alice_, XRP(10'100), btc(10'000'000));
@@ -924,14 +924,14 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 15'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 15'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             // The scenario:
             //   o BTC/XRP AMM is created.
@@ -969,14 +969,14 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 15'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 15'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             // The scenario:
             //   o BTC/XRP AMM is created.
@@ -1022,7 +1022,7 @@ private:
         env.close();
 
         MPTTester const btc(
-            {.env = env, .issuer = bob_, .holders = {alice_}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = bob_, .holders = {alice_}, .flags = kMptDexFlags});
 
         AMM const ammBob(env, bob_, XRP(10'000), btc(10'100));
 
@@ -1058,10 +1058,10 @@ private:
         env.close();
 
         MPTTester const aBux(
-            {.env = env, .issuer = ann, .holders = {bob, cam, carol}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = ann, .holders = {bob, cam, carol}, .flags = kMptDexFlags});
 
         MPTTester const bBux(
-            {.env = env, .issuer = bob, .holders = {ann, cam, carol}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = bob, .holders = {ann, cam, carol}, .flags = kMptDexFlags});
 
         env(pay(ann, cam, aBux(350'000'000'000'000)));
         env(pay(bob, cam, bBux(350'000'000'000'000)));
@@ -1103,7 +1103,7 @@ private:
             {.env = env,
              .issuer = gw_,
              .holders = {alice_, bob_},
-             .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS});
+             .flags = tfMPTRequireAuth | kMptDexFlags});
 
         // Authorize bob and alice
         btc.authorize({.holder = alice_});
@@ -1145,7 +1145,7 @@ private:
             {.env = env,
              .issuer = gw_,
              .holders = {alice_, bob_},
-             .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS});
+             .flags = tfMPTRequireAuth | kMptDexFlags});
 
         // Alice doesn't have the funds
         {
@@ -1225,7 +1225,7 @@ private:
              .issuer = gw_,
              .holders = {alice_, bob_, carol_},
              .pay = 100'000'000'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         AMM const ammCarol(env, carol_, XRP(100), eth(100'000'000'000'000));
 
@@ -1262,14 +1262,14 @@ private:
              .issuer = gw_,
              .holders = {alice_, bob_, carol_},
              .transferFee = 10'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         MPTTester const btc(
             {.env = env,
              .issuer = gw_,
              .holders = {alice_, bob_, carol_},
              .transferFee = 10'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         env(pay(gw_, carol_, eth(51)));
         env.close();
@@ -1300,7 +1300,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, charlie},
                  .pay = 11'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammCharlie(env, charlie, XRP(10), eth(11'000'000'000'000));
             auto [st, sa, da] = findPaths(env, alice_, bob_, eth(-1), XRP(1).value());
@@ -1324,7 +1324,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, charlie},
                  .pay = 11'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammCharlie(env, charlie, XRP(11), eth(10'000'000'000'000));
             env.close();
@@ -1363,16 +1363,16 @@ private:
         env.close();
 
         MPTTester const xyzG1(
-            {.env = env, .issuer = g1, .holders = {a1, m1, a2}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = g1, .holders = {a1, m1, a2}, .flags = kMptDexFlags});
 
         MPTTester const xyzG2(
-            {.env = env, .issuer = g2, .holders = {a2, m1, a1}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = g2, .holders = {a2, m1, a1}, .flags = kMptDexFlags});
 
         MPTTester const abcG3(
-            {.env = env, .issuer = g3, .holders = {a1, a2, m1, a3}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = g3, .holders = {a1, a2, m1, a3}, .flags = kMptDexFlags});
 
         MPTTester const abcA2(
-            {.env = env, .issuer = a2, .holders = {g3, a1}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = a2, .holders = {g3, a1}, .flags = kMptDexFlags});
 
         env(pay(g1, a1, xyzG1(3'500'000'000)));
         env(pay(g3, a1, abcG3(1'200'000'000)));
@@ -1444,7 +1444,7 @@ private:
              .issuer = g3,
              .holders = {a1, a2, m1},
              .pay = 1'000'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         AMM const ammM1(env, m1, eth(1'000'000'000), XRP(10'010));
 
@@ -1483,14 +1483,14 @@ private:
                  .issuer = g1,
                  .holders = {a1, m1},
                  .pay = 5'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const hkdG2(
                 {.env = env,
                  .issuer = g2,
                  .holders = {a2, m1},
                  .pay = 5'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammM1(env, m1, hkdG1(1'000'000'000), hkdG2(1'010'000'000));
 
@@ -1522,16 +1522,10 @@ private:
         env.close();
 
         MPTTester const eth(
-            {.env = env,
-             .issuer = gw_,
-             .holders = {alice_, bob_, carol_},
-             .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_, carol_}, .flags = kMptDexFlags});
 
         MPTTester const btc(
-            {.env = env,
-             .issuer = gw_,
-             .holders = {alice_, bob_, carol_},
-             .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_, carol_}, .flags = kMptDexFlags});
 
         env(pay(gw_, alice_, eth(50'000)));
         env(pay(gw_, bob_, btc(150'000)));
@@ -1610,14 +1604,14 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 100'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 150'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammBobBtcXrp(env, bob_, btc(100'000), XRP(150));
             AMM const ammBobXrpEth(env, bob_, XRP(100), eth(150'000));
@@ -1644,7 +1638,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 150'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammBob(env, bob_, XRP(100), eth(150'000));
 
@@ -1667,7 +1661,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 100'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammBob(env, bob_, eth(100'000), XRP(150));
 
@@ -1759,19 +1753,19 @@ private:
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester gbp(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(pay(gw_, alice_, btc(60'000'000)));
             env(pay(gw_, bob_, btc(100'000'000)));
@@ -1918,7 +1912,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const btc(
                 {.env = env,
@@ -1926,7 +1920,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const amm(env, bob_, gbp(1'000'000'000'000'000), btc(1'000'000'000'000'000));
 
@@ -1960,7 +1954,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const btc(
                 {.env = env,
@@ -1968,7 +1962,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const eth(
                 {.env = env,
@@ -1976,7 +1970,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(ed, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000)),
                 Txflags(tfPassive));
@@ -2021,7 +2015,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const btc(
                 {.env = env,
@@ -2029,7 +2023,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const eth(
                 {.env = env,
@@ -2037,7 +2031,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const amm1(env, bob_, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000));
             AMM const amm2(env, ed, eth(1'000'000'000'000'000), btc(1'000'000'000'000'000));
@@ -2076,7 +2070,7 @@ private:
                  .holders = {alice_, bob_},
                  .transferFee = 25'000,
                  .pay = 1'100'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const eth(
                 {.env = env,
@@ -2084,7 +2078,7 @@ private:
                  .holders = {alice_, bob_},
                  .transferFee = 25'000,
                  .pay = 1'100'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const amm(env, bob_, btc(1'000'000), eth(1'100'000));
             env(offer(alice_, eth(100'000), btc(100'000)));
@@ -2109,7 +2103,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const gbp(
                 {.env = env,
@@ -2117,7 +2111,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const amm(env, bob_, gbp(1'000'000'000'000'000), btc(1'000'000'000'000'000));
 
@@ -2153,7 +2147,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'200'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const gbp(
                 {.env = env,
@@ -2161,7 +2155,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'200'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const amm(env, bob_, gbp(1'000'000'000'000'000), btc(1'200'000'000'000'000));
 
@@ -2199,7 +2193,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const gbp(
                 {.env = env,
@@ -2207,7 +2201,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const eth(
                 {.env = env,
@@ -2215,7 +2209,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(ed, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000)),
                 Txflags(tfPassive));
@@ -2265,7 +2259,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const gbp(
                 {.env = env,
@@ -2273,7 +2267,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const eth(
                 {.env = env,
@@ -2281,7 +2275,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const amm(env, bob_, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000));
 
@@ -2332,7 +2326,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const gbp(
                 {.env = env,
@@ -2340,7 +2334,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const eth(
                 {.env = env,
@@ -2348,7 +2342,7 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const amm1(env, bob_, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000));
             AMM const amm2(env, ed, eth(1'000'000'000'000'000), btc(1'400'000'000'000'000));
@@ -2391,7 +2385,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const gbp(
                 {.env = env,
@@ -2399,7 +2393,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester const eth(
                 {.env = env,
@@ -2407,7 +2401,7 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const amm1(env, alice_, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000));
             AMM const amm2(env, bob_, eth(1'000'000'000'000'000), btc(1'400'000'000'000'000));
@@ -2453,7 +2447,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 2'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammBob(env, bob_, XRP(1'000), eth(1'050'000));
             env(offer(bob_, XRP(100), eth(50'000)));
@@ -2611,7 +2605,7 @@ private:
             env.fund(XRP(100'000'000), gw_, alice_, bob_, carol_, dan, ed);
 
             MPTTester const btc(
-                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMPT_DEX_FLAGS});
+                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMptDexFlags});
 
             env(pay(gw_, ed, btc(11'000'000'000'000)));
             env(pay(gw_, bob_, btc(1'000'000'000'000)));
@@ -2635,7 +2629,7 @@ private:
             // Carol offers to buy 1000 XRP for 1000e12 BTC. She removes Bob's
             // next 1000 offers as unfunded and hits the step limit.
             env(offer(carol_, btc(1'000'000'000'000'000), XRP(1'000)));
-            env.require(Balance(carol_, MPT(btc)(kNONE)));
+            env.require(Balance(carol_, MPT(btc)(kNone)));
             env.require(Owners(carol_, 1));
             env.require(Balance(bob_, btc(0)));
             env.require(Owners(bob_, 1));
@@ -2657,7 +2651,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, dan, ed},
                  .pay = 10000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env.trust(BTC(11'000'000'000'000), ed);
             env(pay(gw_, ed, BTC(11'000'000'000'000)));
@@ -2702,7 +2696,7 @@ private:
             env.close();
 
             MPTTester const btc(
-                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMPT_DEX_FLAGS});
+                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMptDexFlags});
 
             env(pay(gw_, ed, btc(11'000'000'000'000)));
             env(pay(gw_, bob_, btc(1'000'000'000'000)));
@@ -2732,13 +2726,13 @@ private:
             env.close();
 
             MPTTester const btc(
-                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMPT_DEX_FLAGS});
+                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMptDexFlags});
             MPTTester const usd(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, dan, ed},
                  .pay = 10000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(pay(gw_, ed, btc(11'000'000'000'000)));
             env(pay(gw_, bob_, btc(1'000'000'000'000)));
@@ -2774,7 +2768,7 @@ private:
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(pay(alice_, bob_, btc(10'000)), DeliverMin(btc(10'000)), Ter(temBAD_AMOUNT));
             env(pay(alice_, bob_, btc(10'000)),
@@ -2811,7 +2805,7 @@ private:
             fund(env, gw_, {alice_, bob_}, XRP(10'000));
 
             MPTTester const btc(
-                {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+                {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMptDexFlags});
 
             env(pay(gw_, bob_, btc(1'100'000)));
             AMM const ammBob(env, bob_, XRP(1'000), btc(1'100'000));
@@ -2863,7 +2857,7 @@ private:
             fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
 
             MPTTester const btc(
-                {.env = env, .issuer = gw_, .holders = {bob_, carol_}, .flags = kMPT_DEX_FLAGS});
+                {.env = env, .issuer = gw_, .holders = {bob_, carol_}, .flags = kMptDexFlags});
 
             env(pay(gw_, bob_, btc(1'200'000)));
             AMM const ammBob(env, bob_, XRP(5'500), btc(1'200'000));
@@ -2932,10 +2926,7 @@ private:
             fund(env, gw_, {alice_, bob_, carol_, dan}, XRP(10'000));
 
             MPTTester const btc(
-                {.env = env,
-                 .issuer = gw_,
-                 .holders = {bob_, carol_, dan},
-                 .flags = kMPT_DEX_FLAGS});
+                {.env = env, .issuer = gw_, .holders = {bob_, carol_, dan}, .flags = kMptDexFlags});
 
             env(pay(gw_, bob_, btc(100'000'000)));
             env(pay(gw_, dan, btc(1'100'000'000)));
@@ -2967,7 +2958,7 @@ private:
         fund(env, gw_, {alice_, becky}, XRP(5'000));
 
         MPTTester const btc(
-            {.env = env, .issuer = gw_, .holders = {alice_, becky}, .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, becky}, .flags = kMptDexFlags});
 
         env(pay(gw_, alice_, btc(500'000)));
         env.close();
@@ -3005,10 +2996,7 @@ private:
         fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
 
         MPTTester btc(
-            {.env = env,
-             .issuer = gw_,
-             .holders = {alice_, bob_, carol_},
-             .flags = kMPT_DEX_FLAGS});
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_, carol_}, .flags = kMptDexFlags});
 
         env(pay(gw_, alice_, btc(150'000)));
         env(pay(gw_, carol_, btc(150'000)));
@@ -3103,7 +3091,7 @@ private:
             {.env = env,
              .issuer = g1,
              .holders = {alice, bob},
-             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+             .flags = tfMPTCanLock | kMptDexFlags});
 
         env(pay(g1, bob, btc(10)));
         env(pay(g1, alice, btc(205)));
@@ -3179,13 +3167,13 @@ private:
             {.env = env,
              .issuer = g1,
              .holders = {a1, a2, a3, a4},
-             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+             .flags = tfMPTCanLock | kMptDexFlags});
 
         MPTTester btc(
             {.env = env,
              .issuer = g1,
              .holders = {a1, a2, a3, a4},
-             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+             .flags = tfMPTCanLock | kMptDexFlags});
 
         env(pay(g1, a1, eth(1'000)));
         env(pay(g1, a2, eth(100)));
@@ -3274,7 +3262,7 @@ private:
             {.env = env,
              .issuer = g1,
              .holders = {a2, a3, a4},
-             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+             .flags = tfMPTCanLock | kMptDexFlags});
 
         env(pay(g1, a3, btc(2'000)));
         env(pay(g1, a4, btc(2'001)));
@@ -3340,7 +3328,7 @@ private:
              .issuer = gw_,
              .holders = {alice, becky, zelda},
              .pay = 20'000'000'000,
-             .flags = kMPT_DEX_FLAGS});
+             .flags = kMptDexFlags});
 
         // alice uses a regular key with the master disabled.
         Account const alie{"alie", KeyType::Secp256k1};
@@ -3350,8 +3338,8 @@ private:
         // Attach signers to alice.
         env(signers(alice, 2, {{becky, 1}, {bogie, 1}}), Sig(alie));
         env.close();
-        int constexpr kSIGNER_LIST_OWNERS{2};
-        env.require(Owners(alice, kSIGNER_LIST_OWNERS + 0));
+        static constexpr int kSignerListOwners{2};
+        env.require(Owners(alice, kSignerListOwners + 0));
 
         Msig const ms{becky, bogie};
 
@@ -3446,14 +3434,14 @@ private:
                  .issuer = bob_,
                  .holders = {alice_, gw_},
                  .pay = 100'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             MPTTester eth(
                 {.env = env,
                  .issuer = bob_,
                  .holders = {alice_, gw_},
                  .pay = 100'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammXrpBtc(env, bob_, XRP(100), btc(100'000));
             env(offer(gw_, XRP(100), btc(100'000)), Txflags(tfPassive));
@@ -3487,7 +3475,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 100'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammBob(env, bob_, XRP(100), btc(100));
 
@@ -3508,7 +3496,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 100'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM const ammBob(env, bob_, XRP(100), btc(100));
 
@@ -3536,7 +3524,7 @@ private:
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(pay(gw_, bob_, btc(100'000'000)));
             env(pay(gw_, alice_, btc(100'000'000)));
diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp
index 69514fe77b..18f2d6df2f 100644
--- a/src/test/app/AMMExtended_test.cpp
+++ b/src/test/app/AMMExtended_test.cpp
@@ -1120,14 +1120,14 @@ private:
             env(pay(ann, cam, dBux(60)), Path(localBob, dan), Sendmax(aBux(200)));
             env.close();
 
-            BEAST_EXPECT(expectHolding(env, ann, aBux(kNONE)));
-            BEAST_EXPECT(expectHolding(env, ann, dBux(kNONE)));
+            BEAST_EXPECT(expectHolding(env, ann, aBux(kNone)));
+            BEAST_EXPECT(expectHolding(env, ann, dBux(kNone)));
             BEAST_EXPECT(expectHolding(env, localBob, aBux(72)));
             BEAST_EXPECT(expectHolding(env, localBob, dBux(40)));
-            BEAST_EXPECT(expectHolding(env, cam, aBux(kNONE)));
+            BEAST_EXPECT(expectHolding(env, cam, aBux(kNone)));
             BEAST_EXPECT(expectHolding(env, cam, dBux(60)));
-            BEAST_EXPECT(expectHolding(env, dan, aBux(kNONE)));
-            BEAST_EXPECT(expectHolding(env, dan, dBux(kNONE)));
+            BEAST_EXPECT(expectHolding(env, dan, aBux(kNone)));
+            BEAST_EXPECT(expectHolding(env, dan, dBux(kNone)));
 
             AMM const ammBob(env, localBob, aBux(30), dBux(30));
 
@@ -1139,12 +1139,12 @@ private:
             env.close();
 
             BEAST_EXPECT(ammBob.expectBalances(aBux(30), dBux(30), ammBob.tokens()));
-            BEAST_EXPECT(expectHolding(env, ann, aBux(kNONE)));
+            BEAST_EXPECT(expectHolding(env, ann, aBux(kNone)));
             BEAST_EXPECT(expectHolding(env, ann, dBux(0)));
-            BEAST_EXPECT(expectHolding(env, cam, aBux(kNONE)));
+            BEAST_EXPECT(expectHolding(env, cam, aBux(kNone)));
             BEAST_EXPECT(expectHolding(env, cam, dBux(60)));
             BEAST_EXPECT(expectHolding(env, dan, aBux(0)));
-            BEAST_EXPECT(expectHolding(env, dan, dBux(kNONE)));
+            BEAST_EXPECT(expectHolding(env, dan, dBux(kNone)));
         }
     }
 
@@ -2714,7 +2714,7 @@ private:
         // Carol offers to buy 1000 XRP for 1000 USD. She removes Bob's next
         // 1000 offers as unfunded and hits the step limit.
         env(offer(carol_, USD(1'000), XRP(1'000)));
-        env.require(Balance(carol_, USD(kNONE)));
+        env.require(Balance(carol_, USD(kNone)));
         env.require(Owners(carol_, 1));
         env.require(Balance(bob_, USD(0)));
         env.require(Owners(bob_, 1));
diff --git a/src/test/app/AMMMPT_test.cpp b/src/test/app/AMMMPT_test.cpp
index 2d19a94840..4d073d0188 100644
--- a/src/test/app/AMMMPT_test.cpp
+++ b/src/test/app/AMMMPT_test.cpp
@@ -128,7 +128,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
+                 .flags = tfMPTRequireAuth | kMptDexFlags,
                  .authHolder = true});
             AMM const ammAlice(env, alice_, USD(10'000), btc(10'000));
         }
@@ -142,7 +142,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             usd.set({.flags = tfMPTLock});
             AMM const ammAliceFail(env, alice_, XRP(10'000), usd(10'000), Ter(tecFROZEN));
             usd.set({.flags = tfMPTUnlock});
@@ -346,7 +346,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             btc.set({.flags = tfMPTLock});
             AMM const ammAlice(env, alice_, USD(10'000), btc(10'000), Ter(tecFROZEN));
             BEAST_EXPECT(!ammAlice.ammExists());
@@ -361,7 +361,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             btc.set({.holder = alice_, .flags = tfMPTLock});
 
             // alice's token is locked
@@ -496,7 +496,7 @@ private:
                     {.env = env,
                      .issuer = gw_,
                      .holders = {alice_, carol_},
-                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
+                     .flags = tfMPTCanLock | kMptDexFlags,
                      .authHolder = true});
 
                 // Depositing mismatched token, invalid Asset1In.issue
@@ -687,7 +687,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM ammAlice(env, alice_, USD(10'000), btc(10'000));
             btc.set({.flags = tfMPTLock});
@@ -713,7 +713,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM ammAlice(env, alice_, USD(10'000), btc(10'000));
 
@@ -799,13 +799,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             MPTTester usd(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 40'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM ammAlice(env, alice_, usd(10'000), btc(10'000));
 
@@ -871,7 +871,7 @@ private:
                 {.maxAmt = 1'000'000,
                  .authorize = {{alice}},
                  .pay = {{{alice}, 10'000}},
-                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
+                 .flags = tfMPTRequireAuth | kMptDexFlags,
                  .authHolder = true});
 
             AMM amm(env, alice, XRP(10'000), btc(10'000));
@@ -2036,7 +2036,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
+                 .flags = tfMPTRequireAuth | kMptDexFlags,
                  .authHolder = true});
             AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
             WithdrawArg const args{
@@ -2054,7 +2054,7 @@ private:
                      .issuer = gw_,
                      .holders = {alice_, carol_},
                      .pay = 2'000,
-                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                     .flags = tfMPTCanLock | kMptDexFlags});
 
                 // Invalid tokens
                 ammAlice.withdraw(alice_, 0, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
@@ -2225,7 +2225,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
+                 .flags = tfMPTRequireAuth | kMptDexFlags,
                  .authHolder = true});
             MPT const btc = btcm;
 
@@ -2276,7 +2276,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
+                 .flags = tfMPTCanLock | kMptDexFlags,
                  .authHolder = true});
 
             AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
@@ -2300,13 +2300,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             MPTTester const usd(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 40'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM ammAlice(env, alice_, usd(10'000), btc(10'000));
 
@@ -2334,7 +2334,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM ammAlice(env, alice_, USD(10'000), btc(10'000));
 
@@ -3477,7 +3477,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 2'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM amm(env, gw_, XRP(1'000), btc(1'000), false, 1'000);
 
             // auction slot is owned by the creator of the AMM i.e. gw
@@ -3502,7 +3502,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 2'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM amm(env, gw_, XRP(1'000), btc(1'000), false, 1'000);
 
             // auction slot is owned by the creator of the AMM i.e. gw
@@ -3610,7 +3610,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_, bob_},
                  .pay = 30'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             AMM ammAlice(env, alice_, btc(10'000'000'000), USD(10'000));
             ammAlice.deposit(carol_, 1'000'000);
@@ -3646,7 +3646,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_},
                  .pay = 1'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM amm(env, gw_, XRP(10), btc(1'000));
             auto const lpIssue = amm.lptIssue();
             env.trust(STAmount{lpIssue, 100}, alice_);
@@ -3711,7 +3711,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_, bob_},
                  .pay = 30'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
             ammAlice.deposit(carol_, 1'000'000);
@@ -3756,7 +3756,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_, bob_},
                  .pay = 30'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
             ammAlice.deposit(carol_, 1'000'000);
@@ -3770,18 +3770,17 @@ private:
 
             // 1st Interval after close, price for 0th interval.
             env(ammAlice.bid({.account = bob_}));
-            env.close(seconds(kAUCTION_SLOT_INTERVAL_DURATION + 1));
+            env.close(seconds(kAuctionSlotIntervalDuration + 1));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 1, IOUAmount{1'155, -1}));
 
             // 10th Interval after close, price for 1st interval.
             env(ammAlice.bid({.account = carol_}));
-            env.close(seconds((10 * kAUCTION_SLOT_INTERVAL_DURATION) + 1));
+            env.close(seconds((10 * kAuctionSlotIntervalDuration) + 1));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 10, IOUAmount{121'275, -3}));
 
             // 20th Interval (expired) after close, price for 10th interval.
             env(ammAlice.bid({.account = bob_}));
-            env.close(
-                seconds((kAUCTION_SLOT_TIME_INTERVALS * kAUCTION_SLOT_INTERVAL_DURATION) + 1));
+            env.close(seconds((kAuctionSlotTimeIntervals * kAuctionSlotIntervalDuration) + 1));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, std::nullopt, IOUAmount{127'33875, -5}));
 
             // 0 Interval.
@@ -3884,7 +3883,7 @@ private:
                 btc(13'000'000'671), STAmount{USD, UINT64_C(13'114'03663044931), -11}, ammTokens));
 
             // Auction slot expired, no discounted fee
-            env.close(seconds(kTOTAL_TIME_SLOT_SECS + 1));
+            env.close(seconds(kTotalTimeSlotSecs + 1));
             // clock is parent's based
             env.close();
 
@@ -3917,7 +3916,7 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // Bid a tiny amount
-                auto const tiny = Number{STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET};
+                auto const tiny = Number{STAmount::kMinValue, STAmount::kMinOffset};
                 env(ammAlice.bid({.account = alice_, .bidMin = IOUAmount{tiny}}));
                 // Auction slot purchase price is equal to the tiny amount
                 // since the minSlotPrice is 0 with no trading fee.
@@ -3928,7 +3927,7 @@ private:
                 // Bid the tiny amount
                 env(ammAlice.bid({
                     .account = alice_,
-                    .bidMin = IOUAmount{STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET},
+                    .bidMin = IOUAmount{STAmount::kMinValue, STAmount::kMinOffset},
                 }));
                 // Pay slightly higher price
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{tiny * Number{105, -2}}));
@@ -3971,7 +3970,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_},
                  .pay = 2'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             fund(env, gw_, {alice_, bob_}, {USD(2'000)}, Fund::TokenOnly);
             AMM amm(env, gw_, btc(1'000'000'000), USD(1'010), false, 1'000);
             auto const lpIssue = amm.lptIssue();
@@ -4007,7 +4006,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_},
                  .pay = 2'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM amm(env, gw_, XRP(1'000), btc(1'010), false, 1'000);
             json::Value const tx = amm.bid({.account = alice_, .bidMin = 500});
 
@@ -4068,7 +4067,7 @@ private:
              .issuer = gw_,
              .holders = {alice_},
              .pay = 30'000,
-             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+             .flags = tfMPTCanLock | kMptDexFlags});
 
         // to clawback from AMM account, must use AMMClawback instead of
         // Clawback
@@ -4103,7 +4102,7 @@ private:
                      .issuer = gw_,
                      .holders = {alice_, carol_},
                      .pay = 100,
-                     .flags = kMPT_DEX_FLAGS});
+                     .flags = kMptDexFlags});
                 // XRP balance is below reserve
                 AMM const ammAlice(env, acct, XRP(10), btc(10));
                 // Pay below reserve
@@ -4122,7 +4121,7 @@ private:
                      .issuer = gw_,
                      .holders = {alice_, carol_},
                      .pay = 20'000,
-                     .flags = kMPT_DEX_FLAGS});
+                     .flags = kMptDexFlags});
                 // XRP balance is above reserve
                 AMM const ammAlice(env, acct, XRP(1'000'000), btc(10'000));
                 // Pay below reserve
@@ -4138,16 +4137,16 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 env(escrow::create(carol_, ammAlice.ammAccount(), MPT(ammAlice[1])(1)),
-                    escrow::kCONDITION(escrow::kCB1),
-                    escrow::kFINISH_TIME(env.now() + 1s),
-                    escrow::kCANCEL_TIME(env.now() + 2s),
+                    escrow::kCondition(escrow::kCb1),
+                    escrow::kFinishTime(env.now() + 1s),
+                    escrow::kCancelTime(env.now() + 2s),
                     Fee(1'500),
                     Ter(tecNO_PERMISSION));
 
                 env(escrow::create(carol_, ammAlice.ammAccount(), XRP(1)),
-                    escrow::kCONDITION(escrow::kCB1),
-                    escrow::kFINISH_TIME(env.now() + 1s),
-                    escrow::kCANCEL_TIME(env.now() + 2s),
+                    escrow::kCondition(escrow::kCb1),
+                    escrow::kFinishTime(env.now() + 1s),
+                    escrow::kCancelTime(env.now() + 2s),
                     Fee(1'500),
                     Ter(tecNO_PERMISSION));
             },
@@ -4232,7 +4231,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
             btc.set({.flags = tfMPTLock});
@@ -4258,7 +4257,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
             btc.set({.holder = carol_, .flags = tfMPTLock});
@@ -4279,7 +4278,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
             btc.set({.holder = alice_, .flags = tfMPTLock});
@@ -4300,13 +4299,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             MPTTester eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM const ammAlice(env, alice_, eth(10'000), btc(10'000));
             btc.set({.holder = carol_, .flags = tfMPTLock});
@@ -4336,7 +4335,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
             btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
@@ -4635,7 +4634,7 @@ private:
                  .holders = {alice_, carol_},
                  .transferFee = 10'000,
                  .pay = 30'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             auto ammAlice = AMM(env, alice_, XRP(10'000), btc(10'010'000'000'000'000));
             env.close();
             auto carolMPT = env.balance(carol_, MPT(btc));
@@ -4763,13 +4762,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 3'000'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 3'000'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             env.fund(XRP(1'000), bob_);
             env.close();
             auto ammEthXrp = AMM(env, alice_, XRP(10'000), eth(1'000'000'000'000'000'000));
@@ -4813,13 +4812,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 3'000'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 1'000'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             auto ammAlice = AMM(env, alice_, XRP(10'000), btc(1'000'000'000'000'000'000));
             env.fund(XRP(1'000), bob_);
             env.close();
@@ -4861,7 +4860,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 30'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM ammAlice(env, alice_, XRP(10'000), btc(10'100'000'000'000'000));
             env(offer(bob_, XRP(100), MPT(ammAlice[1])(100'000'000'000'000)), Txflags(tfPassive));
             env.close();
@@ -4896,7 +4895,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 2'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             env(offer(bob_, XRP(50), btc(150)), Txflags(tfPassive));
             env.close();
             AMM const ammAlice(env, alice_, XRP(1'000), btc(1'050));
@@ -4915,7 +4914,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 30'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM ammAlice(env, alice_, XRP(10'000), btc(10'100));
             env(offer(bob_, MPT(ammAlice[1])(100), XRP(100)));
             env.close();
@@ -4941,14 +4940,14 @@ private:
                  .holders = {alice_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammAlice(env, alice_, btc(1'000'000'000'000'000), eth(1'100'000'000'000'000));
             // This offer succeeds to cross pre- and post-amendment
             // because the strand's out amount is small enough to match
@@ -4977,7 +4976,7 @@ private:
                  .holders = {alice_, carol_},
                  .transferFee = 100,
                  .pay = 30'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const amm(env, alice_, XRP(1'000), btc(500'000'000'000'000));
             env(offer(carol_, XRP(100), btc(55'000'000'000'000)));
             env.close();
@@ -5000,7 +4999,7 @@ private:
                  .holders = {alice_, carol_},
                  .transferFee = 100,
                  .pay = 3'000'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const amm(env, alice_, XRP(1'000), btc(50'000'000'000'000'000));
             env(offer(carol_, XRP(10), btc(5'500'000'000'000'000)));
             env.close();
@@ -5020,14 +5019,14 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 20'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 20'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammAlice(
                 env, alice_, btc(10'000'000'000'000'000), eth(11'000'000'000'000'000));
 
@@ -5067,14 +5066,14 @@ private:
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammAlice(env, alice_, btc(1'000), eth(1'100));
             env(rate(gw_, 1.25));
             env.close();
@@ -5110,28 +5109,28 @@ private:
                  .holders = {alice_, bob_, carol_, dan, ed},
                  .transferFee = 25'000,
                  .pay = 30'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, dan, ed},
                  .transferFee = 25'000,
                  .pay = 30'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const can(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, dan, ed},
                  .transferFee = 25'000,
                  .pay = 2'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const gbp(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, dan, ed},
                  .transferFee = 25'000,
                  .pay = 3'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammAlice(env, alice_, gbp(1'000'000), eth(10'125));
             env(pay(gw_, bob_, can(1'953'125)));
             env.close();
@@ -5190,25 +5189,25 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 500'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 500'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const usd(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 500'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eur(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 500'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const xrpEur(env, alice_, XRP(10'100), eur(100'000'000'000'000'000));
             AMM const eurBtc(
                 env, alice_, eur(100'000'000'000'000'000), btc(102'000'000'000'000'000));
@@ -5263,25 +5262,25 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 50'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 50'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const usd(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 50'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eur(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 50'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const xrpEur(env, alice_, XRP(10'100), eur(10'000'000'000'000'000));
             AMM const eurBtc(env, alice_, eur(10'000'000'000'000'000), btc(10'200'000'000'000'000));
             AMM const btcUsd(env, alice_, btc(10'100'000'000'000'000), usd(10'000'000'000'000'000));
@@ -5316,13 +5315,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 30'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000'000'000'000'000));
 
             for (int i = 0; i < 30; ++i)
@@ -5352,13 +5351,13 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 30'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 400'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000'000'000'000'000));
 
             for (int i = 0; i < 29; ++i)
@@ -5389,7 +5388,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 30'000'000'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(bob_, XRP(100), btc(100'001'000'000'000)));
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'100'000'000'000'000));
@@ -5412,7 +5411,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
             btc.set({.holder = carol_, .flags = tfMPTLock});
@@ -5433,7 +5432,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
             btc.set({.holder = alice_, .flags = tfMPTLock});
@@ -5604,7 +5603,7 @@ private:
             env.fund(XRP(10'000), lP1);
             env.fund(XRP(10'000), lP2);
             MPTTester const tst(
-                {.env = env, .issuer = gw, .holders = {lP1, lP2}, .flags = kMPT_DEX_FLAGS});
+                {.env = env, .issuer = gw, .holders = {lP1, lP2}, .flags = kMptDexFlags});
 
             env(offer(gw, XRP(11'500'000'000), tst(1'000'000'000'000'000)));
 
@@ -5820,7 +5819,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_},
                  .pay = 30'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             auto const usd = gw_["USD"];
             env.trust(usd(30'000), alice_);
@@ -5943,7 +5942,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, ed},
                  .pay = 30'000'000000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(carol_, btc(5'000000), USD(5)));
             AMM const ammAlice(env, alice_, USD(1'005), btc(1'000'000000));
@@ -5972,7 +5971,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, ed},
                  .pay = 30'000'000000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(carol_, btc(5'000000), USD(5)));
             // Set 0.25% fee
@@ -5999,7 +5998,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, ed},
                  .pay = 30'000'000000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(carol_, btc(10'000000), USD(10)));
             // Set 1% fee
@@ -6027,7 +6026,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, bob_, carol_, ed},
                  .pay = 30'000'000000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(carol_, btc(9'000000), USD(9)));
             // Set 1% fee
@@ -6073,7 +6072,7 @@ private:
                  .issuer = gw,
                  .holders = holders,
                  .pay = 40'000'000000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             auto const usd = gw["USD"];
             for (auto const& holder : holders)
@@ -6164,7 +6163,7 @@ private:
                  .issuer = gw,
                  .holders = holders,
                  .pay = 40'000'000000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             auto const usd = gw["USD"];
             for (auto const& holder : holders)
@@ -6313,21 +6312,21 @@ private:
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = gwTransferFee,
                  .pay = 2'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester eth(
                 {.env = env,
                  .issuer = gw1,
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = gw1TransferFee,
                  .pay = 2'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             MPTTester can(
                 {.env = env,
                  .issuer = gw1,
                  .holders = {alice_, bob_, carol_, ed},
                  .transferFee = gw1TransferFee,
                  .pay = 2'000'000'000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
             env.close();
 
             return MPTList{
@@ -6337,10 +6336,10 @@ private:
             };
         };
 
-        std::uint32_t constexpr kLOW_RATE = 10'000;
-        std::uint32_t constexpr kHIGH_RATE = 50'000;
+        static constexpr std::uint32_t kLowRate = 10'000;
+        static constexpr std::uint32_t kHighRate = 50'000;
         for (auto const& rates :
-             {std::make_pair(kLOW_RATE, kHIGH_RATE), std::make_pair(kHIGH_RATE, kLOW_RATE)})
+             {std::make_pair(kLowRate, kHighRate), std::make_pair(kHighRate, kLowRate)})
         {
             // Offer Selection
 
@@ -6474,7 +6473,7 @@ private:
 
                     if (i == 2)
                     {
-                        if (rates.first == kLOW_RATE)
+                        if (rates.first == kLowRate)
                         {
                             BEAST_EXPECT(expectOffers(
                                 env,
@@ -6539,7 +6538,7 @@ private:
                 // limitQuality
                 if (i == 2)
                 {
-                    if (rates.first == kLOW_RATE)
+                    if (rates.first == kLowRate)
                     {
                         // Ed offer is partially crossed.
                         // The updated rounding makes limitQuality
@@ -6618,7 +6617,7 @@ private:
                     {
                         // NOLINTBEGIN(bugprone-unchecked-optional-access) i==2 implies amm is
                         // emplaced (i>0)
-                        if (rates.first == kLOW_RATE)
+                        if (rates.first == kLowRate)
                         {
                             // Liquidity is consumed from AMM strand only
                             BEAST_EXPECT(amm->expectBalances(
@@ -6708,7 +6707,7 @@ private:
                      .issuer = gw_,
                      .holders = {alice_, carol_},
                      .pay = 2'000,
-                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                     .flags = tfMPTCanLock | kMptDexFlags});
                 WithdrawArg const args{
                     .asset1Out = XRP(100),
                     .asset2Out = btc(100),
@@ -6731,7 +6730,7 @@ private:
                      .issuer = gw_,
                      .holders = {alice_, carol_},
                      .pay = 2'000,
-                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                     .flags = tfMPTCanLock | kMptDexFlags});
                 btc(100).value().setJson(jv[jss::EPrice]);
                 env(jv, Ter(telENV_RPC_FAILED));
             },
@@ -6756,7 +6755,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 40'000'000000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(alice_, btc(1), USD(0.01)));
             env.close();
@@ -6790,7 +6789,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_, carol_},
                  .pay = 40'000'000000,
-                 .flags = kMPT_DEX_FLAGS});
+                 .flags = kMptDexFlags});
 
             env(offer(alice_, btc(1), XRP(0.01)));
             env.close();
@@ -6840,7 +6839,7 @@ private:
              .issuer = gw,
              .holders = {alice, bob},
              .pay = 40'000'000000,
-             .flags = tfMPTCanClawback | tfMPTCanLock | kMPT_DEX_FLAGS});
+             .flags = tfMPTCanClawback | tfMPTCanLock | kMptDexFlags});
 
         AMM amm(env, alice, btc(2), usd(1));
         amm.deposit(alice, IOUAmount{1'876123487565916, -15});
@@ -6879,7 +6878,7 @@ private:
                  .issuer = gw_,
                  .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             AMM amm(env, alice_, btc(100), XRP(100));
             env.close();
@@ -6938,7 +6937,7 @@ private:
             MPTTester const usd({.env = env, .issuer = gw_, .holders = {alice_}, .pay = 20'000});
             MPTTester const btc({.env = env, .issuer = gw_, .holders = {alice_}, .pay = 20'000});
             AMM amm(env, gw_, usd(10'000), btc(10'000));
-            for (auto i = 0; i < kMAX_DELETABLE_AMM_TRUST_LINES + 10; ++i)
+            for (auto i = 0; i < kMaxDeletableAmmTrustLines + 10; ++i)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -6992,7 +6991,7 @@ private:
             MPTTester const usd({.env = env, .issuer = gw_, .holders = {alice_}, .pay = 20'000});
             MPTTester const btc({.env = env, .issuer = gw_, .holders = {alice_}, .pay = 20'000});
             AMM amm(env, gw_, usd(10'000), btc(10'000));
-            for (auto i = 0; i < (kMAX_DELETABLE_AMM_TRUST_LINES * 2) + 10; ++i)
+            for (auto i = 0; i < (kMaxDeletableAmmTrustLines * 2) + 10; ++i)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -7056,7 +7055,7 @@ private:
 
             // MPT/MPT pool with MANY trustlines
             AMM amm(env, gw_, usd(10'000), btc(10'000));
-            for (auto i = 0; i < (kMAX_DELETABLE_AMM_TRUST_LINES * 2) + 10; ++i)
+            for (auto i = 0; i < (kMaxDeletableAmmTrustLines * 2) + 10; ++i)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
index fc8b42f27f..68ebdbcf60 100644
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -2731,18 +2731,17 @@ private:
 
                 // 1st Interval after close, price for 0th interval.
                 env(ammAlice.bid({.account = bob_}));
-                env.close(seconds(kAUCTION_SLOT_INTERVAL_DURATION + 1));
+                env.close(seconds(kAuctionSlotIntervalDuration + 1));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 1, IOUAmount{1'155, -1}));
 
                 // 10th Interval after close, price for 1st interval.
                 env(ammAlice.bid({.account = carol_}));
-                env.close(seconds((10 * kAUCTION_SLOT_INTERVAL_DURATION) + 1));
+                env.close(seconds((10 * kAuctionSlotIntervalDuration) + 1));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 10, IOUAmount{121'275, -3}));
 
                 // 20th Interval (expired) after close, price for 10th interval.
                 env(ammAlice.bid({.account = bob_}));
-                env.close(
-                    seconds((kAUCTION_SLOT_TIME_INTERVALS * kAUCTION_SLOT_INTERVAL_DURATION) + 1));
+                env.close(seconds((kAuctionSlotTimeIntervals * kAuctionSlotIntervalDuration) + 1));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, std::nullopt, IOUAmount{127'33875, -5}));
 
                 // 0 Interval.
@@ -2969,7 +2968,7 @@ private:
                         ammTokens));
                 }
                 // Auction slot expired, no discounted fee
-                env.close(seconds(kTOTAL_TIME_SLOT_SECS + 1));
+                env.close(seconds(kTotalTimeSlotSecs + 1));
                 // clock is parent's based
                 env.close();
                 if (!features[fixAMMv1_1])
@@ -3058,7 +3057,7 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // Bid a tiny amount
-                auto const tiny = Number{STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET};
+                auto const tiny = Number{STAmount::kMinValue, STAmount::kMinOffset};
                 env(ammAlice.bid({.account = alice_, .bidMin = IOUAmount{tiny}}));
                 // Auction slot purchase price is equal to the tiny amount
                 // since the minSlotPrice is 0 with no trading fee.
@@ -3068,7 +3067,7 @@ private:
                 // Bid the tiny amount
                 env(ammAlice.bid({
                     .account = alice_,
-                    .bidMin = IOUAmount{STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET},
+                    .bidMin = IOUAmount{STAmount::kMinValue, STAmount::kMinOffset},
                 }));
                 // Pay slightly higher price
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{tiny * Number{105, -2}}));
@@ -3226,9 +3225,9 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             auto const baseFee = env.current()->fees().base;
             env(escrow::create(carol_, ammAlice.ammAccount(), XRP(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
         });
@@ -5100,7 +5099,7 @@ private:
                 all);
             fund(env, gw_, {alice_}, XRP(20'000), {USD(10'000)});
             AMM amm(env, gw_, XRP(10'000), USD(10'000));
-            for (auto i = 0; i < kMAX_DELETABLE_AMM_TRUST_LINES + 10; ++i)
+            for (auto i = 0; i < kMaxDeletableAmmTrustLines + 10; ++i)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -5158,7 +5157,7 @@ private:
                 all);
             fund(env, gw_, {alice_}, XRP(20'000), {USD(10'000)});
             AMM amm(env, gw_, XRP(10'000), USD(10'000));
-            for (auto i = 0; i < (kMAX_DELETABLE_AMM_TRUST_LINES * 2) + 10; ++i)
+            for (auto i = 0; i < (kMaxDeletableAmmTrustLines * 2) + 10; ++i)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -6728,9 +6727,9 @@ private:
                 AccountID const accountId = xrpl::pseudoAccountAddress(*env.current(), keylet.key);
 
                 env(pay(env.master.id(), accountId, XRP(1000)),
-                    Seq(kAUTOFILL),
-                    Fee(kAUTOFILL),
-                    Sig(kAUTOFILL));
+                    Seq(kAutofill),
+                    Fee(kAutofill),
+                    Sig(kAutofill));
             }
 
             AMM const ammAlice(
@@ -7100,7 +7099,7 @@ private:
         fund(env, gw_, {alice_, carol_, bob_, dan, ed}, XRP(50'000), {USD(50'000)});
         AMM amm(env, alice_, XRP(10'000), USD(10'000));
         // Create excess trustlines to prevent AMM auto-deletion on withdrawal.
-        for (auto i = 0; i < kMAX_DELETABLE_AMM_TRUST_LINES + 10; ++i)
+        for (auto i = 0; i < kMaxDeletableAmmTrustLines + 10; ++i)
         {
             Account const a{std::to_string(i)};
             env.fund(XRP(1'000), a);
@@ -7157,7 +7156,7 @@ private:
         {
             BEAST_EXPECT(votes[0].getAccountID(sfAccount) == ed.id());
             BEAST_EXPECT(votes[0].getFieldU16(sfTradingFee) == 500);
-            BEAST_EXPECT(votes[0].getFieldU32(sfVoteWeight) == kVOTE_WEIGHT_SCALE_FACTOR);
+            BEAST_EXPECT(votes[0].getFieldU32(sfVoteWeight) == kVoteWeightScaleFactor);
         }
         // sfAuthAccounts behaviour depends on the fix.
         if (features[fixCleanup3_2_0])
diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp
index 3ad931cfa6..951f99919b 100644
--- a/src/test/app/AccountDelete_test.cpp
+++ b/src/test/app/AccountDelete_test.cpp
@@ -215,7 +215,7 @@ public:
             BEAST_EXPECT(env.closed()->exists(keylet::ownerDir(carol.id())));
             BEAST_EXPECT(env.closed()->exists(keylet::depositPreauth(carol.id(), becky.id())));
             BEAST_EXPECT(env.closed()->exists(keylet::offer(carol.id(), carolOfferSeq)));
-            BEAST_EXPECT(env.closed()->exists(keylet::kTICKET(carol.id(), carolTicketSeq)));
+            BEAST_EXPECT(env.closed()->exists(keylet::kTicket(carol.id(), carolTicketSeq)));
             BEAST_EXPECT(env.closed()->exists(keylet::signers(carol.id())));
 
             // Delete carol's account even with stuff in her directory.  Show
@@ -229,7 +229,7 @@ public:
             BEAST_EXPECT(!env.closed()->exists(keylet::ownerDir(carol.id())));
             BEAST_EXPECT(!env.closed()->exists(keylet::depositPreauth(carol.id(), becky.id())));
             BEAST_EXPECT(!env.closed()->exists(keylet::offer(carol.id(), carolOfferSeq)));
-            BEAST_EXPECT(!env.closed()->exists(keylet::kTICKET(carol.id(), carolTicketSeq)));
+            BEAST_EXPECT(!env.closed()->exists(keylet::kTicket(carol.id(), carolTicketSeq)));
             BEAST_EXPECT(!env.closed()->exists(keylet::signers(carol.id())));
 
             // Verify that Carol's XRP, minus the fee, was transferred to becky.
@@ -341,8 +341,8 @@ public:
         using namespace std::chrono_literals;
         std::uint32_t const escrowSeq{env.seq(alice)};
         env(escrow::create(alice, becky, XRP(333)),
-            escrow::kFINISH_TIME(env.now() + 3s),
-            escrow::kCANCEL_TIME(env.now() + 4s));
+            escrow::kFinishTime(env.now() + 3s),
+            escrow::kCancelTime(env.now() + 4s));
         env.close();
 
         // alice and becky should be unable to delete their accounts because
@@ -370,8 +370,8 @@ public:
 
             std::uint32_t const escrowSeq{env.seq(carol)};
             env(escrow::create(carol, becky, usd(1)),
-                escrow::kFINISH_TIME(env.now() + 3s),
-                escrow::kCANCEL_TIME(env.now() + 4s));
+                escrow::kFinishTime(env.now() + 3s),
+                escrow::kCancelTime(env.now() + 4s));
             env.close();
 
             incLgrSeqForAccDel(env, gw1);
@@ -461,8 +461,8 @@ public:
         // Alice creates 1001 offers.  This is one greater than the number of
         // directory entries an AccountDelete will remove.
         std::uint32_t const offerSeq0{env.seq(alice)};
-        constexpr int kOFFER_COUNT{1001};
-        for (int i{0}; i < kOFFER_COUNT; ++i)
+        static constexpr int kOfferCount{1001};
+        for (int i{0}; i < kOfferCount; ++i)
         {
             env(offer(alice, gw[currency](1), XRP(1)));
             env.close();
@@ -498,11 +498,11 @@ public:
             BEAST_EXPECT(closed->exists(aliceOwnerDirKey));
 
             // alice's directory nodes.
-            for (std::uint32_t i{0}; i < ((kOFFER_COUNT / 32) + 1); ++i)
+            for (std::uint32_t i{0}; i < ((kOfferCount / 32) + 1); ++i)
                 BEAST_EXPECT(closed->exists(keylet::page(aliceOwnerDirKey, i)));
 
             // alice's offers.
-            for (std::uint32_t i{0}; i < kOFFER_COUNT; ++i)
+            for (std::uint32_t i{0}; i < kOfferCount; ++i)
                 BEAST_EXPECT(closed->exists(keylet::offer(alice.id(), offerSeq0 + i)));
         }
 
@@ -513,10 +513,10 @@ public:
         env(acctdelete(alice, gw), Fee(acctDelFee), Ter(tefTOO_BIG));
 
         // Cancel one of alice's offers.  Then the account delete can succeed.
-        env.require(offers(alice, kOFFER_COUNT));
+        env.require(offers(alice, kOfferCount));
         env(offerCancel(alice, offerSeq0));
         env.close();
-        env.require(offers(alice, kOFFER_COUNT - 1));
+        env.require(offers(alice, kOfferCount - 1));
 
         // alice successfully deletes her account.
         auto const alicePreDelBal{env.balance(alice)};
@@ -532,11 +532,11 @@ public:
             BEAST_EXPECT(!closed->exists(aliceOwnerDirKey));
 
             // alice's former directory nodes.
-            for (std::uint32_t i{0}; i < ((kOFFER_COUNT / 32) + 1); ++i)
+            for (std::uint32_t i{0}; i < ((kOfferCount / 32) + 1); ++i)
                 BEAST_EXPECT(!closed->exists(keylet::page(aliceOwnerDirKey, i)));
 
             // alice's former offers.
-            for (std::uint32_t i{0}; i < kOFFER_COUNT; ++i)
+            for (std::uint32_t i{0}; i < kOfferCount; ++i)
                 BEAST_EXPECT(!closed->exists(keylet::offer(alice.id(), offerSeq0 + i)));
         }
     }
@@ -662,7 +662,7 @@ public:
             BEAST_EXPECT(closed->exists(keylet::account(bob.id())));
             for (std::uint32_t i = 0; i < 250; ++i)
             {
-                BEAST_EXPECT(closed->exists(keylet::kTICKET(bob.id(), ticketSeq + i)));
+                BEAST_EXPECT(closed->exists(keylet::kTicket(bob.id(), ticketSeq + i)));
             }
         }
 
@@ -681,7 +681,7 @@ public:
             BEAST_EXPECT(!closed->exists(keylet::account(bob.id())));
             for (std::uint32_t i = 0; i < 250; ++i)
             {
-                BEAST_EXPECT(!closed->exists(keylet::kTICKET(bob.id(), ticketSeq + i)));
+                BEAST_EXPECT(!closed->exists(keylet::kTicket(bob.id(), ticketSeq + i)));
             }
         }
     }
diff --git a/src/test/app/AccountSet_test.cpp b/src/test/app/AccountSet_test.cpp
index c30553dad9..6688e3693f 100644
--- a/src/test/app/AccountSet_test.cpp
+++ b/src/test/app/AccountSet_test.cpp
@@ -536,7 +536,7 @@ public:
         env(fset(alice, asfRequireAuth), Ter(tecOWNERS));
 
         // Remove the signer list.  After that asfRequireAuth should succeed.
-        env(signers(alice, test::jtx::kNONE));
+        env(signers(alice, test::jtx::kNone));
         env.close();
         BEAST_EXPECT(dirIsEmpty(*env.closed(), keylet::ownerDir(alice)));
 
diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp
index 5d4ca6f745..219aaabdda 100644
--- a/src/test/app/AmendmentTable_test.cpp
+++ b/src/test/app/AmendmentTable_test.cpp
@@ -208,7 +208,7 @@ public:
     std::unique_ptr<AmendmentTable>
     makeTable(test::jtx::Env& env, std::chrono::seconds majorityTime)
     {
-        static std::vector<AmendmentTable::FeatureInfo> const kSUPPORTED = combine(
+        static std::vector<AmendmentTable::FeatureInfo> const kSupported = combine(
             makeDefaultYes(yes_),
             // Use non-intuitive default votes for "enabled_" and "vetoed_"
             // so that when the tests later explicitly enable or veto them,
@@ -218,7 +218,7 @@ public:
             makeDefaultYes(vetoed_),
             makeObsolete(obsolete_));
         return makeTable(
-            env.app(), majorityTime, kSUPPORTED, makeSection(enabled_), makeSection(vetoed_));
+            env.app(), majorityTime, kSupported, makeSection(enabled_), makeSection(vetoed_));
     }
 
     void
@@ -1165,7 +1165,7 @@ public:
         testcase("hasUnsupportedEnabled");
 
         using namespace std::chrono_literals;
-        weeks constexpr kW(1);
+        constexpr weeks kW(1);
         test::jtx::Env env{*this, makeConfig()};
         auto table = makeTable(env, kW);
         BEAST_EXPECT(!table->hasUnsupportedEnabled());
diff --git a/src/test/app/Batch_test.cpp b/src/test/app/Batch_test.cpp
index bff8d76cb1..8755fe9f9c 100644
--- a/src/test/app/Batch_test.cpp
+++ b/src/test/app/Batch_test.cpp
@@ -2658,7 +2658,7 @@ class Batch_test : public beast::unit_test::Suite
         testcase("loan");
 
         bool const lendingBatchEnabled = !std::ranges::any_of(
-            Batch::kDISABLED_TX_TYPES,
+            Batch::kDisabledTxTypes,
             [](auto const& disabled) { return disabled == ttLOAN_BROKER_SET; });
 
         using namespace test::jtx;
@@ -2699,10 +2699,10 @@ class Batch_test : public beast::unit_test::Suite
         {
             using namespace loanBroker;
             env(set(lender, vaultKeylet.key),
-                kMANAGEMENT_FEE_RATE(TenthBips16(100)),
-                kDEBT_MAXIMUM(debtMaximumValue),
-                kCOVER_RATE_MINIMUM(TenthBips32(percentageToTenthBips(10))),
-                kCOVER_RATE_LIQUIDATION(TenthBips32(percentageToTenthBips(25))));
+                kManagementFeeRate(TenthBips16(100)),
+                kDebtMaximum(debtMaximumValue),
+                kCoverRateMinimum(TenthBips32(percentageToTenthBips(10))),
+                kCoverRateLiquidation(TenthBips32(percentageToTenthBips(25))));
 
             env(coverDeposit(lender, brokerKeylet.key, coverDepositValue));
 
@@ -2727,9 +2727,9 @@ class Batch_test : public beast::unit_test::Suite
                             set(lender, brokerKeylet.key, asset(1000).value()),
                             // Not allowed to include the counterparty signature
                             Sig(sfCounterpartySignature, borrower),
-                            Sig(kNONE),
-                            Fee(kNONE),
-                            Seq(kNONE)),
+                            Sig(kNone),
+                            Fee(kNone),
+                            Seq(kNone)),
                         lenderSeq + 1),
                     batch::Inner(
                         pay(lender, loanKeylet.key, STAmount{asset, asset(500).value()}),
@@ -2744,9 +2744,9 @@ class Batch_test : public beast::unit_test::Suite
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
                             // Counterparty must be set
-                            Sig(kNONE),
-                            Fee(kNONE),
-                            Seq(kNONE)),
+                            Sig(kNone),
+                            Fee(kNone),
+                            Seq(kNone)),
                         lenderSeq + 1),
                     batch::Inner(
                         pay(lender, loanKeylet.key, STAmount{asset, asset(500).value()}),
@@ -2761,10 +2761,10 @@ class Batch_test : public beast::unit_test::Suite
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
                             // Counterparty must sign the outer transaction
-                            kCOUNTERPARTY(borrower.id()),
-                            Sig(kNONE),
-                            Fee(kNONE),
-                            Seq(kNONE)),
+                            kCounterparty(borrower.id()),
+                            Sig(kNone),
+                            Fee(kNone),
+                            Seq(kNone)),
                         lenderSeq + 1),
                     batch::Inner(
                         pay(lender, loanKeylet.key, STAmount{asset, asset(500).value()}),
@@ -2782,10 +2782,10 @@ class Batch_test : public beast::unit_test::Suite
                     batch::Inner(
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
-                            kCOUNTERPARTY(borrower.id()),
-                            Sig(kNONE),
-                            Fee(kNONE),
-                            Seq(kNONE)),
+                            kCounterparty(borrower.id()),
+                            Sig(kNone),
+                            Fee(kNone),
+                            Seq(kNone)),
                         lenderSeq + 1),
                     batch::Inner(
                         pay(
@@ -2814,10 +2814,10 @@ class Batch_test : public beast::unit_test::Suite
                     batch::Inner(
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
-                            kCOUNTERPARTY(borrower.id()),
-                            Sig(kNONE),
-                            Fee(kNONE),
-                            Seq(kNONE)),
+                            kCounterparty(borrower.id()),
+                            Sig(kNone),
+                            Fee(kNone),
+                            Seq(kNone)),
                         lenderSeq + 1),
                     batch::Inner(manage(lender, loanKeylet.key, tfLoanImpair), lenderSeq + 2),
                     batch::Sig(borrower));
@@ -4321,7 +4321,7 @@ class Batch_test : public beast::unit_test::Suite
                 batch::Inner(batch::outer(alice, seq, batchFee, tfAllOrNothing), seq),
                 batch::Inner(pay(alice, bob, XRP(1)), seq + 2));
             XRPAmount const txBaseFee = getBaseFee(jtx);
-            BEAST_EXPECT(txBaseFee == XRPAmount(kINITIAL_XRP));
+            BEAST_EXPECT(txBaseFee == XRPAmount(kInitialXrp));
         }
 
         // bad: Raw Transactions array exceeds max entries.
@@ -4342,7 +4342,7 @@ class Batch_test : public beast::unit_test::Suite
                 batch::Inner(pay(alice, bob, XRP(1)), seq + 9));
 
             XRPAmount const txBaseFee = getBaseFee(jtx);
-            BEAST_EXPECT(txBaseFee == XRPAmount(kINITIAL_XRP));
+            BEAST_EXPECT(txBaseFee == XRPAmount(kInitialXrp));
         }
 
         // bad: Signers array exceeds max entries.
@@ -4356,7 +4356,7 @@ class Batch_test : public beast::unit_test::Suite
                 batch::Inner(pay(alice, bob, XRP(5)), seq + 2),
                 batch::Sig(bob, carol, alice, bob, carol, alice, bob, carol, alice, alice));
             XRPAmount const txBaseFee = getBaseFee(jtx);
-            BEAST_EXPECT(txBaseFee == XRPAmount(kINITIAL_XRP));
+            BEAST_EXPECT(txBaseFee == XRPAmount(kInitialXrp));
         }
 
         // good:
diff --git a/src/test/app/CheckMPT_test.cpp b/src/test/app/CheckMPT_test.cpp
index 1cbfb5469b..a7fef5043c 100644
--- a/src/test/app/CheckMPT_test.cpp
+++ b/src/test/app/CheckMPT_test.cpp
@@ -283,7 +283,7 @@ class CheckMPT_test : public beast::unit_test::Suite
         STAmount const startBalance{XRP(1'000).value()};
         env.fund(startBalance, gw1, gwF, alice, bob);
 
-        auto usdm = MPTTester({.env = env, .issuer = gw1, .flags = kMPT_DEX_FLAGS | tfMPTCanLock});
+        auto usdm = MPTTester({.env = env, .issuer = gw1, .flags = kMptDexFlags | tfMPTCanLock});
         MPT const usd = usdm;
 
         // Bad fee.
@@ -349,7 +349,7 @@ class CheckMPT_test : public beast::unit_test::Suite
             // Globally frozen asset.
             env.close();
             auto usfm =
-                MPTTester({.env = env, .issuer = gwF, .flags = kMPT_DEX_FLAGS | tfMPTCanLock});
+                MPTTester({.env = env, .issuer = gwF, .flags = kMptDexFlags | tfMPTCanLock});
             MPT const usf = usfm;
             usfm.set({.flags = tfMPTLock});
 
@@ -663,7 +663,7 @@ class CheckMPT_test : public beast::unit_test::Suite
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
-                 .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth,
+                 .flags = kMptDexFlags | tfMPTRequireAuth,
                  .maxAmt = 20});
             MPT const usd = usdm;
             usdm.authorize({.holder = alice});
@@ -856,7 +856,7 @@ class CheckMPT_test : public beast::unit_test::Suite
             {.env = env,
              .issuer = gw,
              .holders = {alice},
-             .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
+             .flags = kMptDexFlags | tfMPTCanLock,
              .maxAmt = maxAmt});
         MPT const usd = usdm;
 
@@ -1422,7 +1422,7 @@ class CheckMPT_test : public beast::unit_test::Suite
                     Throw<std::runtime_error>("AccountOwns: must be issuer");
                 if (auto const& it = mpts.find(s); it != mpts.end())
                     return it->second[s];
-                auto flags = kMPT_DEX_FLAGS | tfMPTCanLock;
+                auto flags = kMptDexFlags | tfMPTCanLock;
                 if (requireAuth)
                     flags |= tfMPTRequireAuth;
                 auto [it, _] =
diff --git a/src/test/app/Credentials_test.cpp b/src/test/app/Credentials_test.cpp
index ec0ea0beae..9416ca222f 100644
--- a/src/test/app/Credentials_test.cpp
+++ b/src/test/app/Credentials_test.cpp
@@ -461,17 +461,17 @@ struct Credentials_test : public beast::unit_test::Suite
                 testcase(
                     "Credentials fail, credentialType length > "
                     "maxCredentialTypeLength.");
-                constexpr std::string_view kLONG_CRED_TYPE =
+                static constexpr std::string_view kLongCredType =
                     "abcdefghijklmnopqrstuvwxyz01234567890qwertyuiop[]"
                     "asdfghjkl;'zxcvbnm8237tr28weufwldebvfv8734t07p";
-                static_assert(kLONG_CRED_TYPE.size() > kMAX_CREDENTIAL_TYPE_LENGTH);
-                auto jv = credentials::create(subject, issuer, kLONG_CRED_TYPE);
+                static_assert(kLongCredType.size() > kMaxCredentialTypeLength);
+                auto jv = credentials::create(subject, issuer, kLongCredType);
                 env(jv, Ter(temMALFORMED));
             }
 
             {
                 testcase("Credentials fail, URI length > 256.");
-                constexpr std::string_view kLONG_URI =
+                static constexpr std::string_view kLongUri =
                     "abcdefghijklmnopqrstuvwxyz01234567890qwertyuiop[]"
                     "asdfghjkl;'zxcvbnm8237tr28weufwldebvfv8734t07p   "
                     "9hfup;wDJFBVSD8f72  "
@@ -480,9 +480,9 @@ struct Credentials_test : public beast::unit_test::Suite
                     "vujhgWQIE7F6WEUYFGWUKEYFVQW87FGWOEFWEFUYWVEF8723GFWEFB"
                     "WULE"
                     "fv28o37gfwEFB3872TFO8GSDSDVD";
-                static_assert(kLONG_URI.size() > kMAX_CREDENTIAL_URI_LENGTH);
+                static_assert(kLongUri.size() > kMaxCredentialUriLength);
                 env(credentials::create(subject, issuer, credType),
-                    credentials::Uri(kLONG_URI),
+                    credentials::Uri(kLongUri),
                     Ter(temMALFORMED));
             }
 
diff --git a/src/test/app/CrossingLimitsMPT_test.cpp b/src/test/app/CrossingLimitsMPT_test.cpp
index e9a9861a3a..4a016f31dc 100644
--- a/src/test/app/CrossingLimitsMPT_test.cpp
+++ b/src/test/app/CrossingLimitsMPT_test.cpp
@@ -52,7 +52,7 @@ public:
         // Carol offers to buy 1000 XRP for 1000 USD. She removes Bob's next
         // 1000 offers as unfunded and hits the step limit.
         env(offer("carol", usd(1'000), XRP(1'000)));
-        env.require(Balance("carol", usd(kNONE)));
+        env.require(Balance("carol", usd(kNone)));
         env.require(Owners("carol", 1));
         env.require(Balance("bob", usd(0)));
         env.require(Owners("bob", 1));
@@ -198,13 +198,13 @@ public:
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, carol},
-                     .limit = kMAX_MP_TOKEN_AMOUNT});
+                     .limit = kMaxMpTokenAmount});
                 auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {bob},
-                     .limit = kMAX_MP_TOKEN_AMOUNT});
+                     .limit = kMaxMpTokenAmount});
 
                 env(pay(gw, alice, usd(4'000)));
                 env(pay(gw, carol, usd(3)));
@@ -289,13 +289,13 @@ public:
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, carol},
-                     .limit = kMAX_MP_TOKEN_AMOUNT});
+                     .limit = kMaxMpTokenAmount});
                 auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {bob},
-                     .limit = kMAX_MP_TOKEN_AMOUNT});
+                     .limit = kMaxMpTokenAmount});
 
                 env(pay(gw, alice, usd(4'000)));
                 env(pay(gw, carol, usd(3)));
diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp
index 331afddad1..3cf8f50990 100644
--- a/src/test/app/CrossingLimits_test.cpp
+++ b/src/test/app/CrossingLimits_test.cpp
@@ -51,7 +51,7 @@ public:
         // Carol offers to buy 1000 XRP for 1000 USD. She removes Bob's next
         // 1000 offers as unfunded and hits the step limit.
         env(offer("carol", usd(1000), XRP(1000)));
-        env.require(Balance("carol", usd(kNONE)));
+        env.require(Balance("carol", usd(kNone)));
         env.require(Owners("carol", 1));
         env.require(Balance("bob", usd(0)));
         env.require(Owners("bob", 1));
diff --git a/src/test/app/Delegate_test.cpp b/src/test/app/Delegate_test.cpp
index b31a296bc9..06884e9931 100644
--- a/src/test/app/Delegate_test.cpp
+++ b/src/test/app/Delegate_test.cpp
@@ -552,27 +552,27 @@ class Delegate_test : public beast::unit_test::Suite
 
         for (auto i = 0; i < 20; ++i)
         {
-            // bob is the delegated account, his sequence won't kINCREMENT
+            // bob is the delegated account, his sequence won't kIncrement
             env(pay(alice, carol, XRP(10)), Fee(XRP(10)), delegate::As(bob));
             env.close();
             BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
             BEAST_EXPECT(env.seq(bob) == bobSeq);
             aliceSeq = env.seq(alice);
 
-            // bob sends payment for himself, his sequence will kINCREMENT
+            // bob sends payment for himself, his sequence will kIncrement
             env(pay(bob, carol, XRP(10)), Fee(XRP(10)));
             BEAST_EXPECT(env.seq(alice) == aliceSeq);
             BEAST_EXPECT(env.seq(bob) == bobSeq + 1);
             bobSeq = env.seq(bob);
 
-            // alice is the delegated account, her sequence won't kINCREMENT
+            // alice is the delegated account, her sequence won't kIncrement
             env(pay(bob, carol, XRP(10)), Fee(XRP(10)), delegate::As(alice));
             env.close();
             BEAST_EXPECT(env.seq(alice) == aliceSeq);
             BEAST_EXPECT(env.seq(bob) == bobSeq + 1);
             bobSeq = env.seq(bob);
 
-            // alice sends payment for herself, her sequence will kINCREMENT
+            // alice sends payment for herself, her sequence will kIncrement
             env(pay(alice, carol, XRP(10)), Fee(XRP(10)));
             BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
             BEAST_EXPECT(env.seq(bob) == bobSeq);
diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp
index 7b371b3c06..98597a175f 100644
--- a/src/test/app/DepositAuth_test.cpp
+++ b/src/test/app/DepositAuth_test.cpp
@@ -1232,7 +1232,7 @@ struct DepositPreauth_test : public beast::unit_test::Suite
             env.close();
 
             auto const seq = env.seq(alice);
-            env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
+            env(escrow::create(alice, bob, XRP(1000)), escrow::kFinishTime(env.now() + 1s));
             env.close();
 
             // zelda can't finish escrow with invalid credentials
diff --git a/src/test/app/EscrowToken_test.cpp b/src/test/app/EscrowToken_test.cpp
index bf7cf90bf2..82dd067bdc 100644
--- a/src/test/app/EscrowToken_test.cpp
+++ b/src/test/app/EscrowToken_test.cpp
@@ -122,23 +122,23 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, usd(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 createResult);
             env.close();
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 finishResult);
             env.close();
 
             auto const seq2 = env.seq(alice);
             env(escrow::create(alice, bob, usd(1'000)),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Fee(baseFee * 150),
                 createResult);
             env.close();
@@ -166,8 +166,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecNO_TARGET));
             env.close();
@@ -203,16 +203,16 @@ struct EscrowToken_test : public beast::unit_test::Suite
         // Create Escrow #1 & #2
         auto const seq1 = env.seq(alice);
         env(escrow::create(alice, bob, usd(1'000)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150),
             Ter(tesSUCCESS));
         env.close();
 
         auto const seq2 = env.seq(alice);
         env(escrow::create(alice, bob, usd(1'000)),
-            escrow::kFINISH_TIME(env.now() + 1s),
-            escrow::kCANCEL_TIME(env.now() + 3s),
+            escrow::kFinishTime(env.now() + 1s),
+            escrow::kCancelTime(env.now() + 3s),
             Fee(baseFee),
             Ter(tesSUCCESS));
         env.close();
@@ -224,16 +224,16 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
         // Cannot Create Escrow without asfAllowTrustLineLocking
         env(escrow::create(alice, bob, usd(1'000)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150),
             Ter(tecNO_PERMISSION));
         env.close();
 
         // Can finish the escrow created before the flag was cleared
         env(escrow::finish(bob, alice, seq1),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFULFILLMENT(escrow::kFB1),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFulfillment(escrow::kFb1),
             Fee(baseFee * 150),
             Ter(tesSUCCESS));
         env.close();
@@ -260,7 +260,7 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.fund(XRP(5000), alice, bob, gw);
 
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(XRP(-1)),
                 Ter(temBAD_FEE));
             env.close();
@@ -277,8 +277,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.fund(XRP(5000), alice, bob, gw);
 
             env(escrow::create(alice, bob, usd(-1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(temBAD_AMOUNT));
             env.close();
@@ -295,8 +295,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.fund(XRP(5000), alice, bob, gw);
 
             env(escrow::create(alice, bob, bad(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(temBAD_CURRENCY));
             env.close();
@@ -321,8 +321,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.fund(XRP(5000), alice, bob, gw);
 
             env(escrow::create(gw, alice, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
             env.close();
@@ -341,8 +341,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.memoize(gw);
 
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_ISSUER));
             env.close();
@@ -365,8 +365,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(gw, alice, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
             env.close();
@@ -384,8 +384,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_LINE));
             env.close();
@@ -409,8 +409,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_AUTH));
             env.close();
@@ -434,8 +434,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_AUTH));
             env.close();
@@ -465,8 +465,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecFROZEN));
             env.close();
@@ -496,8 +496,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecFROZEN));
             env.close();
@@ -520,8 +520,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecINSUFFICIENT_FUNDS));
             env.close();
@@ -547,8 +547,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, usd(10'001)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecINSUFFICIENT_FUNDS));
             env.close();
@@ -577,8 +577,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // alice cannot create escrow for 1/10 iou - precision loss
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(largeMantissa ? (TER)tesSUCCESS : (TER)tecPRECISION_LOSS));
             env.close();
@@ -616,8 +616,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -632,8 +632,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob cannot finish because he is not authorized
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecNO_AUTH));
             env.close();
@@ -658,8 +658,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -669,8 +669,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob cannot finish because of deep freeze
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecFROZEN));
             env.close();
@@ -706,16 +706,16 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
 
             // bob cannot finish because insufficient reserve to create line
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecNO_LINE_INSUF_RESERVE));
             env.close();
@@ -740,16 +740,16 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
 
             // alice cannot finish because bob does not have a trustline
             env(escrow::finish(alice, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecNO_LINE));
             env.close();
@@ -774,8 +774,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, usd(5)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -785,8 +785,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // alice cannot finish because bob's limit is too low
             env(escrow::finish(alice, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecLIMIT_EXCEEDED));
             env.close();
@@ -811,8 +811,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, usd(5)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -824,8 +824,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const bobPreLimit = env.limit(bob, usd);
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -866,8 +866,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Fee(baseFee),
                 Ter(tesSUCCESS));
             env.close();
@@ -917,8 +917,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const preAliceUSD = env.balance(alice, usd);
             auto const preBobUSD = env.balance(bob, usd);
             env(escrow::create(alice, bob, usd(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -932,8 +932,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const preAliceUSD = env.balance(alice, usd);
             auto const preBobUSD = env.balance(bob, usd);
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -950,9 +950,9 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const preAliceUSD = env.balance(alice, usd);
             auto const preBobUSD = env.balance(bob, usd);
             env(escrow::create(alice, bob, usd(1'000)),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -1003,8 +1003,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const bseq = env.seq(bob);
 
             env(escrow::create(alice, alice, usd(1'000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 500s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 500s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1027,8 +1027,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             }
 
             env(escrow::create(bob, bob, usd(1'000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1113,13 +1113,13 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const aseq = env.seq(alice);
             auto const bseq = env.seq(bob);
 
-            env(escrow::create(alice, bob, usd(1'000)), escrow::kFINISH_TIME(env.now() + 1s));
+            env(escrow::create(alice, bob, usd(1'000)), escrow::kFinishTime(env.now() + 1s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
             env(escrow::create(bob, carol, usd(1'000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1245,14 +1245,14 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
             auto const aseq = env.seq(alice);
 
-            env(escrow::create(alice, gw, usd(1'000)), escrow::kFINISH_TIME(env.now() + 1s));
+            env(escrow::create(alice, gw, usd(1'000)), escrow::kFinishTime(env.now() + 1s));
 
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
             env(escrow::create(gw, carol, usd(1'000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Ter(tecNO_PERMISSION));
             env.close(5s);
 
@@ -1394,8 +1394,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(t.src);
             auto const delta = usd(1'000);
             env(escrow::create(t.src, t.dst, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1404,8 +1404,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const preDst = env.balance(t.dst, usd);
 
             env(escrow::finish(t.dst, t.src, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1446,8 +1446,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // issuer cannot create escrow
             env(escrow::create(gw, alice, usd(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
             env.close();
@@ -1484,15 +1484,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(t.src);
             auto const preSrc = env.balance(t.src, usd);
             env(escrow::create(t.src, t.dst, usd(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
             // issuer can finish escrow, no dest trustline
             env(escrow::finish(t.dst, t.src, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
             auto const preAmount = 10'000;
@@ -1514,8 +1514,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // issuer cannot receive escrow
             env(escrow::create(gw, gw, usd(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
             env.close();
@@ -1555,8 +1555,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(alice);
             auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
             auto const transferRate = escrow::rate(env, alice, seq1);
@@ -1564,8 +1564,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob can finish escrow
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1592,8 +1592,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(alice);
             auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
             auto transferRate = escrow::rate(env, alice, seq1);
@@ -1605,8 +1605,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob can finish escrow - rate unchanged
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1634,8 +1634,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(alice);
             auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
             auto transferRate = escrow::rate(env, alice, seq1);
@@ -1647,8 +1647,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob can finish escrow - rate changed
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1676,8 +1676,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(alice);
             auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 3s),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 3s),
                 Fee(baseFee));
             env.close();
             auto transferRate = escrow::rate(env, alice, seq1);
@@ -1725,16 +1725,16 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto seq1 = env.seq(alice);
             auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
             // bob can finish
             auto const preBobLimit = env.limit(bob, usd);
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
             auto const postBobLimit = env.limit(bob, usd);
@@ -1776,8 +1776,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
         auto seq1 = env.seq(alice);
         auto const delta = usd(125);
         env(escrow::create(alice, bob, delta),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150),
             Ter(tecNO_AUTH));
         env.close();
@@ -1792,15 +1792,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
         // alice can create escrow - bob has auth
         seq1 = env.seq(alice);
         env(escrow::create(alice, bob, delta),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150));
         env.close();
 
         // bob can finish
         env(escrow::finish(bob, alice, seq1),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFULFILLMENT(escrow::kFB1),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFulfillment(escrow::kFb1),
             Fee(baseFee * 150));
         env.close();
     }
@@ -1840,8 +1840,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // create escrow fails - frozen trustline
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecFROZEN));
             env.close();
@@ -1853,8 +1853,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1864,8 +1864,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob finish escrow success regardless of frozen assets
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1876,8 +1876,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kCANCEL_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kCancelTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1915,8 +1915,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // create escrow fails - frozen trustline
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecFROZEN));
             env.close();
@@ -1928,8 +1928,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1939,8 +1939,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob finish escrow success regardless of frozen assets
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1952,8 +1952,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kCANCEL_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kCancelTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -1991,8 +1991,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // create escrow fails - frozen trustline
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecFROZEN));
             env.close();
@@ -2004,8 +2004,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -2015,8 +2015,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob finish escrow fails because of deep frozen assets
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecFROZEN));
             env.close();
@@ -2029,8 +2029,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kCANCEL_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kCancelTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -2073,8 +2073,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // create escrow success
             auto const delta = usd(1'000);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
             env(pay(alice, gw, usd(10'000)), Ter(tecPATH_PARTIAL));
@@ -2096,14 +2096,14 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const delta = usd(1'000);
             env(escrow::create(alice, bob, delta),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
             env(escrow::create(alice, bob, usd(10'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecINSUFFICIENT_FUNDS));
             env.close();
@@ -2141,8 +2141,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // alice cannot create escrow for 1/10 iou - precision loss
             env(escrow::create(alice, bob, usd(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(largeMantissa ? (TER)tesSUCCESS : (TER)tecPRECISION_LOSS));
             env.close();
@@ -2150,15 +2150,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(alice);
             // alice can create escrow for 1'000 iou
             env(escrow::create(alice, bob, usd(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
             // bob finish escrow success
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
         }
@@ -2195,22 +2195,22 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 createResult);
             env.close();
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 finishResult);
             env.close();
             auto const seq2 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Fee(baseFee * 150),
                 createResult);
             env.close();
@@ -2244,8 +2244,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const result = withMPT ? Ter(temBAD_AMOUNT) : Ter(temDISABLED);
             env(jv,
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 result);
             env.close();
@@ -2270,8 +2270,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, mpt(-1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(temBAD_AMOUNT));
             env.close();
@@ -2301,8 +2301,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(gw, alice, mpt(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
             env.close();
@@ -2323,8 +2323,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             jv[jss::Amount][jss::mpt_issuance_id] =
                 "00000004A407AF5856CCF3C42619DAA925813FC955C72983";
             env(jv,
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecOBJECT_NOT_FOUND));
             env.close();
@@ -2348,8 +2348,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, mpt(3)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
             env.close();
@@ -2369,8 +2369,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const mpt = mptGw["MPT"];
 
             env(escrow::create(alice, bob, mpt(4)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecOBJECT_NOT_FOUND));
             env.close();
@@ -2399,8 +2399,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
 
             env(escrow::create(alice, bob, mpt(5)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_AUTH));
             env.close();
@@ -2432,8 +2432,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.authorize({.account = gw, .holder = bob, .flags = tfMPTUnauthorize});
 
             env(escrow::create(alice, bob, mpt(6)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_AUTH));
             env.close();
@@ -2463,8 +2463,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.set({.account = gw, .holder = alice, .flags = tfMPTLock});
 
             env(escrow::create(alice, bob, mpt(7)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecLOCKED));
             env.close();
@@ -2494,8 +2494,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.set({.account = gw, .holder = bob, .flags = tfMPTLock});
 
             env(escrow::create(alice, bob, mpt(8)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecLOCKED));
             env.close();
@@ -2519,8 +2519,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, mpt(9)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecNO_AUTH));
             env.close();
@@ -2544,8 +2544,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, mpt(11)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecINSUFFICIENT_FUNDS));
             env.close();
@@ -2570,8 +2570,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::create(alice, bob, mpt(11)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tecINSUFFICIENT_FUNDS));
             env.close();
@@ -2609,8 +2609,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(10)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -2619,8 +2619,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.authorize({.account = gw, .holder = bob, .flags = tfMPTUnauthorize});
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecNO_AUTH));
             env.close();
@@ -2649,8 +2649,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             });
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecOBJECT_NOT_FOUND));
             env.close();
@@ -2678,8 +2678,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(8)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -2688,8 +2688,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.set({.account = gw, .holder = bob, .flags = tfMPTLock});
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecLOCKED));
             env.close();
@@ -2726,15 +2726,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(10)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecINSUFFICIENT_RESERVE));
             env.close();
@@ -2760,15 +2760,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(10)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -2795,15 +2795,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(10)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
 
             env(escrow::finish(carol, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
             env.close();
@@ -2841,8 +2841,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(10)),
-                escrow::kCANCEL_TIME(env.now() + 2s),
-                escrow::kCONDITION(escrow::kCB1),
+                escrow::kCancelTime(env.now() + 2s),
+                escrow::kCondition(escrow::kCb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -2914,8 +2914,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const preAliceMPT = env.balance(alice, mpt);
             auto const preBobMPT = env.balance(bob, mpt);
             env(escrow::create(alice, bob, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -2931,8 +2931,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const preAliceMPT = env.balance(alice, mpt);
             auto const preBobMPT = env.balance(bob, mpt);
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -2951,9 +2951,9 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const preAliceMPT = env.balance(alice, mpt);
             auto const preBobMPT = env.balance(bob, mpt);
             env(escrow::create(alice, bob, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -2984,8 +2984,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq = env.seq(alice);
             auto const preAliceMPT = env.balance(alice, mpt);
             env(escrow::create(alice, alice, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -2996,8 +2996,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 1'000);
 
             env(escrow::finish(alice, alice, seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -3013,9 +3013,9 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq = env.seq(alice);
             auto const preAliceMPT = env.balance(alice, mpt);
             env(escrow::create(alice, alice, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -3040,15 +3040,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const preBobMPT = env.balance(bob, mpt);
             auto const preCarolMPT = env.balance(carol, mpt);
             env(escrow::create(alice, bob, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
 
             env(escrow::create(carol, bob, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -3077,7 +3077,7 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
             auto const mpt = mptGw["MPT"];
-            env(pay(gw, alice, mpt(kMAX_MP_TOKEN_AMOUNT)));
+            env(pay(gw, alice, mpt(kMaxMpTokenAmount)));
             env.close();
 
             auto const preAliceMPT = env.balance(alice, mpt);
@@ -3086,8 +3086,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(1)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -3099,8 +3099,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 1);
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -3130,7 +3130,7 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
             auto const mpt = mptGw["MPT"];
-            env(pay(gw, alice, mpt(kMAX_MP_TOKEN_AMOUNT)));
+            env(pay(gw, alice, mpt(kMaxMpTokenAmount)));
             env.close();
 
             auto const preAliceMPT = env.balance(alice, mpt);
@@ -3139,44 +3139,44 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // Escrow Max MPT - 10
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, mpt(kMAX_MP_TOKEN_AMOUNT - 10)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+            env(escrow::create(alice, bob, mpt(kMaxMpTokenAmount - 10)),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
             // Escrow 10 MPT
             auto const seq2 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(10)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(kMAX_MP_TOKEN_AMOUNT));
-            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == kMAX_MP_TOKEN_AMOUNT);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(kMaxMpTokenAmount));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == kMaxMpTokenAmount);
             BEAST_EXPECT(env.balance(bob, mpt) == preBobMPT);
             BEAST_EXPECT(mptEscrowed(env, bob, mpt) == 0);
             BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == kMAX_MP_TOKEN_AMOUNT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == kMaxMpTokenAmount);
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
 
             env(escrow::finish(bob, alice, seq2),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(kMAX_MP_TOKEN_AMOUNT));
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(kMaxMpTokenAmount));
             BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
-            BEAST_EXPECT(env.balance(bob, mpt) == preBobMPT + mpt(kMAX_MP_TOKEN_AMOUNT));
+            BEAST_EXPECT(env.balance(bob, mpt) == preBobMPT + mpt(kMaxMpTokenAmount));
             BEAST_EXPECT(mptEscrowed(env, bob, mpt) == 0);
             BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
             BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 0);
@@ -3210,8 +3210,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const bseq = env.seq(bob);
 
             env(escrow::create(alice, alice, mpt(1'000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 500s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 500s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -3234,8 +3234,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             }
 
             env(escrow::create(bob, bob, mpt(1'000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -3303,13 +3303,13 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const aseq = env.seq(alice);
             auto const bseq = env.seq(bob);
 
-            env(escrow::create(alice, bob, mpt(1'000)), escrow::kFINISH_TIME(env.now() + 1s));
+            env(escrow::create(alice, bob, mpt(1'000)), escrow::kFinishTime(env.now() + 1s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
             env(escrow::create(bob, carol, mpt(1'000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -3426,8 +3426,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             BEAST_EXPECT(preEscrowed == 0);
 
             env(escrow::create(alice, gw, mpt(1'000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -3438,8 +3438,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // issuer (dest) can finish escrow
             env(escrow::finish(gw, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -3489,8 +3489,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(alice);
             auto const delta = mpt(125);
             env(escrow::create(alice, bob, mpt(125)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
             auto const transferRate = escrow::rate(env, alice, seq1);
@@ -3502,8 +3502,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob can finish escrow
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -3545,9 +3545,9 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(alice);
             auto const delta = mpt(125);
             env(escrow::create(alice, bob, mpt(125)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 3s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 3s),
                 Fee(baseFee * 150));
             env.close();
             auto const transferRate = escrow::rate(env, alice, seq1);
@@ -3590,8 +3590,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             auto const seq1 = env.seq(alice);
             auto const delta = mpt(125);
             env(escrow::create(alice, gw, mpt(125)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
             auto const transferRate = escrow::rate(env, alice, seq1);
@@ -3603,8 +3603,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             // bob can finish escrow
             env(escrow::finish(gw, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
 
@@ -3645,15 +3645,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
         auto const delta = mpt(125);
         // alice can create escrow - is authorized
         env(escrow::create(alice, bob, mpt(100)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150));
         env.close();
 
         // bob can finish escrow - is authorized
         env(escrow::finish(bob, alice, seq),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFULFILLMENT(escrow::kFB1),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFulfillment(escrow::kFb1),
             Fee(baseFee * 150));
         env.close();
     }
@@ -3686,9 +3686,9 @@ struct EscrowToken_test : public beast::unit_test::Suite
         // alice create escrow
         auto seq1 = env.seq(alice);
         env(escrow::create(alice, bob, mpt(100)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
-            escrow::kCANCEL_TIME(env.now() + 2s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
+            escrow::kCancelTime(env.now() + 2s),
             Fee(baseFee * 150));
         env.close();
 
@@ -3698,8 +3698,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
         // bob cannot finish
         env(escrow::finish(bob, alice, seq1),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFULFILLMENT(escrow::kFB1),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFulfillment(escrow::kFb1),
             Fee(baseFee * 150),
             Ter(tecLOCKED));
         env.close();
@@ -3733,9 +3733,9 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
         // alice cannot create escrow to non issuer
         env(escrow::create(alice, bob, mpt(100)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
-            escrow::kCANCEL_TIME(env.now() + 2s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
+            escrow::kCancelTime(env.now() + 2s),
             Fee(baseFee * 150),
             Ter(tecNO_AUTH));
         env.close();
@@ -3745,15 +3745,15 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // alice an create escrow to issuer
             auto seq = env.seq(alice);
             env(escrow::create(alice, gw, mpt(100)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
             // gw can finish
             env(escrow::finish(gw, alice, seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150));
             env.close();
         }
@@ -3763,9 +3763,9 @@ struct EscrowToken_test : public beast::unit_test::Suite
             // alice an create escrow to issuer
             auto seq = env.seq(alice);
             env(escrow::create(alice, gw, mpt(100)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -3802,8 +3802,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(10)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150));
             env.close();
 
@@ -3819,8 +3819,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
             mptGw.destroy({.id = mptGw.issuanceID(), .ownerCount = 1, .err = tecHAS_OBLIGATIONS});
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -3849,8 +3849,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
 
             auto const seq1 = env.seq(alice);
             env(escrow::create(alice, bob, mpt(10)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -3864,8 +3864,8 @@ struct EscrowToken_test : public beast::unit_test::Suite
                 {.account = alice, .flags = tfMPTUnauthorize, .err = tecHAS_OBLIGATIONS});
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp
index 408e9c4edf..3e76524cf1 100644
--- a/src/test/app/Escrow_test.cpp
+++ b/src/test/app/Escrow_test.cpp
@@ -47,27 +47,27 @@ struct Escrow_test : public beast::unit_test::Suite
         Env env(*this, features);
         auto const baseFee = env.current()->fees().base;
         env.fund(XRP(5000), "alice", "bob");
-        env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
+        env(escrow::create("alice", "bob", XRP(1000)), escrow::kFinishTime(env.now() + 1s));
         env.close();
 
         auto const seq1 = env.seq("alice");
 
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150));
         env.close();
         env(escrow::finish("bob", "alice", seq1),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFULFILLMENT(escrow::kFB1),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFulfillment(escrow::kFb1),
             Fee(baseFee * 150));
 
         auto const seq2 = env.seq("alice");
 
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::kCONDITION(escrow::kCB2),
-            escrow::kFINISH_TIME(env.now() + 1s),
-            escrow::kCANCEL_TIME(env.now() + 2s),
+            escrow::kCondition(escrow::kCb2),
+            escrow::kFinishTime(env.now() + 1s),
+            escrow::kCancelTime(env.now() + 2s),
             Fee(baseFee * 150));
         env.close();
         env(escrow::cancel("bob", "alice", seq2), Fee(baseFee * 150));
@@ -90,7 +90,7 @@ struct Escrow_test : public beast::unit_test::Suite
             auto const ts = env.now() + 97s;
 
             auto const seq = env.seq("alice");
-            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(ts));
+            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFinishTime(ts));
 
             // Advance the ledger, verifying that the finish won't complete
             // prematurely.
@@ -112,8 +112,8 @@ struct Escrow_test : public beast::unit_test::Suite
 
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "bob", XRP(1000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kCANCEL_TIME(ts));
+                escrow::kCondition(escrow::kCb1),
+                escrow::kCancelTime(ts));
 
             // Advance the ledger, verifying that the cancel won't complete
             // prematurely.
@@ -122,8 +122,8 @@ struct Escrow_test : public beast::unit_test::Suite
 
             // Verify that a finish won't work anymore.
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tecNO_PERMISSION));
 
@@ -144,8 +144,8 @@ struct Escrow_test : public beast::unit_test::Suite
 
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "bob", XRP(1000)),
-                escrow::kFINISH_TIME(fts),
-                escrow::kCANCEL_TIME(cts));
+                escrow::kFinishTime(fts),
+                escrow::kCancelTime(cts));
 
             // Advance the ledger, verifying that the finish and cancel won't
             // complete prematurely.
@@ -175,8 +175,8 @@ struct Escrow_test : public beast::unit_test::Suite
 
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "bob", XRP(1000)),
-                escrow::kFINISH_TIME(fts),
-                escrow::kCANCEL_TIME(cts));
+                escrow::kFinishTime(fts),
+                escrow::kCancelTime(cts));
 
             // Advance the ledger, verifying that the finish and cancel won't
             // complete prematurely.
@@ -219,14 +219,14 @@ struct Escrow_test : public beast::unit_test::Suite
         // required:
         env(fset(bob, asfRequireDest));
         env(escrow::create(alice, bob, XRP(1000)),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kFinishTime(env.now() + 1s),
             Ter(tecDST_TAG_NEEDED));
 
         // set source and dest tags
         auto const seq = env.seq(alice);
 
         env(escrow::create(alice, bob, XRP(1000)),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kFinishTime(env.now() + 1s),
             Stag(1),
             Dtag(2));
 
@@ -259,7 +259,7 @@ struct Escrow_test : public beast::unit_test::Suite
 
             env.fund(XRP(5000), "bob", "george");
             env(fset("george", asfDisallowXRP));
-            env(escrow::create("bob", "george", XRP(10)), escrow::kFINISH_TIME(env.now() + 1s));
+            env(escrow::create("bob", "george", XRP(10)), escrow::kFinishTime(env.now() + 1s));
         }
     }
 
@@ -278,21 +278,21 @@ struct Escrow_test : public beast::unit_test::Suite
 
         // Creating an escrow with only a cancel time is not allowed:
         env(escrow::create("alice", "bob", XRP(100)),
-            escrow::kCANCEL_TIME(env.now() + 90s),
+            escrow::kCancelTime(env.now() + 90s),
             Fee(baseFee * 150),
             Ter(temMALFORMED));
 
-        // Creating an escrow with only a cancel time and a kCONDITION is
+        // Creating an escrow with only a cancel time and a kCondition is
         // allowed:
         auto const seq = env.seq("alice");
         env(escrow::create("alice", "bob", XRP(100)),
-            escrow::kCANCEL_TIME(env.now() + 90s),
-            escrow::kCONDITION(escrow::kCB1),
+            escrow::kCancelTime(env.now() + 90s),
+            escrow::kCondition(escrow::kCb1),
             Fee(baseFee * 150));
         env.close();
         env(escrow::finish("carol", "alice", seq),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFULFILLMENT(escrow::kFB1),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFulfillment(escrow::kFb1),
             Fee(baseFee * 150));
         BEAST_EXPECT(env.balance("bob") == XRP(5100));
 
@@ -300,9 +300,9 @@ struct Escrow_test : public beast::unit_test::Suite
         // allowed:
         auto const seqFt = env.seq("alice");
         env(escrow::create("alice", "bob", XRP(100)),
-            escrow::kFINISH_TIME(env.now()),  // Set finish time to now so that
-                                              // we can call finish immediately.
-            escrow::kCANCEL_TIME(env.now() + 50s),
+            escrow::kFinishTime(env.now()),  // Set finish time to now so that
+                                             // we can call finish immediately.
+            escrow::kCancelTime(env.now() + 50s),
             Fee(baseFee * 150));
         env.close();
         env(escrow::finish("carol", "alice", seqFt), Fee(150 * baseFee));
@@ -324,24 +324,24 @@ struct Escrow_test : public beast::unit_test::Suite
 
         // temINVALID_FLAG
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::kFINISH_TIME(env.now() + 5s),
+            escrow::kFinishTime(env.now() + 5s),
             Txflags(tfPassive),
             Ter(temINVALID_FLAG));
 
         // Finish time is in the past
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::kFINISH_TIME(env.now() - 5s),
+            escrow::kFinishTime(env.now() - 5s),
             Ter(tecNO_PERMISSION));
 
         // Cancel time is in the past
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kCANCEL_TIME(env.now() - 5s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kCancelTime(env.now() - 5s),
             Ter(tecNO_PERMISSION));
 
         // no destination account
         env(escrow::create("alice", "carol", XRP(1000)),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kFinishTime(env.now() + 1s),
             Ter(tecNO_DST));
 
         env.fund(XRP(5000), "carol");
@@ -353,43 +353,43 @@ struct Escrow_test : public beast::unit_test::Suite
             // set the asfAllowTrustLineLocking flag
             auto const txResult = withTokenEscrow ? Ter(tecNO_PERMISSION) : Ter(temBAD_AMOUNT);
             env(escrow::create("alice", "carol", Account("alice")["USD"](500)),
-                escrow::kFINISH_TIME(env.now() + 5s),
+                escrow::kFinishTime(env.now() + 5s),
                 txResult);
         }
 
         // Sending zero or no XRP:
         env(escrow::create("alice", "carol", XRP(0)),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kFinishTime(env.now() + 1s),
             Ter(temBAD_AMOUNT));
         env(escrow::create("alice", "carol", XRP(-1000)),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kFinishTime(env.now() + 1s),
             Ter(temBAD_AMOUNT));
 
         // Fail if neither CancelAfter nor FinishAfter are specified:
         env(escrow::create("alice", "carol", XRP(1)), Ter(temBAD_EXPIRATION));
 
-        // Fail if neither a FinishTime nor a kCONDITION are attached:
+        // Fail if neither a FinishTime nor a kCondition are attached:
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::kCANCEL_TIME(env.now() + 1s),
+            escrow::kCancelTime(env.now() + 1s),
             Ter(temMALFORMED));
 
         // Fail if FinishAfter has already passed:
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::kFINISH_TIME(env.now() - 1s),
+            escrow::kFinishTime(env.now() - 1s),
             Ter(tecNO_PERMISSION));
 
         // If both CancelAfter and FinishAfter are set, then CancelAfter must
         // be strictly later than FinishAfter.
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 10s),
-            escrow::kCANCEL_TIME(env.now() + 10s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 10s),
+            escrow::kCancelTime(env.now() + 10s),
             Ter(temBAD_EXPIRATION));
 
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 10s),
-            escrow::kCANCEL_TIME(env.now() + 5s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 10s),
+            escrow::kCancelTime(env.now() + 5s),
             Ter(temBAD_EXPIRATION));
 
         // Carol now requires the use of a destination tag
@@ -397,14 +397,14 @@ struct Escrow_test : public beast::unit_test::Suite
 
         // missing destination tag
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kCANCEL_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kCancelTime(env.now() + 1s),
             Ter(tecDST_TAG_NEEDED));
 
         // Success!
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kCANCEL_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kCancelTime(env.now() + 1s),
             Dtag(1));
 
         {  // Fail if the sender wants to send more than he has:
@@ -413,17 +413,17 @@ struct Escrow_test : public beast::unit_test::Suite
 
             env.fund(accountReserve + accountIncrement + XRP(50), "daniel");
             env(escrow::create("daniel", "bob", XRP(51)),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kFinishTime(env.now() + 1s),
                 Ter(tecUNFUNDED));
 
             env.fund(accountReserve + accountIncrement + XRP(50), "evan");
             env(escrow::create("evan", "bob", XRP(50)),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kFinishTime(env.now() + 1s),
                 Ter(tecUNFUNDED));
 
             env.fund(accountReserve, "frank");
             env(escrow::create("frank", "bob", XRP(1)),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kFinishTime(env.now() + 1s),
                 Ter(tecINSUFFICIENT_RESERVE));
         }
 
@@ -431,21 +431,21 @@ struct Escrow_test : public beast::unit_test::Suite
             env.fund(XRP(5000), "hannah");
             auto const seq = env.seq("hannah");
             env(escrow::create("hannah", "hannah", XRP(10)),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(150 * baseFee));
             env.close();
             env(escrow::finish("hannah", "hannah", seq + 7), Fee(150 * baseFee), Ter(tecNO_TARGET));
         }
 
-        {  // Try to specify a kCONDITION for a non-conditional payment
+        {  // Try to specify a kCondition for a non-conditional payment
             env.fund(XRP(5000), "ivan");
             auto const seq = env.seq("ivan");
 
-            env(escrow::create("ivan", "ivan", XRP(10)), escrow::kFINISH_TIME(env.now() + 1s));
+            env(escrow::create("ivan", "ivan", XRP(10)), escrow::kFinishTime(env.now() + 1s));
             env.close();
             env(escrow::finish("ivan", "ivan", seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
         }
@@ -465,7 +465,7 @@ struct Escrow_test : public beast::unit_test::Suite
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(5000), "alice", "bob");
             auto const seq = env.seq("alice");
-            env(escrow::create("alice", "alice", XRP(1000)), escrow::kFINISH_TIME(env.now() + 5s));
+            env(escrow::create("alice", "alice", XRP(1000)), escrow::kFinishTime(env.now() + 5s));
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
 
             // Not enough time has elapsed for a finish and canceling isn't
@@ -489,7 +489,7 @@ struct Escrow_test : public beast::unit_test::Suite
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(5000), "alice", "bob", "zelda");
             auto const seq = env.seq("alice");
-            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(env.now() + 5s));
+            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFinishTime(env.now() + 5s));
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
 
             // Not enough time has elapsed for a finish and canceling isn't
@@ -519,7 +519,7 @@ struct Escrow_test : public beast::unit_test::Suite
             env.close();
 
             auto const seq = env.seq("alice");
-            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(env.now() + 5s));
+            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFinishTime(env.now() + 5s));
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
 
             // Not enough time has elapsed for a finish and canceling isn't
@@ -559,7 +559,7 @@ struct Escrow_test : public beast::unit_test::Suite
             env.close();
 
             auto const seq = env.seq("alice");
-            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(env.now() + 5s));
+            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFinishTime(env.now() + 5s));
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             env.close();
 
@@ -581,8 +581,8 @@ struct Escrow_test : public beast::unit_test::Suite
             env.fund(XRP(5000), "alice", "bob");
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "alice", XRP(1000)),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFINISH_TIME(env.now() + 5s));
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFinishTime(env.now() + 5s));
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
 
             // Not enough time has elapsed for a finish and canceling isn't
@@ -591,20 +591,20 @@ struct Escrow_test : public beast::unit_test::Suite
             env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
             env(escrow::finish("alice", "alice", seq), Ter(tecNO_PERMISSION));
             env(escrow::finish("alice", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB2),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb2),
                 Fee(150 * baseFee),
                 Ter(tecNO_PERMISSION));
             env(escrow::finish("bob", "alice", seq), Ter(tecNO_PERMISSION));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB2),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb2),
                 Fee(150 * baseFee),
                 Ter(tecNO_PERMISSION));
             env.close();
 
             // Cancel continues to not be possible. Finish is possible but
-            // requires the kFULFILLMENT associated with the escrow.
+            // requires the kFulfillment associated with the escrow.
             env(escrow::cancel("alice", "alice", seq), Ter(tecNO_PERMISSION));
             env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
             env(escrow::finish("bob", "alice", seq), Ter(tecCRYPTOCONDITION_ERROR));
@@ -612,8 +612,8 @@ struct Escrow_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB2),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb2),
                 Fee(150 * baseFee));
         }
         {
@@ -624,8 +624,8 @@ struct Escrow_test : public beast::unit_test::Suite
             env.fund(XRP(5000), "alice", "bob");
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "alice", XRP(1000)),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFINISH_TIME(env.now() + 5s));
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFinishTime(env.now() + 5s));
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             env.close();
 
@@ -639,18 +639,18 @@ struct Escrow_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::finish("alice", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB2),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb2),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFulfillment(escrow::kFb3),
                 Fee(150 * baseFee),
                 Ter(tecNO_PERMISSION));
             env(escrow::finish("alice", "alice", seq),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFulfillment(escrow::kFb3),
                 Fee(150 * baseFee));
         }
         {
@@ -661,8 +661,8 @@ struct Escrow_test : public beast::unit_test::Suite
             env.fund(XRP(5000), "alice", "bob", "zelda");
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "alice", XRP(1000)),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFINISH_TIME(env.now() + 5s));
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFinishTime(env.now() + 5s));
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             env.close();
 
@@ -682,18 +682,18 @@ struct Escrow_test : public beast::unit_test::Suite
             env.close();
 
             env(escrow::finish("alice", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB2),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb2),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFulfillment(escrow::kFb3),
                 Fee(150 * baseFee),
                 Ter(tecNO_PERMISSION));
             env(escrow::finish("zelda", "alice", seq),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFulfillment(escrow::kFb3),
                 Fee(150 * baseFee));
         }
     }
@@ -713,63 +713,63 @@ struct Escrow_test : public beast::unit_test::Suite
             auto const seq = env.seq("alice");
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 0);
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kCANCEL_TIME(env.now() + 1s));
+                escrow::kCondition(escrow::kCb1),
+                escrow::kCancelTime(env.now() + 1s));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             env.require(Balance("carol", XRP(5000)));
             env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
 
-            // Attempt to finish without a kFULFILLMENT
+            // Attempt to finish without a kFulfillment
             env(escrow::finish("bob", "alice", seq), Ter(tecCRYPTOCONDITION_ERROR));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
 
-            // Attempt to finish with a kCONDITION instead of a kFULFILLMENT
+            // Attempt to finish with a kCondition instead of a kFulfillment
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kCB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kCb1),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kCB2),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kCb2),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kCB3),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kCb3),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
 
-            // Attempt to finish with an incorrect kCONDITION and various
+            // Attempt to finish with an incorrect kCondition and various
             // combinations of correct and incorrect fulfillments.
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB2),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb2),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb3),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
 
-            // Attempt to finish with the correct kCONDITION & kFULFILLMENT
+            // Attempt to finish with the correct kCondition & kFulfillment
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(150 * baseFee));
 
             // SLE removed on finish
@@ -780,15 +780,15 @@ struct Escrow_test : public beast::unit_test::Suite
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 0);
             env(escrow::cancel("bob", "carol", 1), Ter(tecNO_TARGET));
         }
-        {  // Test cancel when kCONDITION is present
+        {  // Test cancel when kCondition is present
             Env env(*this, features);
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(5000), "alice", "bob", "carol");
             auto const seq = env.seq("alice");
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 0);
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kCANCEL_TIME(env.now() + 1s));
+                escrow::kCondition(escrow::kCb2),
+                escrow::kCancelTime(env.now() + 1s));
             env.close();
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             // balance restored on cancel
@@ -804,8 +804,8 @@ struct Escrow_test : public beast::unit_test::Suite
             env.close();
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kCANCEL_TIME(env.now() + 1s));
+                escrow::kCondition(escrow::kCb3),
+                escrow::kCancelTime(env.now() + 1s));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
             // cancel fails before expiration
             env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
@@ -813,8 +813,8 @@ struct Escrow_test : public beast::unit_test::Suite
             env.close();
             // finish fails after expiration
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFulfillment(escrow::kFb3),
                 Fee(150 * baseFee),
                 Ter(tecNO_PERMISSION));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
@@ -825,8 +825,8 @@ struct Escrow_test : public beast::unit_test::Suite
             env.fund(XRP(5000), "alice", "bob", "carol");
 
             std::vector<std::uint8_t> v;
-            v.resize(escrow::kCB1.size() + 2, 0x78);
-            std::memcpy(v.data() + 1, escrow::kCB1.data(), escrow::kCB1.size());
+            v.resize(escrow::kCb1.size() + 2, 0x78);
+            std::memcpy(v.data() + 1, escrow::kCb1.data(), escrow::kCb1.size());
 
             auto const p = v.data();
             auto const s = v.size();
@@ -834,45 +834,45 @@ struct Escrow_test : public beast::unit_test::Suite
             auto const ts = env.now() + 1s;
 
             // All these are expected to fail, because the
-            // kCONDITION we pass in is malformed in some way
+            // kCondition we pass in is malformed in some way
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{p, s}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{p, s}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{p, s - 1}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{p, s - 1}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{p, s - 2}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{p, s - 2}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{p + 1, s - 1}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{p + 1, s - 1}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{p + 1, s - 3}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{p + 1, s - 3}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{p + 2, s - 2}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{p + 2, s - 2}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{p + 2, s - 3}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{p + 2, s - 3}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
 
             auto const seq = env.seq("alice");
             auto const baseFee = env.current()->fees().base;
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{p + 1, s - 2}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{p + 1, s - 2}),
+                escrow::kCancelTime(ts),
                 Fee(10 * baseFee));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(150 * baseFee));
             env.require(Balance("alice", XRP(4000) - drops(10 * baseFee)));
             env.require(Balance("bob", XRP(5000) - drops(150 * baseFee)));
@@ -883,15 +883,15 @@ struct Escrow_test : public beast::unit_test::Suite
             env.fund(XRP(5000), "alice", "bob", "carol");
 
             std::vector<std::uint8_t> cv;
-            cv.resize(escrow::kCB2.size() + 2, 0x78);
-            std::memcpy(cv.data() + 1, escrow::kCB2.data(), escrow::kCB2.size());
+            cv.resize(escrow::kCb2.size() + 2, 0x78);
+            std::memcpy(cv.data() + 1, escrow::kCb2.data(), escrow::kCb2.size());
 
             auto const cp = cv.data();
             auto const cs = cv.size();
 
             std::vector<std::uint8_t> fv;
-            fv.resize(escrow::kFB2.size() + 2, 0x13);
-            std::memcpy(fv.data() + 1, escrow::kFB2.data(), escrow::kFB2.size());
+            fv.resize(escrow::kFb2.size() + 2, 0x13);
+            std::memcpy(fv.data() + 1, escrow::kFb2.data(), escrow::kFb2.size());
 
             auto const fp = fv.data();
             auto const fs = fv.size();
@@ -899,181 +899,181 @@ struct Escrow_test : public beast::unit_test::Suite
             auto const ts = env.now() + 1s;
 
             // All these are expected to fail, because the
-            // kCONDITION we pass in is malformed in some way
+            // kCondition we pass in is malformed in some way
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{cp, cs}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{cp, cs}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{cp, cs - 1}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{cp, cs - 1}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{cp, cs - 2}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{cp, cs - 2}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{cp + 1, cs - 1}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{cp + 1, cs - 1}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{cp + 1, cs - 3}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{cp + 1, cs - 3}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{cp + 2, cs - 2}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{cp + 2, cs - 2}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{cp + 2, cs - 3}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{cp + 2, cs - 3}),
+                escrow::kCancelTime(ts),
                 Ter(temMALFORMED));
 
             auto const seq = env.seq("alice");
             auto const baseFee = env.current()->fees().base;
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kCancelTime(ts),
                 Fee(10 * baseFee));
 
             // Now, try to fulfill using the same sequence of
             // malformed conditions.
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp, cs}),
-                escrow::kFULFILLMENT(Slice{fp, fs}),
+                escrow::kCondition(Slice{cp, cs}),
+                escrow::kFulfillment(Slice{fp, fs}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp, cs - 1}),
-                escrow::kFULFILLMENT(Slice{fp, fs}),
+                escrow::kCondition(Slice{cp, cs - 1}),
+                escrow::kFulfillment(Slice{fp, fs}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp, fs}),
+                escrow::kCondition(Slice{cp, cs - 2}),
+                escrow::kFulfillment(Slice{fp, fs}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 1}),
-                escrow::kFULFILLMENT(Slice{fp, fs}),
+                escrow::kCondition(Slice{cp + 1, cs - 1}),
+                escrow::kFulfillment(Slice{fp, fs}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 3}),
-                escrow::kFULFILLMENT(Slice{fp, fs}),
+                escrow::kCondition(Slice{cp + 1, cs - 3}),
+                escrow::kFulfillment(Slice{fp, fs}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 2, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp, fs}),
+                escrow::kCondition(Slice{cp + 2, cs - 2}),
+                escrow::kFulfillment(Slice{fp, fs}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 2, cs - 3}),
-                escrow::kFULFILLMENT(Slice{fp, fs}),
+                escrow::kCondition(Slice{cp + 2, cs - 3}),
+                escrow::kFulfillment(Slice{fp, fs}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
 
-            // Now, using the correct kCONDITION, try malformed fulfillments:
+            // Now, using the correct kCondition, try malformed fulfillments:
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp, fs}),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kFulfillment(Slice{fp, fs}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp, fs - 1}),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kFulfillment(Slice{fp, fs - 1}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp, fs - 2}),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kFulfillment(Slice{fp, fs - 2}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp + 1, fs - 1}),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kFulfillment(Slice{fp + 1, fs - 1}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp + 1, fs - 3}),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kFulfillment(Slice{fp + 1, fs - 3}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp + 1, fs - 3}),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kFulfillment(Slice{fp + 1, fs - 3}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp + 2, fs - 2}),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kFulfillment(Slice{fp + 2, fs - 2}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
-                escrow::kFULFILLMENT(Slice{fp + 2, fs - 3}),
+                escrow::kCondition(Slice{cp + 1, cs - 2}),
+                escrow::kFulfillment(Slice{fp + 2, fs - 3}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
 
             // Now try for the right one
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB2),
-                escrow::kFULFILLMENT(escrow::kFB2),
+                escrow::kCondition(escrow::kCb2),
+                escrow::kFulfillment(escrow::kFb2),
                 Fee(150 * baseFee));
             env.require(Balance("alice", XRP(4000) - drops(10 * baseFee)));
             env.require(Balance("carol", XRP(6000)));
         }
-        {  // Test empty kCONDITION during creation and
-           // empty kCONDITION & kFULFILLMENT during finish
+        {  // Test empty kCondition during creation and
+           // empty kCondition & kFulfillment during finish
             Env env(*this, features);
             env.fund(XRP(5000), "alice", "bob", "carol");
 
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(Slice{}),
-                escrow::kCANCEL_TIME(env.now() + 1s),
+                escrow::kCondition(Slice{}),
+                escrow::kCancelTime(env.now() + 1s),
                 Ter(temMALFORMED));
 
             auto const seq = env.seq("alice");
             auto const baseFee = env.current()->fees().base;
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kCANCEL_TIME(env.now() + 1s));
+                escrow::kCondition(escrow::kCb3),
+                escrow::kCancelTime(env.now() + 1s));
 
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{}),
-                escrow::kFULFILLMENT(Slice{}),
+                escrow::kCondition(Slice{}),
+                escrow::kFulfillment(Slice{}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFULFILLMENT(Slice{}),
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFulfillment(Slice{}),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(Slice{}),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kCondition(Slice{}),
+                escrow::kFulfillment(escrow::kFb3),
                 Fee(150 * baseFee),
                 Ter(tecCRYPTOCONDITION_ERROR));
 
             // Assemble finish that is missing the Condition or the Fulfillment
             // since either both must be present, or neither can:
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB3),
+                escrow::kCondition(escrow::kCb3),
                 Ter(temMALFORMED));
             env(escrow::finish("bob", "alice", seq),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kFulfillment(escrow::kFb3),
                 Ter(temMALFORMED));
 
             // Now finish it.
             env(escrow::finish("bob", "alice", seq),
-                escrow::kCONDITION(escrow::kCB3),
-                escrow::kFULFILLMENT(escrow::kFB3),
+                escrow::kCondition(escrow::kCb3),
+                escrow::kFulfillment(escrow::kFb3),
                 Fee(150 * baseFee));
             env.require(Balance("carol", XRP(6000)));
             env.require(Balance("alice", XRP(4000) - drops(baseFee)));
         }
-        {  // Test a kCONDITION other than PreimageSha256, which
+        {  // Test a kCondition other than PreimageSha256, which
            // would require a separate amendment
             Env env(*this, features);
             env.fund(XRP(5000), "alice", "bob");
@@ -1087,8 +1087,8 @@ struct Escrow_test : public beast::unit_test::Suite
             // FIXME: this transaction should, eventually, return temDISABLED
             //        instead of temMALFORMED.
             env(escrow::create("alice", "bob", XRP(1000)),
-                escrow::kCONDITION(cb),
-                escrow::kCANCEL_TIME(env.now() + 1s),
+                escrow::kCondition(cb),
+                escrow::kCancelTime(env.now() + 1s),
                 Ter(temMALFORMED));
         }
     }
@@ -1112,8 +1112,8 @@ struct Escrow_test : public beast::unit_test::Suite
             auto const bseq = env.seq(bruce);
 
             env(escrow::create(alice, alice, XRP(1000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 500s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 500s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1129,8 +1129,8 @@ struct Escrow_test : public beast::unit_test::Suite
             }
 
             env(escrow::create(bruce, bruce, XRP(1000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1187,13 +1187,13 @@ struct Escrow_test : public beast::unit_test::Suite
             auto const aseq = env.seq(alice);
             auto const bseq = env.seq(bruce);
 
-            env(escrow::create(alice, bruce, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
+            env(escrow::create(alice, bruce, XRP(1000)), escrow::kFinishTime(env.now() + 1s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
             env(escrow::create(bruce, carol, XRP(1000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
-                escrow::kCANCEL_TIME(env.now() + 2s));
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1296,7 +1296,7 @@ struct Escrow_test : public beast::unit_test::Suite
         {
             auto const jtx = env.jt(
                 escrow::create("alice", "carol", XRP(1000)),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kFinishTime(env.now() + 1s),
                 Seq(1),
                 Fee(baseFee));
             auto const pf =
@@ -1352,12 +1352,12 @@ struct Escrow_test : public beast::unit_test::Suite
             // bob creates a bunch of tickets because he will be burning
             // through them with tec transactions.  Just because we can
             // we'll use them up starting from largest and going smaller.
-            constexpr static std::uint32_t kBOB_TICKET_COUNT{20};
-            env(ticket::create(bob, kBOB_TICKET_COUNT));
+            static constexpr std::uint32_t kBobTicketCount{20};
+            env(ticket::create(bob, kBobTicketCount));
             env.close();
             std::uint32_t bobTicket{env.seq(bob)};
             env.require(tickets(alice, 1));
-            env.require(tickets(bob, kBOB_TICKET_COUNT));
+            env.require(tickets(bob, kBobTicketCount));
 
             // Note that from here on all transactions use tickets.  No account
             // root sequences should change.
@@ -1369,11 +1369,11 @@ struct Escrow_test : public beast::unit_test::Suite
 
             std::uint32_t const escrowSeq = aliceTicket;
             env(escrow::create(alice, bob, XRP(1000)),
-                escrow::kFINISH_TIME(ts),
+                escrow::kFinishTime(ts),
                 ticket::Use(aliceTicket));
             BEAST_EXPECT(env.seq(alice) == aliceRootSeq);
             env.require(tickets(alice, 0));
-            env.require(tickets(bob, kBOB_TICKET_COUNT));
+            env.require(tickets(bob, kBobTicketCount));
 
             // Advance the ledger, verifying that the finish won't complete
             // prematurely.  Note that each tec consumes one of bob's tickets.
@@ -1412,12 +1412,12 @@ struct Escrow_test : public beast::unit_test::Suite
 
             // bob creates a bunch of tickets because he will be burning
             // through them with tec transactions.
-            constexpr std::uint32_t kBOB_TICKET_COUNT{20};
+            static constexpr std::uint32_t kBobTicketCount{20};
             std::uint32_t bobTicket{env.seq(bob) + 1};
-            env(ticket::create(bob, kBOB_TICKET_COUNT));
+            env(ticket::create(bob, kBobTicketCount));
             env.close();
             env.require(tickets(alice, 1));
-            env.require(tickets(bob, kBOB_TICKET_COUNT));
+            env.require(tickets(bob, kBobTicketCount));
 
             // Note that from here on all transactions use tickets.  No account
             // root sequences should change.
@@ -1429,12 +1429,12 @@ struct Escrow_test : public beast::unit_test::Suite
 
             std::uint32_t const escrowSeq = aliceTicket;
             env(escrow::create(alice, bob, XRP(1000)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kCANCEL_TIME(ts),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kCancelTime(ts),
                 ticket::Use(aliceTicket));
             BEAST_EXPECT(env.seq(alice) == aliceRootSeq);
             env.require(tickets(alice, 0));
-            env.require(tickets(bob, kBOB_TICKET_COUNT));
+            env.require(tickets(bob, kBobTicketCount));
 
             // Advance the ledger, verifying that the cancel won't complete
             // prematurely.
@@ -1449,8 +1449,8 @@ struct Escrow_test : public beast::unit_test::Suite
 
             // Verify that a finish won't work anymore.
             env(escrow::finish(bob, alice, escrowSeq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(150 * baseFee),
                 ticket::Use(bobTicket++),
                 Ter(tecNO_PERMISSION));
@@ -1491,7 +1491,7 @@ struct Escrow_test : public beast::unit_test::Suite
             env.close();
 
             auto const seq = env.seq(alice);
-            env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
+            env(escrow::create(alice, bob, XRP(1000)), escrow::kFinishTime(env.now() + 1s));
             env.close();
 
             env(fset(bob, asfDepositAuth));
@@ -1517,7 +1517,7 @@ struct Escrow_test : public beast::unit_test::Suite
             std::string const credIdx = jv[jss::result][jss::index].asString();
 
             auto const seq = env.seq(alice);
-            env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 50s));
+            env(escrow::create(alice, bob, XRP(1000)), escrow::kFinishTime(env.now() + 50s));
             env.close();
 
             // Bob require pre-authorization
@@ -1570,7 +1570,7 @@ struct Escrow_test : public beast::unit_test::Suite
             std::string const credIdx = jv[jss::result][jss::index].asString();
 
             auto const seq = env.seq(alice);
-            env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 50s));
+            env(escrow::create(alice, bob, XRP(1000)), escrow::kFinishTime(env.now() + 50s));
             // time advance
             env.close();
             env.close();
@@ -1595,7 +1595,7 @@ struct Escrow_test : public beast::unit_test::Suite
                         .asString();
 
                 auto const seq = env.seq(alice);
-                env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
+                env(escrow::create(alice, bob, XRP(1000)), escrow::kFinishTime(env.now() + 1s));
                 env.close();
 
                 // Bob require pre-authorization
diff --git a/src/test/app/FeeVote_test.cpp b/src/test/app/FeeVote_test.cpp
index 8300b458b6..4fb97a0b74 100644
--- a/src/test/app/FeeVote_test.cpp
+++ b/src/test/app/FeeVote_test.cpp
@@ -271,7 +271,7 @@ class FeeVote_test : public beast::unit_test::Suite
         {
             jtx::Env env(*this, jtx::testableAmendments() - featureXRPFees);
             auto ledger = std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -301,7 +301,7 @@ class FeeVote_test : public beast::unit_test::Suite
         {
             jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
             auto ledger = std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -334,7 +334,7 @@ class FeeVote_test : public beast::unit_test::Suite
         {
             jtx::Env env(*this, jtx::testableAmendments() - featureXRPFees);
             auto ledger = std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -356,7 +356,7 @@ class FeeVote_test : public beast::unit_test::Suite
         {
             jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
             auto ledger = std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -383,7 +383,7 @@ class FeeVote_test : public beast::unit_test::Suite
 
         jtx::Env env(*this, jtx::testableAmendments());
         auto ledger = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -422,7 +422,7 @@ class FeeVote_test : public beast::unit_test::Suite
 
         jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
         auto ledger = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -470,7 +470,7 @@ class FeeVote_test : public beast::unit_test::Suite
 
         jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
         auto ledger = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -501,7 +501,7 @@ class FeeVote_test : public beast::unit_test::Suite
 
         jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
         auto ledger = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -547,7 +547,7 @@ class FeeVote_test : public beast::unit_test::Suite
 
         jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
         auto ledger = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -588,7 +588,7 @@ class FeeVote_test : public beast::unit_test::Suite
             auto feeVote = makeFeeVote(setup, env.app().getJournal("FeeVote"));
 
             auto ledger = std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -618,7 +618,7 @@ class FeeVote_test : public beast::unit_test::Suite
             auto feeVote = makeFeeVote(setup, env.app().getJournal("FeeVote"));
 
             auto ledger = std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -663,7 +663,7 @@ class FeeVote_test : public beast::unit_test::Suite
 
         auto feeVote = makeFeeVote(setup, env.app().getJournal("FeeVote"));
         auto ledger = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
diff --git a/src/test/app/FlowMPT_test.cpp b/src/test/app/FlowMPT_test.cpp
index 9bb91755c8..e1d6f512d2 100644
--- a/src/test/app/FlowMPT_test.cpp
+++ b/src/test/app/FlowMPT_test.cpp
@@ -1774,8 +1774,7 @@ struct FlowMPT_test : public beast::unit_test::Suite
                 BEAST_EXPECT(env.balance(alice, usd) == usd(0));
                 BEAST_EXPECT(env.balance(carol, usd) == usd(0));
                 BEAST_EXPECT(env.balance(bob, usd) == usd(100 - d.expBobSellUSD));
-                BEAST_EXPECT(
-                    env.balance(gw) == XRPAmount{d.expGwXRP * kDROPS_PER_XRP - baseFee * 9});
+                BEAST_EXPECT(env.balance(gw) == XRPAmount{d.expGwXRP * kDropsPerXrp - baseFee * 9});
                 BEAST_EXPECT(expectOffers(env, john, 0));
                 BEAST_EXPECT(expectOffers(env, gw, d.expOffersGw));
                 BEAST_EXPECT(expectOffers(env, dan, d.expOffersDan()));
@@ -1901,8 +1900,7 @@ struct FlowMPT_test : public beast::unit_test::Suite
                 BEAST_EXPECT(env.balance(bob, usd) == usd(d.expBobBuyUSD));
                 BEAST_EXPECT(env.balance(ed) == XRP(d.dstExpectXRP));
                 BEAST_EXPECT(env.balance(gw, usd) == usd(-d.outstandingUSD));
-                BEAST_EXPECT(
-                    env.balance(gw) == XRPAmount{d.expGwXRP * kDROPS_PER_XRP - baseFee * 3});
+                BEAST_EXPECT(env.balance(gw) == XRPAmount{d.expGwXRP * kDropsPerXrp - baseFee * 3});
                 BEAST_EXPECT(expectOffers(env, carol, 0));
                 BEAST_EXPECT(expectOffers(env, bob, d.expOffersBob()));
                 BEAST_EXPECT(expectOffers(env, gw, d.expOffersGw));
@@ -2007,7 +2005,7 @@ struct FlowMPT_test : public beast::unit_test::Suite
 
                 auto const baseFee = env.current()->fees().base.drops();
                 BEAST_EXPECT(
-                    env.balance(alice) == XRPAmount{d.expAliceXRP * kDROPS_PER_XRP - baseFee});
+                    env.balance(alice) == XRPAmount{d.expAliceXRP * kDropsPerXrp - baseFee});
                 BEAST_EXPECT(env.balance(carol, usd) == usd(0));
                 BEAST_EXPECT(env.balance(bob, usd) == usd(100 - d.expBobSellUSD));
                 BEAST_EXPECT(env.balance(ed, usd) == usd(d.dstExpectUSD));
@@ -2015,7 +2013,7 @@ struct FlowMPT_test : public beast::unit_test::Suite
                 BEAST_EXPECT(
                     env.balance(gw) ==
                     XRPAmount{
-                        d.expGwXRP * kDROPS_PER_XRP - baseFee * (4 + (d.initDst != 0 ? 1 : 0))});
+                        d.expGwXRP * kDropsPerXrp - baseFee * (4 + (d.initDst != 0 ? 1 : 0))});
                 BEAST_EXPECT(expectOffers(env, carol, 0));
                 BEAST_EXPECT(expectOffers(env, bob, d.expOffersBob()));
                 BEAST_EXPECT(expectOffers(env, gw, d.expOffersGw));
diff --git a/src/test/app/GRPCServerTLS_test.cpp b/src/test/app/GRPCServerTLS_test.cpp
index 6dbf335b6c..c7156fb3a2 100644
--- a/src/test/app/GRPCServerTLS_test.cpp
+++ b/src/test/app/GRPCServerTLS_test.cpp
@@ -27,7 +27,7 @@
 
 namespace {
 
-constexpr std::string_view kCA_CERT_CONTENT =
+constexpr std::string_view kCaCertContent =
     "-----BEGIN CERTIFICATE-----\n"
     "MIIFhjCCA26gAwIBAgIJAL9P70zX30oiMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV\n"
     "BAYTAlVTMQ0wCwYDVQQIDARUZXN0MQ0wCwYDVQQHDARUZXN0MRgwFgYDVQQKDA9S\n"
@@ -61,7 +61,7 @@ constexpr std::string_view kCA_CERT_CONTENT =
     "fAbAYqu0rfMFHUYjzIVnu8WRCC56qYHO5tU=\n"
     "-----END CERTIFICATE-----\n";
 
-constexpr std::string_view kSERVER_CERT_CONTENT =
+constexpr std::string_view kServerCertContent =
     "-----BEGIN CERTIFICATE-----\n"
     "MIIFizCCA3OgAwIBAgIJAIErcpMflkrRMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV\n"
     "BAYTAlVTMQ0wCwYDVQQIDARUZXN0MQ0wCwYDVQQHDARUZXN0MRgwFgYDVQQKDA9S\n"
@@ -95,7 +95,7 @@ constexpr std::string_view kSERVER_CERT_CONTENT =
     "YSyd81wvumIpP+I7BDkQLgTb+NzMmoBIjRg3aVvXSg==\n"
     "-----END CERTIFICATE-----\n";
 
-constexpr std::string_view kSERVER_KEY_CONTENT =
+constexpr std::string_view kServerKeyContent =
     "-----BEGIN PRIVATE KEY-----\n"
     "MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCv+Lj9LJfPuSOE\n"
     "yZqTn2gmG5tJt02ywnuIQet7N5tduxnNs50yXQ00Jeb40dth0HwI5I+AsEVNPIG3\n"
@@ -149,7 +149,7 @@ constexpr std::string_view kSERVER_KEY_CONTENT =
     "S/RYUSUkZ4VvqFUfo7wT8x18urb87w==\n"
     "-----END PRIVATE KEY-----\n";
 
-constexpr std::string_view kCLIENT_CERT_CONTENT =
+constexpr std::string_view kClientCertContent =
     "-----BEGIN CERTIFICATE-----\n"
     "MIIFeDCCA2CgAwIBAgIJAIErcpMflkrSMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV\n"
     "BAYTAlVTMQ0wCwYDVQQIDARUZXN0MQ0wCwYDVQQHDARUZXN0MRgwFgYDVQQKDA9S\n"
@@ -183,7 +183,7 @@ constexpr std::string_view kCLIENT_CERT_CONTENT =
     "cTe8jkzRqYdUfAoV\n"
     "-----END CERTIFICATE-----\n";
 
-constexpr std::string_view kCLIENT_KEY_CONTENT =
+constexpr std::string_view kClientKeyContent =
     "-----BEGIN PRIVATE KEY-----\n"
     "MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDPQHttw3TLjOqY\n"
     "S3VkLF3KMRaP2ZtO6A1mXfTbqbKvD41Fazf/cM/v9lPMAlRd2SEY3MeE8KVddKJw\n"
@@ -246,26 +246,26 @@ constexpr std::string_view kCLIENT_KEY_CONTENT =
 class TemporaryTLSCertificates
 {
 public:
-    static constexpr std::string_view kCA_CERT_FILENAME = "ca.pem";
-    static constexpr std::string_view kSERVER_CERT_FILENAME = "server_cert.pem";
-    static constexpr std::string_view kSERVER_KEY_FILENAME = "server_key.pem";
-    static constexpr std::string_view kCLIENT_CERT_FILENAME = "client_cert.pem";
-    static constexpr std::string_view kCLIENT_KEY_FILENAME = "client_key.pem";
-    static constexpr std::string_view kCERTS_DIR_PREFIX = "grpc_tls_test_";
+    static constexpr std::string_view kCaCertFilename = "ca.pem";
+    static constexpr std::string_view kServerCertFilename = "server_cert.pem";
+    static constexpr std::string_view kServerKeyFilename = "server_key.pem";
+    static constexpr std::string_view kClientCertFilename = "client_cert.pem";
+    static constexpr std::string_view kClientKeyFilename = "client_key.pem";
+    static constexpr std::string_view kCertsDirPrefix = "grpc_tls_test_";
 
     TemporaryTLSCertificates()
     {
         auto tmpDir = std::filesystem::temp_directory_path();
         auto uniqueDirName =
-            boost::filesystem::unique_path(std::string(kCERTS_DIR_PREFIX) + "%%%%%%%%");
+            boost::filesystem::unique_path(std::string(kCertsDirPrefix) + "%%%%%%%%");
         tempDir_ = tmpDir / uniqueDirName.string();
         std::filesystem::create_directories(tempDir_);
 
-        writeFile(tempDir_ / kCA_CERT_FILENAME, kCA_CERT_CONTENT);
-        writeFile(tempDir_ / kSERVER_CERT_FILENAME, kSERVER_CERT_CONTENT);
-        writeFile(tempDir_ / kSERVER_KEY_FILENAME, kSERVER_KEY_CONTENT);
-        writeFile(tempDir_ / kCLIENT_CERT_FILENAME, kCLIENT_CERT_CONTENT);
-        writeFile(tempDir_ / kCLIENT_KEY_FILENAME, kCLIENT_KEY_CONTENT);
+        writeFile(tempDir_ / kCaCertFilename, kCaCertContent);
+        writeFile(tempDir_ / kServerCertFilename, kServerCertContent);
+        writeFile(tempDir_ / kServerKeyFilename, kServerKeyContent);
+        writeFile(tempDir_ / kClientCertFilename, kClientCertContent);
+        writeFile(tempDir_ / kClientKeyFilename, kClientKeyContent);
     }
 
     virtual ~TemporaryTLSCertificates()
@@ -284,31 +284,31 @@ public:
     [[nodiscard]] std::filesystem::path
     getCACertPath() const
     {
-        return tempDir_ / kCA_CERT_FILENAME;
+        return tempDir_ / kCaCertFilename;
     }
 
     [[nodiscard]] std::filesystem::path
     getServerCertPath() const
     {
-        return tempDir_ / kSERVER_CERT_FILENAME;
+        return tempDir_ / kServerCertFilename;
     }
 
     [[nodiscard]] std::filesystem::path
     getServerKeyPath() const
     {
-        return tempDir_ / kSERVER_KEY_FILENAME;
+        return tempDir_ / kServerKeyFilename;
     }
 
     [[nodiscard]] std::filesystem::path
     getClientCertPath() const
     {
-        return tempDir_ / kCLIENT_CERT_FILENAME;
+        return tempDir_ / kClientCertFilename;
     }
 
     [[nodiscard]] std::filesystem::path
     getClientKeyPath() const
     {
-        return tempDir_ / kCLIENT_KEY_FILENAME;
+        return tempDir_ / kClientKeyFilename;
     }
 
     [[nodiscard]] std::filesystem::path
@@ -409,7 +409,7 @@ public:
 
         // Test 2: TLS client with server CA should succeed
         grpc::SslCredentialsOptions sslOpts;
-        sslOpts.pem_root_certs = std::string(kCA_CERT_CONTENT);
+        sslOpts.pem_root_certs = std::string(kCaCertContent);
         auto tlsStub = org::xrpl::rpc::v1::XRPLedgerAPIService::NewStub(
             grpc::CreateChannel(serverAddress, grpc::SslCredentials(sslOpts)));
         BEAST_EXPECT(makeTestGRPCCall(tlsStub));
@@ -441,16 +441,16 @@ public:
 
         // Test 1: TLS client WITHOUT client certificate should FAIL (mTLS requires client cert)
         grpc::SslCredentialsOptions sslOptsNoClient;
-        sslOptsNoClient.pem_root_certs = std::string(kCA_CERT_CONTENT);
+        sslOptsNoClient.pem_root_certs = std::string(kCaCertContent);
         auto tlsStubNoClient = org::xrpl::rpc::v1::XRPLedgerAPIService::NewStub(
             grpc::CreateChannel(serverAddress, grpc::SslCredentials(sslOptsNoClient)));
         BEAST_EXPECT(!makeTestGRPCCall(tlsStubNoClient));
 
         // Test 2: TLS client WITH client certificate should succeed
         grpc::SslCredentialsOptions sslOptsWithClient;
-        sslOptsWithClient.pem_root_certs = std::string(kCA_CERT_CONTENT);
-        sslOptsWithClient.pem_cert_chain = std::string(kCLIENT_CERT_CONTENT);
-        sslOptsWithClient.pem_private_key = std::string(kCLIENT_KEY_CONTENT);
+        sslOptsWithClient.pem_root_certs = std::string(kCaCertContent);
+        sslOptsWithClient.pem_cert_chain = std::string(kClientCertContent);
+        sslOptsWithClient.pem_private_key = std::string(kClientKeyContent);
         auto tlsStubWithClient = org::xrpl::rpc::v1::XRPLedgerAPIService::NewStub(
             grpc::CreateChannel(serverAddress, grpc::SslCredentials(sslOptsWithClient)));
         BEAST_EXPECT(makeTestGRPCCall(tlsStubWithClient));
@@ -665,7 +665,7 @@ public:
 
         // Test: TLS client should be able to connect (no client cert required)
         grpc::SslCredentialsOptions sslOpts;
-        sslOpts.pem_root_certs = std::string(kCA_CERT_CONTENT);
+        sslOpts.pem_root_certs = std::string(kCaCertContent);
         auto tlsStub = org::xrpl::rpc::v1::XRPLedgerAPIService::NewStub(
             grpc::CreateChannel(serverAddress, grpc::SslCredentials(sslOpts)));
         BEAST_EXPECT(makeTestGRPCCall(tlsStub));
@@ -819,16 +819,16 @@ public:
 
         // Test 1: TLS client WITHOUT client certificate should FAIL (mTLS requires client cert)
         grpc::SslCredentialsOptions sslOptsNoClient;
-        sslOptsNoClient.pem_root_certs = std::string(kCA_CERT_CONTENT);
+        sslOptsNoClient.pem_root_certs = std::string(kCaCertContent);
         auto tlsStubNoClient = org::xrpl::rpc::v1::XRPLedgerAPIService::NewStub(
             grpc::CreateChannel(serverAddress, grpc::SslCredentials(sslOptsNoClient)));
         BEAST_EXPECT(!makeTestGRPCCall(tlsStubNoClient));
 
         // Test 2: TLS client WITH client certificate should succeed
         grpc::SslCredentialsOptions sslOptsWithClient;
-        sslOptsWithClient.pem_root_certs = std::string(kCA_CERT_CONTENT);
-        sslOptsWithClient.pem_cert_chain = std::string(kCLIENT_CERT_CONTENT);
-        sslOptsWithClient.pem_private_key = std::string(kCLIENT_KEY_CONTENT);
+        sslOptsWithClient.pem_root_certs = std::string(kCaCertContent);
+        sslOptsWithClient.pem_cert_chain = std::string(kClientCertContent);
+        sslOptsWithClient.pem_private_key = std::string(kClientKeyContent);
         auto tlsStubWithClient = org::xrpl::rpc::v1::XRPLedgerAPIService::NewStub(
             grpc::CreateChannel(serverAddress, grpc::SslCredentials(sslOptsWithClient)));
         BEAST_EXPECT(makeTestGRPCCall(tlsStubWithClient));
diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp
index d9670ed6a3..4b24f83180 100644
--- a/src/test/app/Invariants_test.cpp
+++ b/src/test/app/Invariants_test.cpp
@@ -255,7 +255,7 @@ class Invariants_test : public beast::unit_test::Suite
                 // Clear the balance so the "account deletion left behind a
                 // non-zero balance" check doesn't trip earlier than the desired
                 // check.
-                sle->at(sfBalance) = beast::kZERO;
+                sle->at(sfBalance) = beast::kZero;
                 ac.view().erase(sle);
                 return true;
             });
@@ -284,8 +284,8 @@ class Invariants_test : public beast::unit_test::Suite
                 // Clear the balance so the "account deletion left behind a
                 // non-zero balance" check doesn't trip earlier than the desired
                 // check.
-                sleA1->at(sfBalance) = beast::kZERO;
-                sleA2->at(sfBalance) = beast::kZERO;
+                sleA1->at(sfBalance) = beast::kZero;
+                sleA2->at(sfBalance) = beast::kZero;
                 ac.view().erase(sleA1);
                 ac.view().erase(sleA2);
                 return true;
@@ -309,7 +309,7 @@ class Invariants_test : public beast::unit_test::Suite
                 auto const sleA1 = ac.view().peek(keylet::account(a1));
                 if (!sleA1)
                     return false;
-                if (!BEAST_EXPECT(*sleA1->at(sfBalance) != beast::kZERO))
+                if (!BEAST_EXPECT(*sleA1->at(sfBalance) != beast::kZero))
                     return false;
 
                 ac.view().erase(sleA1);
@@ -331,7 +331,7 @@ class Invariants_test : public beast::unit_test::Suite
                 // Clear the balance so the "account deletion left behind a
                 // non-zero balance" check doesn't trip earlier than the desired
                 // check.
-                sleA1->at(sfBalance) = beast::kZERO;
+                sleA1->at(sfBalance) = beast::kZero;
                 BEAST_EXPECT(sleA1->at(sfOwnerCount) == 0);
                 adjustOwnerCount(ac.view(), sleA1, 1, ac.journal);
 
@@ -342,7 +342,7 @@ class Invariants_test : public beast::unit_test::Suite
             XRPAmount{},
             STTx{ttACCOUNT_DELETE, [](STObject& tx) {}});
 
-        for (auto const& keyletInfo : kDIRECT_ACCOUNT_KEYLETS)
+        for (auto const& keyletInfo : kDirectAccountKeylets)
         {
             // TODO: Use structured binding once LLVM 16 is the minimum
             // supported version. See also:
@@ -372,7 +372,7 @@ class Invariants_test : public beast::unit_test::Suite
                     // Clear the balance so the "account deletion left behind a
                     // non-zero balance" check doesn't trip earlier than the
                     // desired check.
-                    sleA1->at(sfBalance) = beast::kZERO;
+                    sleA1->at(sfBalance) = beast::kZero;
                     ac.view().erase(sleA1);
 
                     return true;
@@ -392,7 +392,7 @@ class Invariants_test : public beast::unit_test::Suite
                 // Clear the balance so the "account deletion left behind a
                 // non-zero balance" check doesn't trip earlier than the desired
                 // check.
-                sle->at(sfBalance) = beast::kZERO;
+                sle->at(sfBalance) = beast::kZero;
                 sle->at(sfOwnerCount) = 0;
                 ac.view().erase(sle);
                 return true;
@@ -427,7 +427,7 @@ class Invariants_test : public beast::unit_test::Suite
                 // Clear the balance so the "account deletion left behind a
                 // non-zero balance" check doesn't trip earlier than the desired
                 // check.
-                sle->at(sfBalance) = beast::kZERO;
+                sle->at(sfBalance) = beast::kZero;
                 sle->at(sfOwnerCount) = 0;
                 ac.view().erase(sle);
 
@@ -491,7 +491,7 @@ class Invariants_test : public beast::unit_test::Suite
                 // Clear the balance so the "account deletion left behind a
                 // non-zero balance" check doesn't trip earlier than the desired
                 // check.
-                sle->at(sfBalance) = beast::kZERO;
+                sle->at(sfBalance) = beast::kZero;
                 sle->at(sfOwnerCount) = 0;
                 ac.view().erase(sle);
 
@@ -763,7 +763,7 @@ class Invariants_test : public beast::unit_test::Suite
                     return false;
                 // Use `drops(1)` to bypass a call to STAmount::canonicalize
                 // with an invalid value
-                sle->setFieldAmount(sfBalance, kINITIAL_XRP + drops(1));
+                sle->setFieldAmount(sfBalance, kInitialXrp + drops(1));
                 BEAST_EXPECT(!sle->getFieldAmount(sfBalance).negative());
                 ac.view().update(sle);
                 return true;
@@ -797,10 +797,10 @@ class Invariants_test : public beast::unit_test::Suite
             XRPAmount{-1});
 
         doInvariantCheck(
-            {{"fee paid exceeds system limit: "s + to_string(kINITIAL_XRP)},
-             {"XRP net change of 0 doesn't match fee "s + to_string(kINITIAL_XRP)}},
+            {{"fee paid exceeds system limit: "s + to_string(kInitialXrp)},
+             {"XRP net change of 0 doesn't match fee "s + to_string(kInitialXrp)}},
             [](Account const&, Account const&, ApplyContext&) { return true; },
-            XRPAmount{kINITIAL_XRP});
+            XRPAmount{kInitialXrp});
 
         doInvariantCheck(
             {{"fee paid is 20 exceeds fee specified in transaction."},
@@ -892,7 +892,7 @@ class Invariants_test : public beast::unit_test::Suite
                 auto sleNew = std::make_shared<SLE>(keylet::escrow(a1, (*sle)[sfSequence] + 2));
                 // Use `drops(1)` to bypass a call to STAmount::canonicalize
                 // with an invalid value
-                sleNew->setFieldAmount(sfAmount, kINITIAL_XRP + drops(1));
+                sleNew->setFieldAmount(sfAmount, kInitialXrp + drops(1));
                 ac.view().insert(sleNew);
                 return true;
             });
@@ -1332,12 +1332,12 @@ class Invariants_test : public beast::unit_test::Suite
 
         testcase << "PermissionedDomain 2";
 
-        auto constexpr kTOO_BIG = kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE + 1;
+        static constexpr auto kTooBig = kMaxPermissionedDomainCredentialsArraySize + 1;
         doInvariantCheck(
             Env(*this, features),
-            {{"permissioned domain bad credentials size " + std::to_string(kTOO_BIG)}},
+            {{"permissioned domain bad credentials size " + std::to_string(kTooBig)}},
             [](Account const& a1, Account const& a2, ApplyContext& ac) {
-                return !!createPermissionedDomain(ac, a1, a2, kTOO_BIG);
+                return !!createPermissionedDomain(ac, a1, a2, kTooBig);
             },
             XRPAmount{},
             STTx{ttPERMISSIONED_DOMAIN_SET, [](STObject&) {}},
@@ -1414,16 +1414,16 @@ class Invariants_test : public beast::unit_test::Suite
         testcase << "PermissionedDomain Set 2";
         doInvariantCheck(
             Env(*this, features),
-            {{"permissioned domain bad credentials size " + std::to_string(kTOO_BIG)}},
+            {{"permissioned domain bad credentials size " + std::to_string(kTooBig)}},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // create PD
                 auto slePd = createPermissionedDomain(ac, a1, a2);
 
                 // update PD
                 {
-                    STArray credentials(sfAcceptedCredentials, kTOO_BIG);
+                    STArray credentials(sfAcceptedCredentials, kTooBig);
 
-                    for (std::size_t n = 0; n < kTOO_BIG; ++n)
+                    for (std::size_t n = 0; n < kTooBig; ++n)
                     {
                         auto cred = STObject::makeInnerObject(sfCredential);
                         cred.setAccountID(sfIssuer, a2);
@@ -2056,7 +2056,7 @@ class Invariants_test : public beast::unit_test::Suite
 
         auto const loanBrokerKeylet = keylet::loanbroker(a.id(), env.seq(a));
         // Create a Loan Broker with all default values.
-        env(set(a, vaultID), Fee(kINCREMENT));
+        env(set(a, vaultID), Fee(kIncrement));
 
         return loanBrokerKeylet;
     };
@@ -2160,7 +2160,7 @@ class Invariants_test : public beast::unit_test::Suite
                         return iouAsset;
                     }
                     case Asset::MPT: {
-                        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+                        MPTTester mptt{env, issuer, kMptInitNoFund};
                         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
                         PrettyAsset const mptAsset = mptt.issuanceID();
                         mptt.authorize({.account = alice});
@@ -2427,7 +2427,7 @@ class Invariants_test : public beast::unit_test::Suite
             std::optional<AccountAmount> accountShares = std::nullopt;
             // NOLINTEND(readability-redundant-member-init)
         };
-        auto constexpr kADJUST = [&](ApplyView& ac, xrpl::Keylet keylet, Adjustments args) {
+        constexpr auto kAdjust = [&](ApplyView& ac, xrpl::Keylet keylet, Adjustments args) {
             auto sleVault = ac.peek(keylet);
             if (!sleVault)
                 return false;
@@ -2526,7 +2526,7 @@ class Invariants_test : public beast::unit_test::Suite
             return true;
         };
 
-        constexpr auto kARGS = [](AccountID id, int adjustment, auto fn) -> Adjustments {
+        static constexpr auto kArgs = [](AccountID id, int adjustment, auto fn) -> Adjustments {
             Adjustments sample = {
                 .assetsTotal = adjustment,
                 .assetsAvailable = adjustment,
@@ -2915,9 +2915,9 @@ class Invariants_test : public beast::unit_test::Suite
                 (*sleA4)[sfBalance] = *(*sleA4)[sfBalance] + 10;
                 ac.view().update(sleA4);
 
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 0, [&](Adjustments& sample) {
-                                   sample.assetsAvailable = (kDROPS_PER_XRP * -100).value();
-                                   sample.assetsTotal = (kDROPS_PER_XRP * -200).value();
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 0, [&](Adjustments& sample) {
+                                   sample.assetsAvailable = (kDropsPerXrp * -100).value();
+                                   sample.assetsTotal = (kDropsPerXrp * -200).value();
                                    sample.sharesTotal = -1;
                                }));
             },
@@ -2980,7 +2980,7 @@ class Invariants_test : public beast::unit_test::Suite
              "set must not change assets outstanding"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 0, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 0, [&](Adjustments& sample) {
                                    sample.lossUnrealized = 13;
                                    sample.assetsTotal = 20;
                                }));
@@ -2997,7 +2997,7 @@ class Invariants_test : public beast::unit_test::Suite
              "vault transaction must not change loss unrealized"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 100, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 100, [&](Adjustments& sample) {
                                    sample.lossUnrealized = 13;
                                }));
             },
@@ -3012,7 +3012,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"set assets outstanding must not exceed assets maximum"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 0, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 0, [&](Adjustments& sample) {
                                    sample.assetsMaximum = 1;
                                }));
             },
@@ -3026,7 +3026,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"assets maximum must be positive"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 0, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 0, [&](Adjustments& sample) {
                                    sample.assetsMaximum = -1;
                                }));
             },
@@ -3072,7 +3072,7 @@ class Invariants_test : public beast::unit_test::Suite
                 (*sleShares)[sfMaximumAmount] = 10;
                 ac.view().update(sleShares);
 
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [](Adjustments&) {}));
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [](Adjustments&) {}));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject&) {}},
@@ -3084,7 +3084,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"updated shares must not exceed maximum"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [](Adjustments&) {}));
+                kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [](Adjustments&) {}));
 
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
@@ -3092,7 +3092,7 @@ class Invariants_test : public beast::unit_test::Suite
                 auto sleShares = ac.view().peek(keylet::mptIssuance((*sleVault)[sfShareMPTID]));
                 if (!sleShares)
                     return false;
-                (*sleShares)[sfOutstandingAmount] = kMAX_MP_TOKEN_AMOUNT + 1;
+                (*sleShares)[sfOutstandingAmount] = kMaxMpTokenAmount + 1;
                 ac.view().update(sleShares);
                 return true;
             },
@@ -3309,7 +3309,7 @@ class Invariants_test : public beast::unit_test::Suite
                 sleVault->at(sfAssetsAvailable) = Number(0);
                 sleVault->at(sfLossUnrealized) = Number(0);
                 sleVault->at(sfShareMPTID) = sharesMptId;
-                sleVault->at(sfWithdrawalPolicy) = kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE;
+                sleVault->at(sfWithdrawalPolicy) = kVaultStrategyFirstComeFirstServe;
 
                 ac.view().insert(sleVault);
                 ac.view().insert(sleShares);
@@ -3369,7 +3369,7 @@ class Invariants_test : public beast::unit_test::Suite
                 sleVault->at(sfAssetsAvailable) = Number(0);
                 sleVault->at(sfLossUnrealized) = Number(0);
                 sleVault->at(sfShareMPTID) = sharesMptId;
-                sleVault->at(sfWithdrawalPolicy) = kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE;
+                sleVault->at(sfWithdrawalPolicy) = kVaultStrategyFirstComeFirstServe;
 
                 ac.view().insert(sleVault);
                 ac.view().insert(sleShares);
@@ -3410,7 +3410,7 @@ class Invariants_test : public beast::unit_test::Suite
                 sleVault->at(sfAssetsAvailable) = Number(0);
                 sleVault->at(sfLossUnrealized) = Number(0);
                 sleVault->at(sfShareMPTID) = sharesMptId;
-                sleVault->at(sfWithdrawalPolicy) = kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE;
+                sleVault->at(sfWithdrawalPolicy) = kVaultStrategyFirstComeFirstServe;
 
                 ac.view().insert(sleVault);
                 ac.view().insert(sleShares);
@@ -3425,7 +3425,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"deposit must change vault balance"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 0, [](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 0, [](Adjustments& sample) {
                                    sample.vaultAssets.reset();
                                }));
             },
@@ -3438,7 +3438,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"deposit assets outstanding must not exceed assets maximum"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 200, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 200, [&](Adjustments& sample) {
                                    sample.assetsMaximum = 1;
                                }));
             },
@@ -3465,7 +3465,7 @@ class Invariants_test : public beast::unit_test::Suite
                 (*sleA4)[sfBalance] = *(*sleA4)[sfBalance] + 10;
                 ac.view().update(sleA4);
 
-                return kADJUST(ac.view(), keylet, kARGS(a3.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a3.id(), -10, [&](Adjustments& sample) {
                                    sample.accountAssets->amount = -100;
                                }));
             },
@@ -3495,7 +3495,7 @@ class Invariants_test : public beast::unit_test::Suite
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] + 10;
                 ac.view().update(sleA3);
 
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [&](Adjustments& sample) {
                                    sample.vaultAssets = -20;
                                    sample.accountAssets->amount = 10;
                                }));
@@ -3518,7 +3518,7 @@ class Invariants_test : public beast::unit_test::Suite
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] - 10;
                 ac.view().update(sleA3);
 
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [&](Adjustments& sample) {
                                    sample.accountAssets->amount = 0;
                                }));
             },
@@ -3532,7 +3532,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"deposit must change depositor shares"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [&](Adjustments& sample) {
                                    sample.accountShares.reset();
                                }));
             },
@@ -3547,7 +3547,7 @@ class Invariants_test : public beast::unit_test::Suite
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
 
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [](Adjustments& sample) {
                                    sample.sharesTotal = 0;
                                }));
             },
@@ -3564,7 +3564,7 @@ class Invariants_test : public beast::unit_test::Suite
              "amount"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [&](Adjustments& sample) {
                                    sample.accountShares->amount = -5;
                                    sample.sharesTotal = -10;
                                }));
@@ -3583,7 +3583,7 @@ class Invariants_test : public beast::unit_test::Suite
                 ac.view().update(sleA3);
 
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [&](Adjustments& sample) {
                                    sample.assetsTotal = 11;
                                }));
             },
@@ -3604,7 +3604,7 @@ class Invariants_test : public beast::unit_test::Suite
              "deposit and assets available must add up"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 10, [&](Adjustments& sample) {
                                    sample.assetsTotal = 7;
                                    sample.assetsAvailable = 7;
                                }));
@@ -3620,7 +3620,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"withdrawal must change vault balance"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 0, [](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 0, [](Adjustments& sample) {
                                    sample.vaultAssets.reset();
                                }));
             },
@@ -3645,7 +3645,7 @@ class Invariants_test : public beast::unit_test::Suite
                 (*sleA4)[sfBalance] = *(*sleA4)[sfBalance] + 10;
                 ac.view().update(sleA4);
 
-                return kADJUST(ac.view(), keylet, kARGS(a3.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a3.id(), -10, [&](Adjustments& sample) {
                                    sample.accountAssets->amount = -100;
                                }));
             },
@@ -3679,7 +3679,7 @@ class Invariants_test : public beast::unit_test::Suite
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] + 10;
                 ac.view().update(sleA3);
 
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), -10, [&](Adjustments& sample) {
                                    sample.vaultAssets = 10;
                                    sample.accountAssets->amount = -20;
                                }));
@@ -3694,7 +3694,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"withdrawal must change one destination balance"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                if (!kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                if (!kAdjust(ac.view(), keylet, kArgs(a2.id(), -10, [&](Adjustments& sample) {
                                  *sample.vaultAssets -= 5;
                              })))
                     return false;
@@ -3715,7 +3715,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"withdrawal must change depositor shares"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), -10, [&](Adjustments& sample) {
                                    sample.accountShares.reset();
                                }));
             },
@@ -3729,7 +3729,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"withdrawal must change vault shares"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), -10, [](Adjustments& sample) {
                                    sample.sharesTotal = 0;
                                }));
             },
@@ -3745,7 +3745,7 @@ class Invariants_test : public beast::unit_test::Suite
              "amount"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), -10, [&](Adjustments& sample) {
                                    sample.accountShares->amount = 5;
                                    sample.sharesTotal = 10;
                                }));
@@ -3761,7 +3761,7 @@ class Invariants_test : public beast::unit_test::Suite
              "withdrawal and assets available must add up"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), -10, [&](Adjustments& sample) {
                                    sample.assetsTotal = -15;
                                    sample.assetsAvailable = -15;
                                }));
@@ -3780,7 +3780,7 @@ class Invariants_test : public beast::unit_test::Suite
                 ac.view().update(sleA3);
 
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), -10, [&](Adjustments& sample) {
                                    sample.assetsTotal = -7;
                                }));
             },
@@ -3848,7 +3848,7 @@ class Invariants_test : public beast::unit_test::Suite
              "amount"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq() - 2);
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), -10, [&](Adjustments& sample) {
                                    sample.accountShares->amount = 5;
                                }));
             },
@@ -3863,7 +3863,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"clawback must change vault balance"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq() - 2);
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -1, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), -1, [&](Adjustments& sample) {
                                    sample.vaultAssets.reset();
                                }));
             },
@@ -3877,7 +3877,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"clawback may only be performed by the asset issuer"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq());
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 0, [&](Adjustments& sample) {}));
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 0, [&](Adjustments& sample) {}));
             },
             XRPAmount{},
             STTx{ttVAULT_CLAWBACK, [](STObject&) {}},
@@ -3889,7 +3889,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"clawback may only be performed by the asset issuer"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq() - 2);
-                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 0, [&](Adjustments& sample) {}));
+                return kAdjust(ac.view(), keylet, kArgs(a2.id(), 0, [&](Adjustments& sample) {}));
             },
             XRPAmount{},
             STTx{ttVAULT_CLAWBACK, [&](STObject& tx) { tx[sfAccount] = a4.id(); }},
@@ -3902,7 +3902,7 @@ class Invariants_test : public beast::unit_test::Suite
              "clawback must change vault shares"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq() - 2);
-                return kADJUST(ac.view(), keylet, kARGS(a4.id(), 10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a4.id(), 10, [&](Adjustments& sample) {
                                    sample.sharesTotal = 0;
                                }));
             },
@@ -3920,7 +3920,7 @@ class Invariants_test : public beast::unit_test::Suite
             {"clawback must change holder shares"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq() - 2);
-                return kADJUST(ac.view(), keylet, kARGS(a4.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a4.id(), -10, [&](Adjustments& sample) {
                                    sample.accountShares.reset();
                                }));
             },
@@ -3940,7 +3940,7 @@ class Invariants_test : public beast::unit_test::Suite
              "clawback and assets available must add up"},
             [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const keylet = keylet::vault(a1.id(), ac.view().seq() - 2);
-                return kADJUST(ac.view(), keylet, kARGS(a4.id(), -10, [&](Adjustments& sample) {
+                return kAdjust(ac.view(), keylet, kArgs(a4.id(), -10, [&](Adjustments& sample) {
                                    sample.accountShares->amount = -8;
                                    sample.assetsTotal = -7;
                                    sample.assetsAvailable = -7;
@@ -4226,8 +4226,8 @@ class Invariants_test : public beast::unit_test::Suite
 
                 MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
-                // outstanding exceeds kMAX_MP_TOKEN_AMOUNT -> checkAmount sets bad_
-                sleNew->setFieldU64(sfOutstandingAmount, kMAX_MP_TOKEN_AMOUNT + 1);
+                // outstanding exceeds kMaxMpTokenAmount -> checkAmount sets bad_
+                sleNew->setFieldU64(sfOutstandingAmount, kMaxMpTokenAmount + 1);
                 // locked is valid and <= outstanding -> must NOT clear bad_
                 sleNew->setFieldU64(sfLockedAmount, 10);
                 ac.view().insert(sleNew);
diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp
index 396ec8db2d..e464962258 100644
--- a/src/test/app/LedgerHistory_test.cpp
+++ b/src/test/app/LedgerHistory_test.cpp
@@ -48,7 +48,7 @@ public:
         {
             assert(!stx);
             return std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp
index fac798f14b..4b1e4510d6 100644
--- a/src/test/app/LedgerReplay_test.cpp
+++ b/src/test/app/LedgerReplay_test.cpp
@@ -291,8 +291,8 @@ public:
     [[nodiscard]] uint256 const&
     getClosedLedgerHash() const override
     {
-        static uint256 const kHASH{};
-        return kHASH;
+        static uint256 const kHash{};
+        return kHash;
     }
     [[nodiscard]] bool
     hasLedger(uint256 const& hash, std::uint32_t seq) const override
@@ -445,8 +445,8 @@ struct TestPeerSet : public PeerSet
     [[nodiscard]] std::set<Peer::id_t> const&
     getPeerIds() const override
     {
-        static std::set<Peer::id_t> const kEMPTY_PEERS;
-        return kEMPTY_PEERS;
+        static std::set<Peer::id_t> const kEmptyPeers;
+        return kEmptyPeers;
     }
 
     LedgerReplayMsgHandler& local;
@@ -561,9 +561,9 @@ struct LedgerServer
                     accounts[toIdx],
                     jtx::drops(ledgerMaster.getClosedLedger()->fees().base) +
                         jtx::XRP(param.txAmount)),
-                jtx::Seq(jtx::kAUTOFILL),
-                jtx::Fee(jtx::kAUTOFILL),
-                jtx::Sig(jtx::kAUTOFILL));
+                jtx::Seq(jtx::kAutofill),
+                jtx::Fee(jtx::kAutofill),
+                jtx::Sig(jtx::kAutofill));
         }
         env.close();
     }
@@ -1095,8 +1095,7 @@ struct LedgerReplayer_test : public beast::unit_test::Suite
             http_request_type httpRequest;
             httpRequest.version(request.version());
             httpRequest.base() = request.base();
-            bool const serverResult =
-                peerFeatureEnabled(httpRequest, kFEATURE_LEDGER_REPLAY, server);
+            bool const serverResult = peerFeatureEnabled(httpRequest, kFeatureLedgerReplay, server);
             if (serverResult != expecting)
                 return false;
 
@@ -1105,7 +1104,7 @@ struct LedgerReplayer_test : public beast::unit_test::Suite
             serverEnv.app().config().LEDGER_REPLAY = server;
             auto httpResp = xrpl::makeResponse(
                 true, httpRequest, addr, addr, uint256{1}, 1, {1, 0}, serverEnv.app());
-            auto const clientResult = peerFeatureEnabled(httpResp, kFEATURE_LEDGER_REPLAY, client);
+            auto const clientResult = peerFeatureEnabled(httpResp, kFeatureLedgerReplay, client);
             return clientResult == expecting;
         };
 
diff --git a/src/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp
index 1122ac4ad6..528e90321b 100644
--- a/src/test/app/LoadFeeTrack_test.cpp
+++ b/src/test/app/LoadFeeTrack_test.cpp
@@ -18,8 +18,8 @@ public:
             Fees const fees = [&]() {
                 Fees f;
                 f.base = d.FEES.reference_fee;
-                f.reserve = 200 * kDROPS_PER_XRP;
-                f.increment = 50 * kDROPS_PER_XRP;
+                f.reserve = 200 * kDropsPerXrp;
+                f.increment = 50 * kDropsPerXrp;
                 return f;
             }();
 
@@ -31,8 +31,8 @@ public:
             Fees const fees = [&]() {
                 Fees f;
                 f.base = d.FEES.reference_fee * 10;
-                f.reserve = 200 * kDROPS_PER_XRP;
-                f.increment = 50 * kDROPS_PER_XRP;
+                f.reserve = 200 * kDropsPerXrp;
+                f.increment = 50 * kDropsPerXrp;
                 return f;
             }();
 
@@ -44,8 +44,8 @@ public:
             Fees const fees = [&]() {
                 Fees f;
                 f.base = d.FEES.reference_fee;
-                f.reserve = 200 * kDROPS_PER_XRP;
-                f.increment = 50 * kDROPS_PER_XRP;
+                f.reserve = 200 * kDropsPerXrp;
+                f.increment = 50 * kDropsPerXrp;
                 return f;
             }();
 
diff --git a/src/test/app/LoanBroker_test.cpp b/src/test/app/LoanBroker_test.cpp
index 29ae4b8d59..a7e036a621 100644
--- a/src/test/app/LoanBroker_test.cpp
+++ b/src/test/app/LoanBroker_test.cpp
@@ -99,11 +99,11 @@ class LoanBroker_test : public beast::unit_test::Suite
             env(coverWithdraw(alice, brokerKeylet.key, asset(1000)), Ter(temDISABLED));
             // 3. LoanBrokerCoverClawback
             env(coverClawback(alice), Ter(temDISABLED));
-            env(coverClawback(alice), kLOAN_BROKER_ID(brokerKeylet.key), Ter(temDISABLED));
-            env(coverClawback(alice), kAMOUNT(asset(0)), Ter(temDISABLED));
+            env(coverClawback(alice), kLoanBrokerId(brokerKeylet.key), Ter(temDISABLED));
+            env(coverClawback(alice), kAmount(asset(0)), Ter(temDISABLED));
             env(coverClawback(alice),
-                kLOAN_BROKER_ID(brokerKeylet.key),
-                kAMOUNT(asset(1000)),
+                kLoanBrokerId(brokerKeylet.key),
+                kAmount(asset(1000)),
                 Ter(temDISABLED));
             // 4. LoanBrokerDelete
             env(del(alice, brokerKeylet.key), Ter(temDISABLED));
@@ -166,15 +166,15 @@ class LoanBroker_test : public beast::unit_test::Suite
         using namespace loanBroker;
 
         // Bogus assets to use in test cases
-        static PrettyAsset const kBAD_MPT_ASSET = [&]() {
-            MPTTester badMptt{env, evan, kMPT_INIT_NO_FUND};
+        static PrettyAsset const kBadMptAsset = [&]() {
+            MPTTester badMptt{env, evan, kMptInitNoFund};
             badMptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
             env.close();
             return badMptt["BAD"];
         }();
-        static PrettyAsset const kBAD_IOU_ASSET = evan["BAD"];
-        static Account const kNON_EXISTENT{"NonExistent"};
-        static PrettyAsset const kGHOST_IOU_ASSET = kNON_EXISTENT["GST"];
+        static PrettyAsset const kBadIouAsset = evan["BAD"];
+        static Account const kNonExistent{"NonExistent"};
+        static PrettyAsset const kGhostIouAsset = kNonExistent["GST"];
         PrettyAsset const vaultPseudoIouAsset = vault.pseudoAccount["PSD"];
 
         auto const badKeylet = keylet::loanbroker(alice.id(), env.seq(alice));
@@ -235,7 +235,7 @@ class LoanBroker_test : public beast::unit_test::Suite
                 BEAST_EXPECT(
                     pseudo->at(sfFlags) == (lsfDisableMaster | lsfDefaultRipple | lsfDepositAuth));
                 BEAST_EXPECT(pseudo->at(sfSequence) == 0);
-                BEAST_EXPECT(pseudo->at(sfBalance) == beast::kZERO);
+                BEAST_EXPECT(pseudo->at(sfBalance) == beast::kZero);
                 BEAST_EXPECT(pseudo->at(sfOwnerCount) == (vault.asset.raw().native() ? 0 : 1));
                 BEAST_EXPECT(!pseudo->isFieldPresent(sfAccountTxnID));
                 BEAST_EXPECT(!pseudo->isFieldPresent(sfRegularKey));
@@ -300,41 +300,41 @@ class LoanBroker_test : public beast::unit_test::Suite
             // Test cover clawback failure cases BEFORE depositing any cover
             // Need one of brokerID or amount
             env(coverClawback(alice), Ter(temINVALID));
-            env(coverClawback(alice), kLOAN_BROKER_ID(uint256(0)), Ter(temINVALID));
-            env(coverClawback(alice), kAMOUNT(XRP(1000)), Ter(temBAD_AMOUNT));
-            env(coverClawback(alice), kAMOUNT(vault.asset(-10)), Ter(temBAD_AMOUNT));
+            env(coverClawback(alice), kLoanBrokerId(uint256(0)), Ter(temINVALID));
+            env(coverClawback(alice), kAmount(XRP(1000)), Ter(temBAD_AMOUNT));
+            env(coverClawback(alice), kAmount(vault.asset(-10)), Ter(temBAD_AMOUNT));
             // Clawbacks with an MPT need to specify the broker ID
-            env(coverClawback(alice), kAMOUNT(kBAD_MPT_ASSET(1)), Ter(temINVALID));
-            env(coverClawback(evan), kLOAN_BROKER_ID(vault.vaultID), Ter(tecNO_ENTRY));
+            env(coverClawback(alice), kAmount(kBadMptAsset(1)), Ter(temINVALID));
+            env(coverClawback(evan), kLoanBrokerId(vault.vaultID), Ter(tecNO_ENTRY));
             // Only the issuer can clawback
-            env(coverClawback(alice), kLOAN_BROKER_ID(keylet.key), Ter(tecNO_PERMISSION));
+            env(coverClawback(alice), kLoanBrokerId(keylet.key), Ter(tecNO_PERMISSION));
             if (vault.asset.raw().native())
             {
                 // Can not clawback XRP under any circumstances
-                env(coverClawback(issuer), kLOAN_BROKER_ID(keylet.key), Ter(tecNO_PERMISSION));
+                env(coverClawback(issuer), kLoanBrokerId(keylet.key), Ter(tecNO_PERMISSION));
             }
             else
             {
                 if (vault.asset.raw().holds<Issue>())
                 {
-                    // Clawbacks without a kLOAN_BROKER_ID need to specify an IOU
+                    // Clawbacks without a kLoanBrokerId need to specify an IOU
                     // with the broker's pseudo-account as the issuer
-                    env(coverClawback(alice), kAMOUNT(kGHOST_IOU_ASSET(1)), Ter(tecNO_ENTRY));
-                    env(coverClawback(alice), kAMOUNT(kBAD_IOU_ASSET(1)), Ter(tecOBJECT_NOT_FOUND));
+                    env(coverClawback(alice), kAmount(kGhostIouAsset(1)), Ter(tecNO_ENTRY));
+                    env(coverClawback(alice), kAmount(kBadIouAsset(1)), Ter(tecOBJECT_NOT_FOUND));
                     // Pseudo-account is not for a broker
                     env(coverClawback(alice),
-                        kAMOUNT(vaultPseudoIouAsset(1)),
+                        kAmount(vaultPseudoIouAsset(1)),
                         Ter(tecOBJECT_NOT_FOUND));
                     // If we specify a pseudo-account as the IOU amount, it
                     // needs to match the loan broker
                     env(coverClawback(issuer),
-                        kLOAN_BROKER_ID(keylet.key),
-                        kAMOUNT(badBrokerPseudoIouAsset(10)),
+                        kLoanBrokerId(keylet.key),
+                        kAmount(badBrokerPseudoIouAsset(10)),
                         Ter(tecWRONG_ASSET));
                     PrettyAsset const brokerWrongCurrencyAsset = pseudoAccount["WAT"];
                     env(coverClawback(issuer),
-                        kLOAN_BROKER_ID(keylet.key),
-                        kAMOUNT(brokerWrongCurrencyAsset(10)),
+                        kLoanBrokerId(keylet.key),
+                        kAmount(brokerWrongCurrencyAsset(10)),
                         Ter(tecWRONG_ASSET));
                 }
                 else
@@ -342,13 +342,13 @@ class LoanBroker_test : public beast::unit_test::Suite
                     // Clawbacks with an MPT need to specify the broker ID, even
                     // if the asset is valid
                     BEAST_EXPECT(vault.asset.raw().holds<MPTIssue>());
-                    env(coverClawback(alice), kAMOUNT(vault.asset(10)), Ter(temINVALID));
+                    env(coverClawback(alice), kAmount(vault.asset(10)), Ter(temINVALID));
                 }
                 // Since no cover has been deposited, there's nothing to claw
                 // back
                 env(coverClawback(issuer),
-                    kLOAN_BROKER_ID(keylet.key),
-                    kAMOUNT(vault.asset(10)),
+                    kLoanBrokerId(keylet.key),
+                    kAmount(vault.asset(10)),
                     Ter(tecINSUFFICIENT_FUNDS));
             }
             env.close();
@@ -371,13 +371,13 @@ class LoanBroker_test : public beast::unit_test::Suite
             {
                 TER const expected = vault.asset.raw().holds<MPTIssue>() ? tecNO_AUTH : tecNO_LINE;
                 env(coverWithdraw(alice, keylet.key, vault.asset(1)),
-                    kDESTINATION(bystander),
+                    kDestination(bystander),
                     Ter(expected));
             }
 
             // Can not withdraw to the zero address
             env(coverWithdraw(alice, keylet.key, vault.asset(1)),
-                kDESTINATION(AccountID{}),
+                kDestination(AccountID{}),
                 Ter(temMALFORMED));
 
             // Withdraw some of the cover amount
@@ -392,20 +392,20 @@ class LoanBroker_test : public beast::unit_test::Suite
 
             // Withdraw some more. Send it to Evan. Very generous, considering
             // how much trouble he's been.
-            env(coverWithdraw(alice, keylet.key, vault.asset(1)), kDESTINATION(evan));
+            env(coverWithdraw(alice, keylet.key, vault.asset(1)), kDestination(evan));
             env.close();
             verifyCoverAmount(7);
 
             // Withdraw some more. Send it to Evan. Very generous, considering
             // how much trouble he's been.
-            env(coverWithdraw(alice, keylet.key, vault.asset(1)), kDESTINATION(evan), Dtag(3));
+            env(coverWithdraw(alice, keylet.key, vault.asset(1)), kDestination(evan), Dtag(3));
             env.close();
             verifyCoverAmount(6);
 
             if (!vault.asset.raw().native())
             {
                 // Issuer claws back some of the cover
-                env(coverClawback(issuer), kLOAN_BROKER_ID(keylet.key), kAMOUNT(vault.asset(2)));
+                env(coverClawback(issuer), kLoanBrokerId(keylet.key), kAmount(vault.asset(2)));
                 env.close();
                 verifyCoverAmount(4);
 
@@ -419,32 +419,32 @@ class LoanBroker_test : public beast::unit_test::Suite
                          // defer autofills until submission time
                          env.json(
                              coverClawback(issuer),
-                             kLOAN_BROKER_ID(keylet.key),
-                             Fee(kNONE),
-                             Seq(kNONE),
-                             Sig(kNONE)),
+                             kLoanBrokerId(keylet.key),
+                             Fee(kNone),
+                             Seq(kNone),
+                             Sig(kNone)),
                          env.json(
                              coverClawback(issuer),
-                             kLOAN_BROKER_ID(keylet.key),
-                             kAMOUNT(vault.asset(0)),
-                             Fee(kNONE),
-                             Seq(kNONE),
-                             Sig(kNONE)),
+                             kLoanBrokerId(keylet.key),
+                             kAmount(vault.asset(0)),
+                             Fee(kNone),
+                             Seq(kNone),
+                             Sig(kNone)),
                          env.json(
                              coverClawback(issuer),
-                             kLOAN_BROKER_ID(keylet.key),
-                             kAMOUNT(vault.asset(6)),
-                             Fee(kNONE),
-                             Seq(kNONE),
-                             Sig(kNONE)),
+                             kLoanBrokerId(keylet.key),
+                             kAmount(vault.asset(6)),
+                             Fee(kNone),
+                             Seq(kNone),
+                             Sig(kNone)),
                          // amount will be truncated to what's available
                          env.json(
                              coverClawback(issuer),
-                             kLOAN_BROKER_ID(keylet.key),
-                             kAMOUNT(vault.asset(100)),
-                             Fee(kNONE),
-                             Seq(kNONE),
-                             Sig(kNONE)),
+                             kLoanBrokerId(keylet.key),
+                             kAmount(vault.asset(100)),
+                             Fee(kNone),
+                             Seq(kNone),
+                             Sig(kNone)),
                      })
                 {
                     // Issuer claws it all back
@@ -460,7 +460,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             }
 
             // no-op
-            env(set(alice, vault.vaultID), kLOAN_BROKER_ID(keylet.key));
+            env(set(alice, vault.vaultID), kLoanBrokerId(keylet.key));
             env.close();
 
             // Make modifications to the broker
@@ -477,9 +477,9 @@ class LoanBroker_test : public beast::unit_test::Suite
             // Debt maximum: explicit 0
             // Data: explicit empty
             env(set(alice, vault.vaultID),
-                kLOAN_BROKER_ID(broker->key()),
-                kDEBT_MAXIMUM(Number(0)),
-                kDATA(""));
+                kLoanBrokerId(broker->key()),
+                kDebtMaximum(Number(0)),
+                kData(""));
             env.close();
 
             // Check the updated fields
@@ -504,7 +504,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             auto const aliceBalance = env.balance(alice, vault.asset);
             auto const coverFunds = env.balance(pseudoAccount, vault.asset);
             BEAST_EXPECT(coverFunds.number() == broker->at(sfCoverAvailable));
-            BEAST_EXPECT(coverFunds != beast::kZERO);
+            BEAST_EXPECT(coverFunds != beast::kZero);
             verifyCoverAmount(6);
 
             // delete the broker
@@ -530,7 +530,7 @@ class LoanBroker_test : public beast::unit_test::Suite
                 (aliceBalance.value().native() ? STAmount(env.current()->fees().base.value())
                                                : vault.asset(0));
             env.require(Balance(alice, expectedBalance));
-            env.require(Balance(pseudoAccount, vault.asset(kNONE)));
+            env.require(Balance(pseudoAccount, vault.asset(kNone)));
         }
     }
 
@@ -572,7 +572,7 @@ class LoanBroker_test : public beast::unit_test::Suite
         env(pay(issuer, alice, iouAsset(100'000)));
         env.close();
 
-        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mptt{env, issuer, kMptInitNoFund};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
         env.close();
         PrettyAsset const mptAsset = mptt["MPT"];
@@ -653,58 +653,56 @@ class LoanBroker_test : public beast::unit_test::Suite
             // field length validation
             // sfData: good length, bad account
             env(set(evan, vault.vaultID),
-                kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH, 'X')),
+                kData(std::string(kMaxDataPayloadLength, 'X')),
                 Ter(tecNO_PERMISSION));
             // sfData: too long
             env(set(evan, vault.vaultID),
-                kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH + 1, 'Y')),
+                kData(std::string(kMaxDataPayloadLength + 1, 'Y')),
                 Ter(temINVALID));
             // sfManagementFeeRate: good value, bad account
             env(set(evan, vault.vaultID),
-                kMANAGEMENT_FEE_RATE(kMAX_MANAGEMENT_FEE_RATE),
+                kManagementFeeRate(kMaxManagementFeeRate),
                 Ter(tecNO_PERMISSION));
             // sfManagementFeeRate: too big
             env(set(evan, vault.vaultID),
-                kMANAGEMENT_FEE_RATE(kMAX_MANAGEMENT_FEE_RATE + TenthBips16(10)),
+                kManagementFeeRate(kMaxManagementFeeRate + TenthBips16(10)),
                 Ter(temINVALID));
             // sfCoverRateMinimum and sfCoverRateLiquidation are linked
             // Cover: good value, bad account
             env(set(evan, vault.vaultID),
-                kCOVER_RATE_MINIMUM(kMAX_COVER_RATE),
-                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE),
+                kCoverRateMinimum(kMaxCoverRate),
+                kCoverRateLiquidation(kMaxCoverRate),
                 Ter(tecNO_PERMISSION));
             // CoverMinimum: too big
             env(set(evan, vault.vaultID),
-                kCOVER_RATE_MINIMUM(kMAX_COVER_RATE + 1),
-                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE + 1),
+                kCoverRateMinimum(kMaxCoverRate + 1),
+                kCoverRateLiquidation(kMaxCoverRate + 1),
                 Ter(temINVALID));
             // CoverLiquidation: too big
             env(set(evan, vault.vaultID),
-                kCOVER_RATE_MINIMUM(kMAX_COVER_RATE / 2),
-                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE + 1),
+                kCoverRateMinimum(kMaxCoverRate / 2),
+                kCoverRateLiquidation(kMaxCoverRate + 1),
                 Ter(temINVALID));
             // Cover: zero min, non-zero liquidation - implicit and
             // explicit zero values.
+            env(set(evan, vault.vaultID), kCoverRateLiquidation(kMaxCoverRate), Ter(temINVALID));
             env(set(evan, vault.vaultID),
-                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE),
-                Ter(temINVALID));
-            env(set(evan, vault.vaultID),
-                kCOVER_RATE_MINIMUM(tenthBipsZero),
-                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE),
+                kCoverRateMinimum(tenthBipsZero),
+                kCoverRateLiquidation(kMaxCoverRate),
                 Ter(temINVALID));
             // Cover: non-zero min, zero liquidation - implicit and
             // explicit zero values.
-            env(set(evan, vault.vaultID), kCOVER_RATE_MINIMUM(kMAX_COVER_RATE), Ter(temINVALID));
+            env(set(evan, vault.vaultID), kCoverRateMinimum(kMaxCoverRate), Ter(temINVALID));
             env(set(evan, vault.vaultID),
-                kCOVER_RATE_MINIMUM(kMAX_COVER_RATE),
-                kCOVER_RATE_LIQUIDATION(tenthBipsZero),
+                kCoverRateMinimum(kMaxCoverRate),
+                kCoverRateLiquidation(tenthBipsZero),
                 Ter(temINVALID));
             // sfDebtMaximum: good value, bad account
-            env(set(evan, vault.vaultID), kDEBT_MAXIMUM(Number(0)), Ter(tecNO_PERMISSION));
+            env(set(evan, vault.vaultID), kDebtMaximum(Number(0)), Ter(tecNO_PERMISSION));
             // sfDebtMaximum: overflow
-            env(set(evan, vault.vaultID), kDEBT_MAXIMUM(Number(1, 100)), Ter(temINVALID));
+            env(set(evan, vault.vaultID), kDebtMaximum(Number(1, 100)), Ter(temINVALID));
             // sfDebtMaximum: negative
-            env(set(evan, vault.vaultID), kDEBT_MAXIMUM(Number(-1)), Ter(temINVALID));
+            env(set(evan, vault.vaultID), kDebtMaximum(Number(-1)), Ter(temINVALID));
 
             std::string testData;
             lifecycle(
@@ -739,61 +737,57 @@ class LoanBroker_test : public beast::unit_test::Suite
 
                     // fields that can't be changed
                     // LoanBrokerID
-                    env(set(alice, vault.vaultID),
-                        kLOAN_BROKER_ID(nextKeylet.key),
-                        Ter(tecNO_ENTRY));
+                    env(set(alice, vault.vaultID), kLoanBrokerId(nextKeylet.key), Ter(tecNO_ENTRY));
                     // VaultID
-                    env(set(alice, nextKeylet.key),
-                        kLOAN_BROKER_ID(broker->key()),
-                        Ter(tecNO_ENTRY));
+                    env(set(alice, nextKeylet.key), kLoanBrokerId(broker->key()), Ter(tecNO_ENTRY));
                     // Owner
                     env(set(evan, vault.vaultID),
-                        kLOAN_BROKER_ID(broker->key()),
+                        kLoanBrokerId(broker->key()),
                         Ter(tecNO_PERMISSION));
                     // ManagementFeeRate
                     env(set(alice, vault.vaultID),
-                        kLOAN_BROKER_ID(broker->key()),
-                        kMANAGEMENT_FEE_RATE(kMAX_MANAGEMENT_FEE_RATE),
+                        kLoanBrokerId(broker->key()),
+                        kManagementFeeRate(kMaxManagementFeeRate),
                         Ter(temINVALID));
                     // CoverRateMinimum
                     env(set(alice, vault.vaultID),
-                        kLOAN_BROKER_ID(broker->key()),
-                        kCOVER_RATE_MINIMUM(kMAX_MANAGEMENT_FEE_RATE),
+                        kLoanBrokerId(broker->key()),
+                        kCoverRateMinimum(kMaxManagementFeeRate),
                         Ter(temINVALID));
                     // CoverRateLiquidation
                     env(set(alice, vault.vaultID),
-                        kLOAN_BROKER_ID(broker->key()),
-                        kCOVER_RATE_LIQUIDATION(kMAX_MANAGEMENT_FEE_RATE),
+                        kLoanBrokerId(broker->key()),
+                        kCoverRateLiquidation(kMaxManagementFeeRate),
                         Ter(temINVALID));
 
                     // fields that can be changed
                     testData = "Test Data 1234";
                     // Bad data: too long
                     env(set(alice, vault.vaultID),
-                        kLOAN_BROKER_ID(broker->key()),
-                        kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH + 1, 'W')),
+                        kLoanBrokerId(broker->key()),
+                        kData(std::string(kMaxDataPayloadLength + 1, 'W')),
                         Ter(temINVALID));
 
                     // Bad debt maximum
                     env(set(alice, vault.vaultID),
-                        kLOAN_BROKER_ID(broker->key()),
-                        kDEBT_MAXIMUM(Number(-175, -1)),
+                        kLoanBrokerId(broker->key()),
+                        kDebtMaximum(Number(-175, -1)),
                         Ter(temINVALID));
                     Number debtMax{175, -1};
                     if (vault.asset.integral())
                     {
                         env(set(alice, vault.vaultID),
-                            kLOAN_BROKER_ID(broker->key()),
-                            kDATA(testData),
-                            kDEBT_MAXIMUM(debtMax),
+                            kLoanBrokerId(broker->key()),
+                            kData(testData),
+                            kDebtMaximum(debtMax),
                             Ter(tecPRECISION_LOSS));
                         roundToAsset(vault.asset, debtMax);
                     }
                     // Data & Debt maximum
                     env(set(alice, vault.vaultID),
-                        kLOAN_BROKER_ID(broker->key()),
-                        kDATA(testData),
-                        kDEBT_MAXIMUM(debtMax));
+                        kLoanBrokerId(broker->key()),
+                        kData(testData),
+                        kDebtMaximum(debtMax));
                 },
                 [&](SLE::const_ref broker) {
                     // Check the updated fields
@@ -816,15 +810,15 @@ class LoanBroker_test : public beast::unit_test::Suite
                 badVault,
                 [&](jtx::JTx const& jv) {
                     testData = "spam spam spam spam";
-                    // Finally, create another Loan Broker with kNONE of the
+                    // Finally, create another Loan Broker with kNone of the
                     // values at default
                     return env.jt(
                         jv,
-                        kDATA(testData),
-                        kMANAGEMENT_FEE_RATE(TenthBips16(123)),
-                        kDEBT_MAXIMUM(Number(9)),
-                        kCOVER_RATE_MINIMUM(TenthBips32(100)),
-                        kCOVER_RATE_LIQUIDATION(TenthBips32(200)));
+                        kData(testData),
+                        kManagementFeeRate(TenthBips16(123)),
+                        kDebtMaximum(Number(9)),
+                        kCoverRateMinimum(TenthBips32(100)),
+                        kCoverRateLiquidation(TenthBips32(200)));
                 },
                 [&](SLE::const_ref broker) {
                     // Extra checks
@@ -837,9 +831,9 @@ class LoanBroker_test : public beast::unit_test::Suite
                 [&](SLE::const_ref broker) {
                     // Reset Data & Debt maximum to default values
                     env(set(alice, vault.vaultID),
-                        kLOAN_BROKER_ID(broker->key()),
-                        kDATA(""),
-                        kDEBT_MAXIMUM(Number(0)));
+                        kLoanBrokerId(broker->key()),
+                        kData(""),
+                        kDebtMaximum(Number(0)));
                 },
                 [&](SLE::const_ref broker) {
                     // Check the updated fields
@@ -963,7 +957,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             // preclaim: tecNO_DST
             Account const bogus{"bogus"};
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                kDESTINATION(bogus),
+                kDestination(bogus),
                 Ter(tecNO_DST));
 
             // preclaim: tecDST_TAG_NEEDED
@@ -972,7 +966,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             env(fset(dest, asfRequireDest));
             env.close();
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                kDESTINATION(dest),
+                kDestination(dest),
                 Ter(tecDST_TAG_NEEDED));
 
             // preclaim: tecNO_PERMISSION
@@ -980,7 +974,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             env(fset(dest, asfDepositAuth));
             env.close();
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                kDESTINATION(dest),
+                kDestination(dest),
                 Ter(tecNO_PERMISSION));
 
             // preclaim: tecFROZEN
@@ -989,19 +983,19 @@ class LoanBroker_test : public beast::unit_test::Suite
             env(fset(issuer, asfGlobalFreeze));
             env.close();
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                kDESTINATION(dest),
+                kDestination(dest),
                 Ter(tecFROZEN));
 
             // preclaim:: tecFROZEN (deep frozen)
             env(fclear(issuer, asfGlobalFreeze));
             env(trust(issuer, asset(1'000), dest, tfSetFreeze | tfSetDeepFreeze));
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                kDESTINATION(dest),
+                kDestination(dest),
                 Ter(tecFROZEN));
 
             // preclaim: tecPSEUDO_ACCOUNT
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                kDESTINATION(vaultInfo.pseudoAccount),
+                kDestination(vaultInfo.pseudoAccount),
                 Ter(tecPSEUDO_ACCOUNT));
         }
 
@@ -1011,32 +1005,32 @@ class LoanBroker_test : public beast::unit_test::Suite
             testZeroBrokerID([&]() {
                 return env.json(
                     coverClawback(alice),
-                    kLOAN_BROKER_ID(brokerKeylet.key),
-                    kAMOUNT(vaultInfo.asset(2)));
+                    kLoanBrokerId(brokerKeylet.key),
+                    kAmount(vaultInfo.asset(2)));
             });
 
             if (asset.holds<Issue>())
             {
                 // preclaim: AllowTrustLineClawback is not set
                 env(coverClawback(issuer),
-                    kLOAN_BROKER_ID(brokerKeylet.key),
-                    kAMOUNT(vaultInfo.asset(2)),
+                    kLoanBrokerId(brokerKeylet.key),
+                    kAmount(vaultInfo.asset(2)),
                     Ter(tecNO_PERMISSION));
 
                 // preclaim: NoFreeze is set
                 env(fset(issuer, asfAllowTrustLineClawback | asfNoFreeze));
                 env.close();
                 env(coverClawback(issuer),
-                    kLOAN_BROKER_ID(brokerKeylet.key),
-                    kAMOUNT(vaultInfo.asset(2)),
+                    kLoanBrokerId(brokerKeylet.key),
+                    kAmount(vaultInfo.asset(2)),
                     Ter(tecNO_PERMISSION));
             }
             else
             {
                 // preclaim: MPTCanClawback is not set or MPTCanLock is not set
                 env(coverClawback(issuer),
-                    kLOAN_BROKER_ID(brokerKeylet.key),
-                    kAMOUNT(vaultInfo.asset(2)),
+                    kLoanBrokerId(brokerKeylet.key),
+                    kAmount(vaultInfo.asset(2)),
                     Ter(tecNO_PERMISSION));
             }
             env.close();
@@ -1078,11 +1072,11 @@ class LoanBroker_test : public beast::unit_test::Suite
         {
             // preflight: temINVALID (empty/zero broker id)
             testZeroBrokerID([&]() {
-                return env.json(set(alice, vaultInfo.vaultID), kLOAN_BROKER_ID(brokerKeylet.key));
+                return env.json(set(alice, vaultInfo.vaultID), kLoanBrokerId(brokerKeylet.key));
             });
             // preflight: temINVALID (empty/zero vault id)
             testZeroVaultID([&]() {
-                return env.json(set(alice, vaultInfo.vaultID), kLOAN_BROKER_ID(brokerKeylet.key));
+                return env.json(set(alice, vaultInfo.vaultID), kLoanBrokerId(brokerKeylet.key));
             });
 
             if (asset.holds<Issue>())
@@ -1121,13 +1115,13 @@ class LoanBroker_test : public beast::unit_test::Suite
             env.fund(XRP(100'000), alice);
             env.close();
 
-            auto jtx = env.jt(coverClawback(alice), kAMOUNT(usd(100)));
+            auto jtx = env.jt(coverClawback(alice), kAmount(usd(100)));
 
             // holder == account
             env(jtx, Ter(temINVALID));
 
             // holder == beast::zero
-            STAmount const bad(Issue{usd.currency, beast::kZERO}, 100);
+            STAmount const bad(Issue{usd.currency, beast::kZero}, 100);
             jtx.jv[sfAmount] = bad.getJson();
             jtx.stx = env.ust(jtx);
             Serializer s;
@@ -1287,7 +1281,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             .env = env,
             .issuer = issuer,
             .holders = {alice},
-            .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth | tfMPTCanClawback | tfMPTCanLock,
+            .flags = kMptDexFlags | tfMPTRequireAuth | tfMPTCanClawback | tfMPTCanLock,
             .authHolder = true,
         });
 
@@ -1371,8 +1365,8 @@ class LoanBroker_test : public beast::unit_test::Suite
         // Issuer can always cover clawback. The holder authorization is n/a.
         forUnauthAuth([&](bool) {
             env(coverClawback(issuer),
-                kLOAN_BROKER_ID(brokerKeylet.key),
-                kAMOUNT(vaultInfo.asset(1)));
+                kLoanBrokerId(brokerKeylet.key),
+                kAmount(vaultInfo.asset(1)));
         });
     }
 
@@ -1391,7 +1385,7 @@ class LoanBroker_test : public beast::unit_test::Suite
         env.close();
 
         PrettyAsset const asset = [&]() {
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
             mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
             env.close();
             PrettyAsset const mptAsset = mptt["MPT"];
@@ -1445,33 +1439,33 @@ class LoanBroker_test : public beast::unit_test::Suite
         tx2[sfDebtMaximum] = 0;
         env(tx2, Ter(tesSUCCESS));
 
-        tx2[sfDebtMaximum] = json::Value::kMAX_INT;
+        tx2[sfDebtMaximum] = json::Value::kMaxInt;
         env(tx2, Ter(tesSUCCESS));
 
         {
             auto const dm = power(2, 64) - 1;
-            BEAST_EXPECT(dm > kMAX_MP_TOKEN_AMOUNT);
+            BEAST_EXPECT(dm > kMaxMpTokenAmount);
             tx2[sfDebtMaximum] = dm;
             env(tx2, Ter(temINVALID));
         }
 
         {
             auto const dm = power(2, 63) - 1;
-            BEAST_EXPECTS(dm > kMAX_MP_TOKEN_AMOUNT, to_string(dm));
+            BEAST_EXPECTS(dm > kMaxMpTokenAmount, to_string(dm));
             tx2[sfDebtMaximum] = dm;
             env(tx2, Ter(temINVALID));
         }
 
         {
             auto const dm = power(2, 63) - 3;
-            BEAST_EXPECTS(dm == kMAX_MP_TOKEN_AMOUNT, to_string(dm));
+            BEAST_EXPECTS(dm == kMaxMpTokenAmount, to_string(dm));
             tx2[sfDebtMaximum] = dm;
             env(tx2, Ter(tesSUCCESS));
         }
 
         {
             auto const dm = 2 * (power(2, 62) - 1) + 1;
-            BEAST_EXPECTS(dm == kMAX_MP_TOKEN_AMOUNT, to_string(dm));
+            BEAST_EXPECTS(dm == kMaxMpTokenAmount, to_string(dm));
             tx2[sfDebtMaximum] = dm;
             env(tx2, Ter(tesSUCCESS));
         }
@@ -1533,14 +1527,14 @@ class LoanBroker_test : public beast::unit_test::Suite
                 {2'000, 2'500, 250, tesSUCCESS},
                 // issuer can issue 500 tokens (250 VaultDeposit +
                 // 250 LoanBrokerCoverDeposit). MaximumAmount is default.
-                {kMAX_MP_TOKEN_AMOUNT - 500, std::nullopt, 250, tesSUCCESS},
+                {kMaxMpTokenAmount - 500, std::nullopt, 250, tesSUCCESS},
                 // issuer can issue 500, and fails on depositing 1'000
                 {2'000, 2'500, 1'000, tecINSUFFICIENT_FUNDS},
                 // issuer has already issued MaximumAmount
                 {2'000, 2'000, 1'000, tecINSUFFICIENT_FUNDS},
                 // issuer has already issued MaximumAmount. MaximumAmount is
                 // default.
-                {kMAX_MP_TOKEN_AMOUNT, std::nullopt, 250, tecINSUFFICIENT_FUNDS},
+                {kMaxMpTokenAmount, std::nullopt, 250, tecINSUFFICIENT_FUNDS},
             };
         for (auto const& [pay, max, deposit, err] : mptTests)
         {
@@ -1550,7 +1544,7 @@ class LoanBroker_test : public beast::unit_test::Suite
                      .issuer = issuer,
                      .holders = {holder},
                      .pay = pay,
-                     .flags = kMPT_DEX_FLAGS,
+                     .flags = kMptDexFlags,
                      .maxAmt = max});
                 return std::make_tuple(token, token(deposit), err);
             });
@@ -1666,7 +1660,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             env.close();
 
             env(vault.withdraw({.depositor = broker, .id = keylet.key, .amount = token(1'000)}),
-                loanBroker::kDESTINATION(dest),
+                loanBroker::kDestination(dest),
                 Ter(std::ignore));
             BEAST_EXPECT(env.ter() == tecNO_LINE);
             env.close();
@@ -1683,7 +1677,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             env.close();
 
             env(loanBroker::coverWithdraw(broker, brokerKeylet.key, token(100)),
-                loanBroker::kDESTINATION(dest),
+                loanBroker::kDestination(dest),
                 Ter(std::ignore));
             BEAST_EXPECT(env.ter() == tecNO_LINE);
             env.close();
@@ -1695,7 +1689,7 @@ class LoanBroker_test : public beast::unit_test::Suite
                 env.close();
 
                 env(loanBroker::coverWithdraw(broker, brokerKeylet.key, token(100)),
-                    loanBroker::kDESTINATION(dest),
+                    loanBroker::kDestination(dest),
                     Ter(std::ignore));
                 BEAST_EXPECT(env.ter() == tecNO_LINE);
                 env.close();
@@ -1740,7 +1734,7 @@ class LoanBroker_test : public beast::unit_test::Suite
                              .issuer = issuer,
                              .holders = {broker, dest},
                              .pay = 2'000,
-                             .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth,
+                             .flags = kMptDexFlags | tfMPTRequireAuth,
                              .authHolder = true,
                              .maxAmt = 5'000});
                         // unauthorize dest
@@ -1754,7 +1748,7 @@ class LoanBroker_test : public beast::unit_test::Suite
                              .issuer = issuer,
                              .holders = {broker, dest},
                              .pay = 2'000,
-                             .flags = kMPT_DEX_FLAGS,
+                             .flags = kMptDexFlags,
                              .maxAmt = 4'000});
                         BEAST_EXPECT(env.balance(issuer, tester) == tester(-4'000));
                         return tester;
@@ -1765,7 +1759,7 @@ class LoanBroker_test : public beast::unit_test::Suite
                              .issuer = issuer,
                              .holders = {broker},
                              .pay = 2'000,
-                             .flags = kMPT_DEX_FLAGS,
+                             .flags = kMptDexFlags,
                              .maxAmt = 4'000});
                     }
                     default:
@@ -1787,7 +1781,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             env.close();
 
             env(vault.withdraw({.depositor = broker, .id = keylet.key, .amount = token(1'000)}),
-                loanBroker::kDESTINATION(dest),
+                loanBroker::kDestination(dest),
                 Ter(std::ignore));
 
             // Shouldn't fail if at MaximumAmount since no new tokens are issued
@@ -1811,7 +1805,7 @@ class LoanBroker_test : public beast::unit_test::Suite
             env.close();
 
             env(loanBroker::coverWithdraw(broker, brokerKeylet.key, token(100)),
-                loanBroker::kDESTINATION(dest),
+                loanBroker::kDestination(dest),
                 Ter(std::ignore));
             BEAST_EXPECT(env.ter() == err);
             env.close();
diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp
index ede616bc7c..a8132887fc 100644
--- a/src/test/app/Loan_test.cpp
+++ b/src/test/app/Loan_test.cpp
@@ -155,7 +155,7 @@ protected:
         maxCoveredLoanValue(Number const& currentDebt) const
         {
             NumberRoundModeGuard const mg(Number::RoundingMode::Downward);
-            auto debtLimit = coverDeposit * kTENTH_BIPS_PER_UNITY.value() / coverRateMin.value();
+            auto debtLimit = coverDeposit * kTenthBipsPerUnity.value() / coverRateMin.value();
 
             return debtLimit - currentDebt;
         }
@@ -163,8 +163,8 @@ protected:
         static BrokerParameters const&
         defaults()
         {
-            static BrokerParameters const kRESULT{};
-            return kRESULT;
+            static BrokerParameters const kResult{};
+            return kResult;
         }
 
         // TODO: create an operator() which returns a transaction similar to
@@ -255,31 +255,31 @@ protected:
             Fee{setFee.value_or(env.current()->fees().base * 2)}(env, jt);
 
             if (counterpartyExplicit)
-                kCOUNTERPARTY(counter)(env, jt);
+                kCounterparty(counter)(env, jt);
             if (originationFee)
-                kLOAN_ORIGINATION_FEE(broker.asset(*originationFee).number())(env, jt);
+                kLoanOriginationFee(broker.asset(*originationFee).number())(env, jt);
             if (serviceFee)
-                kLOAN_SERVICE_FEE(broker.asset(*serviceFee).number())(env, jt);
+                kLoanServiceFee(broker.asset(*serviceFee).number())(env, jt);
             if (lateFee)
-                kLATE_PAYMENT_FEE(broker.asset(*lateFee).number())(env, jt);
+                kLatePaymentFee(broker.asset(*lateFee).number())(env, jt);
             if (closeFee)
-                kCLOSE_PAYMENT_FEE(broker.asset(*closeFee).number())(env, jt);
+                kClosePaymentFee(broker.asset(*closeFee).number())(env, jt);
             if (overFee)
-                kOVERPAYMENT_FEE (*overFee)(env, jt);
+                kOverpaymentFee (*overFee)(env, jt);
             if (interest)
-                kINTEREST_RATE (*interest)(env, jt);
+                kInterestRate (*interest)(env, jt);
             if (lateInterest)
-                kLATE_INTEREST_RATE (*lateInterest)(env, jt);
+                kLateInterestRate (*lateInterest)(env, jt);
             if (closeInterest)
-                kCLOSE_INTEREST_RATE (*closeInterest)(env, jt);
+                kCloseInterestRate (*closeInterest)(env, jt);
             if (overpaymentInterest)
-                kOVERPAYMENT_INTEREST_RATE (*overpaymentInterest)(env, jt);
+                kOverpaymentInterestRate (*overpaymentInterest)(env, jt);
             if (payTotal)
-                kPAYMENT_TOTAL (*payTotal)(env, jt);
+                kPaymentTotal (*payTotal)(env, jt);
             if (payInterval)
-                kPAYMENT_INTERVAL (*payInterval)(env, jt);
+                kPaymentInterval (*payInterval)(env, jt);
             if (gracePd)
-                kGRACE_PERIOD (*gracePd)(env, jt);
+                kGracePeriod (*gracePd)(env, jt);
 
             return env.jt(jt, fN...);
         }
@@ -296,8 +296,8 @@ protected:
         static PaymentParameters const&
         defaults()
         {
-            static PaymentParameters const kRESULT{};
-            return kRESULT;
+            static PaymentParameters const kResult{};
+            return kResult;
         }
     };
 
@@ -399,7 +399,7 @@ protected:
                     env.balance(account, broker.asset) - (balanceBefore - balanceChangeAmount),
                     borrowerScale);
                 env.test.expect(
-                    roundToScale(difference, loanScale) >= beast::kZERO,
+                    roundToScale(difference, loanScale) >= beast::kZero,
                     "Balance before: " + to_string(balanceBefore.value()) +
                         ", expected change: " + to_string(balanceChangeAmount) +
                         ", difference (balance after - expected): " + to_string(difference),
@@ -518,13 +518,13 @@ protected:
 
         using namespace loanBroker;
         env(set(lender, vaultKeylet.key, params.flags),
-            kDATA(params.data),
-            kMANAGEMENT_FEE_RATE(params.managementFeeRate),
-            kDEBT_MAXIMUM(debtMaximumValue),
-            kCOVER_RATE_MINIMUM(coverRateMinValue),
-            kCOVER_RATE_LIQUIDATION(TenthBips32(params.coverRateLiquidation)));
+            kData(params.data),
+            kManagementFeeRate(params.managementFeeRate),
+            kDebtMaximum(debtMaximumValue),
+            kCoverRateMinimum(coverRateMinValue),
+            kCoverRateLiquidation(TenthBips32(params.coverRateLiquidation)));
 
-        if (coverDepositValue != beast::kZERO)
+        if (coverDepositValue != beast::kZero)
             env(coverDeposit(lender, keylet.key, coverDepositValue));
 
         env.close();
@@ -670,7 +670,7 @@ protected:
                 if (!env.le(keylet::account(borrower)))
                     env.fund(env.current()->fees().accountReserve(10) * 10, noripple(borrower));
 
-                MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+                MPTTester mptt{env, issuer, kMptInitNoFund};
                 mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
                 // Scale the MPT asset so interest is interesting
                 PrettyAsset const asset{mptt.issuanceID(), 10'000};
@@ -706,8 +706,8 @@ protected:
         auto const asset = createAsset(env, assetType, brokerParams, issuer, lender, borrower);
         auto const principal = asset(loanParams.principalRequest).number();
         auto const interest = loanParams.interest.value_or(TenthBips32{});
-        auto const interval = loanParams.payInterval.value_or(LoanSet::kDEFAULT_PAYMENT_INTERVAL);
-        auto const total = loanParams.payTotal.value_or(LoanSet::kDEFAULT_PAYMENT_TOTAL);
+        auto const interval = loanParams.payInterval.value_or(LoanSet::kDefaultPaymentInterval);
+        auto const total = loanParams.payTotal.value_or(LoanSet::kDefaultPaymentTotal);
         auto const feeRate = brokerParams.managementFeeRate;
         auto const props = computeLoanProperties(
             env.current()->rules(),
@@ -734,8 +734,8 @@ protected:
         BEAST_EXPECT(!checkLoanGuards(
             asset,
             asset(loanParams.principalRequest).number(),
-            loanParams.interest.value_or(TenthBips32{}) != beast::kZERO,
-            loanParams.payTotal.value_or(LoanSet::kDEFAULT_PAYMENT_TOTAL),
+            loanParams.interest.value_or(TenthBips32{}) != beast::kZero,
+            loanParams.payTotal.value_or(LoanSet::kDefaultPaymentTotal),
             props,
             env.journal));
     }
@@ -842,7 +842,7 @@ protected:
 
         auto const shortage = totalNeeded - borrowerBalance.number();
 
-        if (shortage > beast::kZERO && (broker.asset.native() || issuer != borrower))
+        if (shortage > beast::kZero && (broker.asset.native() || issuer != borrower))
         {
             env(
                 pay((broker.asset.native() ? env.master : issuer),
@@ -971,7 +971,7 @@ protected:
                 return;
             auto const totalSpent =
                 (totalPaid.trackedValueDelta + totalFeesPaid +
-                 (broker.asset.native() ? Number(baseFee) * totalPaymentsMade : kNUM_ZERO));
+                 (broker.asset.native() ? Number(baseFee) * totalPaymentsMade : kNumZero));
             BEAST_EXPECT(
                 env.balance(borrower, broker.asset).number() ==
                 borrowerInitialBalance - totalSpent);
@@ -1055,13 +1055,13 @@ protected:
                 Number const diff = totalDue - totalDueAmount;
                 BEAST_EXPECT(
                     paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final ||
-                    diff == beast::kZERO ||
-                    (diff > beast::kZERO &&
+                    diff == beast::kZero ||
+                    (diff > beast::kZero &&
                      ((broker.asset.integral() && (static_cast<Number>(diff) < 3)) ||
                       (state.loanScale - diff.exponent() > 13))));
 
                 BEAST_EXPECT(
-                    paymentComponents.trackedPrincipalDelta >= beast::kZERO &&
+                    paymentComponents.trackedPrincipalDelta >= beast::kZero &&
                     paymentComponents.trackedPrincipalDelta <= state.principalOutstanding);
                 BEAST_EXPECT(
                     paymentComponents.specialCase != xrpl::detail::PaymentSpecialCase::Final ||
@@ -1509,8 +1509,8 @@ protected:
         // Delete the loan
         // Either the borrower or the lender can delete the loan. Alternate
         // between who does it across tests.
-        static unsigned kDELETE_COUNTER = 0;
-        auto const deleter = ((++kDELETE_COUNTER % 2) != 0u) ? lender : borrower;
+        static unsigned kDeleteCounter = 0;
+        auto const deleter = ((++kDeleteCounter % 2) != 0u) ? lender : borrower;
         env(del(deleter, keylet.key));
         env.close();
 
@@ -1629,13 +1629,13 @@ protected:
         // sfData: good length, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH, 'X')),
+            kData(std::string(kMaxDataPayloadLength, 'X')),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfData: too long
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH + 1, 'Y')),
+            kData(std::string(kMaxDataPayloadLength + 1, 'Y')),
             loanSetFee,
             Ter(temINVALID));
 
@@ -1643,148 +1643,148 @@ protected:
         // sfOverpaymentFee: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kOVERPAYMENT_FEE(kMAX_OVERPAYMENT_FEE),
+            kOverpaymentFee(kMaxOverpaymentFee),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfOverpaymentFee: too big
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kOVERPAYMENT_FEE(kMAX_OVERPAYMENT_FEE + 1),
+            kOverpaymentFee(kMaxOverpaymentFee + 1),
             loanSetFee,
             Ter(temINVALID));
 
         // sfInterestRate: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kINTEREST_RATE(kMAX_INTEREST_RATE),
+            kInterestRate(kMaxInterestRate),
             loanSetFee,
             Ter(tefBAD_AUTH));
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kINTEREST_RATE(TenthBips32(0)),
+            kInterestRate(TenthBips32(0)),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfInterestRate: too big
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kINTEREST_RATE(kMAX_INTEREST_RATE + 1),
+            kInterestRate(kMaxInterestRate + 1),
             loanSetFee,
             Ter(temINVALID));
         // sfInterestRate: too small
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kINTEREST_RATE(TenthBips32(-1)),
+            kInterestRate(TenthBips32(-1)),
             loanSetFee,
             Ter(temINVALID));
 
         // sfLateInterestRate: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kLATE_INTEREST_RATE(kMAX_LATE_INTEREST_RATE),
+            kLateInterestRate(kMaxLateInterestRate),
             loanSetFee,
             Ter(tefBAD_AUTH));
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kLATE_INTEREST_RATE(TenthBips32(0)),
+            kLateInterestRate(TenthBips32(0)),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfLateInterestRate: too big
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kLATE_INTEREST_RATE(kMAX_LATE_INTEREST_RATE + 1),
+            kLateInterestRate(kMaxLateInterestRate + 1),
             loanSetFee,
             Ter(temINVALID));
         // sfLateInterestRate: too small
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kLATE_INTEREST_RATE(TenthBips32(-1)),
+            kLateInterestRate(TenthBips32(-1)),
             loanSetFee,
             Ter(temINVALID));
 
         // sfCloseInterestRate: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kCLOSE_INTEREST_RATE(kMAX_CLOSE_INTEREST_RATE),
+            kCloseInterestRate(kMaxCloseInterestRate),
             loanSetFee,
             Ter(tefBAD_AUTH));
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kCLOSE_INTEREST_RATE(TenthBips32(0)),
+            kCloseInterestRate(TenthBips32(0)),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfCloseInterestRate: too big
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kCLOSE_INTEREST_RATE(kMAX_CLOSE_INTEREST_RATE + 1),
+            kCloseInterestRate(kMaxCloseInterestRate + 1),
             loanSetFee,
             Ter(temINVALID));
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kCLOSE_INTEREST_RATE(TenthBips32(-1)),
+            kCloseInterestRate(TenthBips32(-1)),
             loanSetFee,
             Ter(temINVALID));
 
         // sfOverpaymentInterestRate: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kOVERPAYMENT_INTEREST_RATE(kMAX_OVERPAYMENT_INTEREST_RATE),
+            kOverpaymentInterestRate(kMaxOverpaymentInterestRate),
             loanSetFee,
             Ter(tefBAD_AUTH));
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kOVERPAYMENT_INTEREST_RATE(TenthBips32(0)),
+            kOverpaymentInterestRate(TenthBips32(0)),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfOverpaymentInterestRate: too big
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kOVERPAYMENT_INTEREST_RATE(kMAX_OVERPAYMENT_INTEREST_RATE + 1),
+            kOverpaymentInterestRate(kMaxOverpaymentInterestRate + 1),
             loanSetFee,
             Ter(temINVALID));
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kOVERPAYMENT_INTEREST_RATE(TenthBips32(-1)),
+            kOverpaymentInterestRate(TenthBips32(-1)),
             loanSetFee,
             Ter(temINVALID));
 
         // sfPaymentTotal: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kPAYMENT_TOTAL(LoanSet::kMIN_PAYMENT_TOTAL),
+            kPaymentTotal(LoanSet::kMinPaymentTotal),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfPaymentTotal: too small (there is no max)
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kPAYMENT_TOTAL(LoanSet::kMIN_PAYMENT_TOTAL - 1),
+            kPaymentTotal(LoanSet::kMinPaymentTotal - 1),
             loanSetFee,
             Ter(temINVALID));
 
         // sfPaymentInterval: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kPAYMENT_INTERVAL(LoanSet::kMIN_PAYMENT_INTERVAL),
+            kPaymentInterval(LoanSet::kMinPaymentInterval),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfPaymentInterval: too small (there is no max)
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kPAYMENT_INTERVAL(LoanSet::kMIN_PAYMENT_INTERVAL - 1),
+            kPaymentInterval(LoanSet::kMinPaymentInterval - 1),
             loanSetFee,
             Ter(temINVALID));
 
         // sfGracePeriod: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, borrower),
-            kPAYMENT_INTERVAL(LoanSet::kMIN_PAYMENT_INTERVAL * 2),
-            kGRACE_PERIOD(LoanSet::kMIN_PAYMENT_INTERVAL * 2),
+            kPaymentInterval(LoanSet::kMinPaymentInterval * 2),
+            kGracePeriod(LoanSet::kMinPaymentInterval * 2),
             loanSetFee,
             Ter(tefBAD_AUTH));
         // sfGracePeriod: larger than paymentInterval
         env(set(evan, broker.brokerID, principalRequest),
             Sig(sfCounterpartySignature, lender),
-            kPAYMENT_INTERVAL(LoanSet::kMIN_PAYMENT_INTERVAL * 2),
-            kGRACE_PERIOD(LoanSet::kMIN_PAYMENT_INTERVAL * 3),
+            kPaymentInterval(LoanSet::kMinPaymentInterval * 2),
+            kGracePeriod(LoanSet::kMinPaymentInterval * 3),
             loanSetFee,
             Ter(temINVALID));
 
@@ -1796,30 +1796,30 @@ protected:
         env(signers(lender, 2, {{evan, 1}, {borrower, 1}}));
         env(signers(borrower, 2, {{evan, 1}, {lender, 1}}));
         env(set(borrower, broker.brokerID, principalRequest),
-            kCOUNTERPARTY(lender),
+            kCounterparty(lender),
             Msig(evan, lender),
             Msig(sfCounterpartySignature, evan, borrower),
             Fee(env.current()->fees().base * 5 - 1),
             Ter(telINSUF_FEE_P));
         // Bad multisign signatures for borrower (Account)
         env(set(borrower, broker.brokerID, principalRequest),
-            kCOUNTERPARTY(lender),
+            kCounterparty(lender),
             Msig(alice, issuer),
             Msig(sfCounterpartySignature, evan, borrower),
             Fee(env.current()->fees().base * 5),
             Ter(tefBAD_SIGNATURE));
         // Bad multisign signatures for issuer (Counterparty)
         env(set(borrower, broker.brokerID, principalRequest),
-            kCOUNTERPARTY(lender),
+            kCounterparty(lender),
             Msig(evan, lender),
             Msig(sfCounterpartySignature, alice, issuer),
             Fee(env.current()->fees().base * 5 - 1),
             Ter(tefBAD_SIGNATURE));
-        env(signers(lender, kNONE));
-        env(signers(borrower, kNONE));
+        env(signers(lender, kNone));
+        env(signers(borrower, kNone));
         // multisign sufficient fee, but no signers set up
         env(set(borrower, broker.brokerID, principalRequest),
-            kCOUNTERPARTY(lender),
+            kCounterparty(lender),
             Msig(evan, lender),
             Msig(sfCounterpartySignature, evan, borrower),
             Fee(env.current()->fees().base * 5),
@@ -1832,7 +1832,7 @@ protected:
             Ter(tefBAD_AUTH));
         // not the broker owner, counterparty is borrower
         env(set(evan, broker.brokerID, principalRequest),
-            kCOUNTERPARTY(borrower),
+            kCounterparty(borrower),
             Sig(sfCounterpartySignature, borrower),
             loanSetFee,
             Ter(tecNO_PERMISSION));
@@ -1843,13 +1843,13 @@ protected:
             Ter(temBAD_SIGNER));
         // not a LoanBroker object, counterparty is valid
         env(set(lender, badKeylet.key, principalRequest),
-            kCOUNTERPARTY(borrower),
+            kCounterparty(borrower),
             Sig(sfCounterpartySignature, borrower),
             loanSetFee,
             Ter(tecNO_ENTRY));
         // borrower doesn't exist
         env(set(lender, broker.brokerID, principalRequest),
-            kCOUNTERPARTY(alice),
+            kCounterparty(alice),
             Sig(sfCounterpartySignature, alice),
             loanSetFee,
             Ter(terNO_ACCOUNT));
@@ -2141,8 +2141,7 @@ protected:
                         loanKeylet.key,
                         STAmount{broker.asset, state.periodicPayment * Number{15, -1}},
                         tfLoanOverpayment),
-                    Fee(XRPAmount{
-                        baseFee * (Number{15, -1} / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)}),
+                    Fee(XRPAmount{baseFee * (Number{15, -1} / kLoanPaymentsPerFeeIncrement + 1)}),
                     Ter(tecNO_PERMISSION));
 
                 {
@@ -2152,7 +2151,7 @@ protected:
                             STAmount{broker.asset, state.periodicPayment * Number{15, -1}},
                             tfLoanOverpayment),
                         Fee(XRPAmount{
-                            baseFee * (Number{15, -1} / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)}),
+                            baseFee * (Number{15, -1} / kLoanPaymentsPerFeeIncrement + 1)}),
                         Ter(temINVALID_FLAG));
                     env.enableFeature(fixCleanup3_1_3);
                 }
@@ -2205,7 +2204,7 @@ protected:
             XRPAmount const badFee{
                 baseFee *
                 (borrowerBalanceBeforePayment.number() * 2 / state.periodicPayment /
-                     kLOAN_PAYMENTS_PER_FEE_INCREMENT +
+                     kLoanPaymentsPerFeeIncrement +
                  1)};
             env(pay(borrower,
                     loanKeylet.key,
@@ -2214,7 +2213,7 @@ protected:
                 Fee(badFee),
                 Ter(tecINSUFFICIENT_FUNDS));
 
-            XRPAmount const goodFee{baseFee * (numPayments / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+            XRPAmount const goodFee{baseFee * (numPayments / kLoanPaymentsPerFeeIncrement + 1)};
             env(pay(borrower, loanKeylet.key, transactionAmount, txFlags), Fee(goodFee));
 
             env.close();
@@ -2264,7 +2263,7 @@ protected:
                 // to verify they're working correctly The numbers in
                 // the below BEAST_EXPECTs may not hold across assets.
                 Number const interval = state.paymentInterval;
-                auto const periodicRate = interval * Number(12, -2) / kSECONDS_IN_YEAR;
+                auto const periodicRate = interval * Number(12, -2) / kSecondsInYear;
                 BEAST_EXPECT(
                     periodicRate == Number(2283105022831050228ULL, -24, Number::Normalized{}));
                 STAmount const principalOutstanding{broker.asset, state.principalOutstanding};
@@ -2504,7 +2503,7 @@ protected:
                 // to verify they're working correctly The numbers in
                 // the below BEAST_EXPECTs may not hold across assets.
                 Number const interval = state.paymentInterval;
-                auto const periodicRate = interval * Number(12, -2) / kSECONDS_IN_YEAR;
+                auto const periodicRate = interval * Number(12, -2) / kSecondsInYear;
                 BEAST_EXPECT(
                     periodicRate == Number(2283105022831050228, -24, Number::Normalized{}));
                 STAmount const roundedPeriodicPayment{
@@ -2644,8 +2643,8 @@ protected:
                     Number const diff = totalDue - totalDueAmount;
                     BEAST_EXPECT(
                         paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final ||
-                        diff == beast::kZERO ||
-                        (diff > beast::kZERO &&
+                        diff == beast::kZero ||
+                        (diff > beast::kZero &&
                          ((broker.asset.integral() && (static_cast<Number>(diff) < 3)) ||
                           (state.loanScale - diff.exponent() > 13))));
 
@@ -2671,7 +2670,7 @@ protected:
                                 state.loanScale,
                                 Number::RoundingMode::Upward));
                     BEAST_EXPECT(
-                        paymentComponents.trackedPrincipalDelta >= beast::kZERO &&
+                        paymentComponents.trackedPrincipalDelta >= beast::kZero &&
                         paymentComponents.trackedPrincipalDelta <= state.principalOutstanding);
                     BEAST_EXPECT(
                         paymentComponents.specialCase != xrpl::detail::PaymentSpecialCase::Final ||
@@ -2804,8 +2803,8 @@ protected:
             pseudoAcct,
             tfLoanOverpayment,
             [&](Keylet const& loanKeylet, VerifyLoanStatus const& verifyLoanStatus) {
-                // Estimate optimal values for kLOAN_PAYMENTS_PER_FEE_INCREMENT and
-                // kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION.
+                // Estimate optimal values for kLoanPaymentsPerFeeIncrement and
+                // kLoanMaximumPaymentsPerTransaction.
                 using namespace loan;
 
                 auto const state = getCurrentState(env, broker, verifyLoanStatus.keylet);
@@ -2823,8 +2822,7 @@ protected:
                 // Make all but the final payment
                 auto const numPayments = (state.paymentRemaining - 2);
                 STAmount const bigPayment{broker.asset, totalDue * numPayments};
-                XRPAmount const bigFee{
-                    baseFee * (numPayments / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+                XRPAmount const bigFee{baseFee * (numPayments / kLoanPaymentsPerFeeIncrement + 1)};
                 time("ten payments", [&]() {
                     env(pay(borrower, loanKeylet.key, bigPayment), Fee(bigFee));
                 });
@@ -2927,12 +2925,12 @@ protected:
 
             // We need two different asset types, MPT and IOU. Prepare MPT
             // first
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
 
-            auto const kNONE = LedgerSpecificFlags(0);
+            auto const kNone = LedgerSpecificFlags(0);
             mptt.create(
                 {.flags = tfMPTCanTransfer | tfMPTCanLock |
-                     (args.requireAuth ? tfMPTRequireAuth : kNONE)});
+                     (args.requireAuth ? tfMPTRequireAuth : kNone)});
             env.close();
             PrettyAsset const mptAsset = mptt.issuanceID();
             mptt.authorize({.account = lender});
@@ -2993,13 +2991,13 @@ protected:
 
                 testcase("MPT issuer is borrower, issuer submits");
                 env(set(issuer, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5));
 
                 testcase("MPT issuer is borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(issuer),
+                    kCounterparty(issuer),
                     Sig(sfCounterpartySignature, issuer),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3009,13 +3007,13 @@ protected:
 
                 testcase("IOU issuer is borrower, issuer submits");
                 env(set(issuer, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5));
 
                 testcase("IOU issuer is borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(issuer),
+                    kCounterparty(issuer),
                     Sig(sfCounterpartySignature, issuer),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3028,14 +3026,14 @@ protected:
 
                 testcase("MPT unauthorized borrower, borrower submits");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecNO_AUTH});
 
                 testcase("MPT unauthorized borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(borrower),
+                    kCounterparty(borrower),
                     Sig(sfCounterpartySignature, borrower),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecNO_AUTH});
@@ -3046,14 +3044,14 @@ protected:
 
                 testcase("IOU unauthorized borrower, borrower submits");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecNO_AUTH});
 
                 testcase("IOU unauthorized borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(borrower),
+                    kCounterparty(borrower),
                     Sig(sfCounterpartySignature, borrower),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecNO_AUTH});
@@ -3063,8 +3061,8 @@ protected:
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
             Env const env{*this, testableAmendments()};
             return {
-                env.current()->fees().accountReserve(0).drops() / kDROPS_PER_XRP.drops(),
-                env.current()->fees().increment.drops() / kDROPS_PER_XRP.drops()};
+                env.current()->fees().accountReserve(0).drops() / kDropsPerXrp.drops(),
+                env.current()->fees().increment.drops() / kDropsPerXrp.drops()};
         }();
 
         testCase(
@@ -3088,7 +3086,7 @@ protected:
 
                 // Cannot create loan, not enough reserve to create MPToken
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecINSUFFICIENT_RESERVE});
@@ -3098,7 +3096,7 @@ protected:
                 env(pay(issuer, borrower, XRP(incReserve)));
                 env.close();
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5));
                 env.close();
@@ -3134,7 +3132,7 @@ protected:
 
                 // Cannot create loan, not enough reserve to create trust line
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecNO_LINE_INSUF_RESERVE});
@@ -3144,7 +3142,7 @@ protected:
                 env(pay(issuer, borrower, XRP(incReserve)));
                 env.close();
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5));
                 env.close();
@@ -3181,8 +3179,8 @@ protected:
 
                 // Cannot create loan, not enough reserve to create MPToken
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
-                    kCOUNTERPARTY(lender),
+                    kLoanOriginationFee(broker.asset(1).value()),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecINSUFFICIENT_RESERVE});
@@ -3192,8 +3190,8 @@ protected:
                 env(pay(issuer, lender, XRP(incReserve)));
                 env.close();
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
-                    kCOUNTERPARTY(lender),
+                    kLoanOriginationFee(broker.asset(1).value()),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5));
                 env.close();
@@ -3232,8 +3230,8 @@ protected:
 
                 // Cannot create loan, not enough reserve to create trust line
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
-                    kCOUNTERPARTY(lender),
+                    kLoanOriginationFee(broker.asset(1).value()),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecNO_LINE_INSUF_RESERVE});
@@ -3243,8 +3241,8 @@ protected:
                 env(pay(issuer, lender, XRP(incReserve)));
                 env.close();
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
-                    kCOUNTERPARTY(lender),
+                    kLoanOriginationFee(broker.asset(1).value()),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5));
                 env.close();
@@ -3275,8 +3273,8 @@ protected:
 
                 // Cannot create loan, lender not authorized to receive fee
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
-                    kCOUNTERPARTY(lender),
+                    kLoanOriginationFee(broker.asset(1).value()),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecNO_AUTH});
@@ -3284,7 +3282,7 @@ protected:
 
                 // Cannot create loan, even without an origination fee
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter{tecNO_AUTH});
@@ -3304,7 +3302,7 @@ protected:
 
                 testcase("MPT authorized borrower, borrower submits");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3314,7 +3312,7 @@ protected:
 
                 testcase("IOU authorized borrower, borrower submits");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3327,7 +3325,7 @@ protected:
 
                 testcase("MPT authorized borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(borrower),
+                    kCounterparty(borrower),
                     Sig(sfCounterpartySignature, borrower),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3337,7 +3335,7 @@ protected:
 
                 testcase("IOU authorized borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(borrower),
+                    kCounterparty(borrower),
                     Sig(sfCounterpartySignature, borrower),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3361,7 +3359,7 @@ protected:
                     "MPT authorized borrower, borrower submits, lender "
                     "multisign");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Msig(sfCounterpartySignature, alice, bella),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3374,7 +3372,7 @@ protected:
                     "IOU authorized borrower, borrower submits, lender "
                     "multisign");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
+                    kCounterparty(lender),
                     Msig(sfCounterpartySignature, alice, bella),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3390,7 +3388,7 @@ protected:
                     "MPT authorized borrower, lender submits, borrower "
                     "multisign");
                 env(set(lender, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(borrower),
+                    kCounterparty(borrower),
                     Msig(sfCounterpartySignature, alice, bella),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3403,7 +3401,7 @@ protected:
                     "IOU authorized borrower, lender submits, borrower "
                     "multisign");
                 env(set(lender, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(borrower),
+                    kCounterparty(borrower),
                     Msig(sfCounterpartySignature, alice, bella),
                     Fee(env.current()->fees().base * 5));
             },
@@ -3421,8 +3419,8 @@ protected:
 
                 testcase("Vault at maximum value");
                 env(set(issuer, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
-                    kINTEREST_RATE(TenthBips32(10'000)),
+                    kCounterparty(lender),
+                    kInterestRate(TenthBips32(10'000)),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
                     Ter(tecLIMIT_EXCEEDED));
@@ -3442,12 +3440,12 @@ protected:
 
                 testcase("Vault maximum value exceeded");
                 env(set(issuer, broker.brokerID, principalRequest),
-                    kCOUNTERPARTY(lender),
-                    kINTEREST_RATE(TenthBips32(100'000)),
+                    kCounterparty(lender),
+                    kInterestRate(TenthBips32(100'000)),
                     Sig(sfCounterpartySignature, lender),
                     Fee(env.current()->fees().base * 5),
-                    kPAYMENT_TOTAL(2),
-                    kPAYMENT_INTERVAL(3600 * 24),
+                    kPaymentTotal(2),
+                    kPaymentInterval(3600 * 24),
                     Ter(tecLIMIT_EXCEEDED));
             },
             nullptr);
@@ -3491,7 +3489,7 @@ protected:
         env(pay(issuer, borrower, iouAsset(10'000)));
         env.close();
 
-        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mptt{env, issuer, kMptInitNoFund};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
         // Scale the MPT asset a little bit so we can get some interest
         PrettyAsset const mptAsset{mptt.issuanceID(), 100};
@@ -3689,7 +3687,7 @@ protected:
         testcase << "Batch Bypass Counterparty";
 
         bool const lendingBatchEnabled = !std::ranges::any_of(
-            Batch::kDISABLED_TX_TYPES,
+            Batch::kDisabledTxTypes,
             [](auto const& disabled) { return disabled == ttLOAN_BROKER_SET; });
 
         using namespace jtx;
@@ -3828,8 +3826,8 @@ protected:
         auto createJson = env.json(
             set(borrower, broker.brokerID, principalRequest),
             Fee(loanSetFee),
-            kLOAN_SERVICE_FEE(serviceFee),
-            kPAYMENT_TOTAL(numPayments),
+            kLoanServiceFee(serviceFee),
+            kPaymentTotal(numPayments),
             Json(sfCounterpartySignature, json::ValueType::Object));
 
         createJson["CloseInterestRate"] = 55374;
@@ -3927,7 +3925,7 @@ protected:
                 jSubmit[jss::result][jss::engine_result].asString() == "tesSUCCESS");
 
             lowerFee();
-            env(jtx.jv, Sig(kNONE), Seq(kNONE), Fee(kNONE), Ter(tefPAST_SEQ));
+            env(jtx.jv, Sig(kNone), Seq(kNone), Fee(kNone), Ter(tefPAST_SEQ));
         }
 
         {
@@ -4214,8 +4212,8 @@ protected:
 
             env(set(borrower, brokerInfo.brokerID, 10'000),
                 Sig(sfCounterpartySignature, broker),
-                kLOAN_SERVICE_FEE(iou(100).value()),
-                kPAYMENT_INTERVAL(100),
+                kLoanServiceFee(iou(100).value()),
+                kPaymentInterval(100),
                 Fee(XRP(100)));
             env.close();
 
@@ -4266,9 +4264,9 @@ protected:
 
         env.fund(XRP(1'000), issuer, lender);
 
-        std::int64_t constexpr kISSUER_BALANCE = 10'000'000;
+        static constexpr std::int64_t kIssuerBalance = 10'000'000;
         MPTTester const asset(
-            {.env = env, .issuer = issuer, .holders = {lender}, .pay = kISSUER_BALANCE});
+            {.env = env, .issuer = issuer, .holders = {lender}, .pay = kIssuerBalance});
 
         BrokerParameters const brokerParams{
             .debtMax = 200,
@@ -4281,13 +4279,13 @@ protected:
         // Issuer should not create MPToken
         BEAST_EXPECT(!env.le(keylet::mptoken(asset.issuanceID(), issuer)));
         // Issuer "borrowed" 200, OutstandingAmount decreased by 200
-        BEAST_EXPECT(env.balance(issuer, asset) == asset(-kISSUER_BALANCE + 200));
+        BEAST_EXPECT(env.balance(issuer, asset) == asset(-kIssuerBalance + 200));
         // Pay Loan
         auto const loanKeylet = keylet::loan(broker.brokerID, 1);
         env(pay(borrower, loanKeylet.key, asset(200)));
         env.close();
         // Issuer "re-payed" 200, OutstandingAmount increased by 200
-        BEAST_EXPECT(env.balance(issuer, asset) == asset(-kISSUER_BALANCE));
+        BEAST_EXPECT(env.balance(issuer, asset) == asset(-kIssuerBalance));
     }
 
     void
@@ -4303,7 +4301,7 @@ protected:
             Env env(*this);
             env.fund(XRP(1'000), alice);
             env.close();
-            env(del(alice, beast::kZERO), Ter(temINVALID));
+            env(del(alice, beast::kZero), Ter(temINVALID));
         }
     }
 
@@ -4320,7 +4318,7 @@ protected:
             Env env(*this);
             env.fund(XRP(1'000), alice);
             env.close();
-            env(manage(alice, beast::kZERO, tfLoanDefault), Ter(temINVALID));
+            env(manage(alice, beast::kZero, tfLoanDefault), Ter(temINVALID));
         }
     }
 
@@ -4436,22 +4434,22 @@ protected:
                 // zero grace period
                 env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
                     Sig(sfCounterpartySignature, lender),
-                    kGRACE_PERIOD(0),
+                    kGracePeriod(0),
                     loanSetFee,
                     Ter(temINVALID));
 
                 // grace period less than default minimum
                 env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
                     Sig(sfCounterpartySignature, lender),
-                    kGRACE_PERIOD(LoanSet::kDEFAULT_GRACE_PERIOD - 1),
+                    kGracePeriod(LoanSet::kDefaultGracePeriod - 1),
                     loanSetFee,
                     Ter(temINVALID));
 
                 // grace period greater than payment interval
                 env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
                     Sig(sfCounterpartySignature, lender),
-                    kPAYMENT_INTERVAL(120),
-                    kGRACE_PERIOD(121),
+                    kPaymentInterval(120),
+                    kGracePeriod(121),
                     loanSetFee,
                     Ter(temINVALID));
             }
@@ -4560,7 +4558,7 @@ protected:
         env.fund(XRP(1'000'000), issuer, lender, borrower);
         env.close();
 
-        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mptt{env, issuer, kMptInitNoFund};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
         PrettyAsset const mptAsset = mptt.issuanceID();
         mptt.authorize({.account = lender});
@@ -4679,7 +4677,7 @@ protected:
         Number const payment{3'269'349'176'470'588, -12};
         XRPAmount const payFee{
             baseFee *
-            ((payment / originalState.periodicPayment) / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+            ((payment / originalState.periodicPayment) / kLoanPaymentsPerFeeIncrement + 1)};
         auto loanPayTx =
             env.json(pay(borrower, keylet.key, STAmount{broker.asset, payment}), Fee(payFee));
         BEAST_EXPECT(to_string(payment) == "3269.349176470588");
@@ -4801,16 +4799,16 @@ protected:
             set(borrower, broker.brokerID, principalRequest),
             Fee(loanSetFee),
             Json(sfCounterpartySignature, json::ValueType::Object),
-            kCLOSE_PAYMENT_FEE(0),
-            kGRACE_PERIOD(60),
-            kINTEREST_RATE(TenthBips32(20930)),
-            kLATE_INTEREST_RATE(TenthBips32(77049)),
-            kLATE_PAYMENT_FEE(0),
-            kLOAN_SERVICE_FEE(0),
-            kOVERPAYMENT_FEE(TenthBips32(7)),
-            kOVERPAYMENT_INTEREST_RATE(TenthBips32(66653)),
-            kPAYMENT_INTERVAL(60),
-            kPAYMENT_TOTAL(3239184));
+            kClosePaymentFee(0),
+            kGracePeriod(60),
+            kInterestRate(TenthBips32(20930)),
+            kLateInterestRate(TenthBips32(77049)),
+            kLatePaymentFee(0),
+            kLoanServiceFee(0),
+            kOverpaymentFee(TenthBips32(7)),
+            kOverpaymentInterestRate(TenthBips32(66653)),
+            kPaymentInterval(60),
+            kPaymentTotal(3239184));
 
         // There are enough payments due on this loan that it only needs to be
         // created once, and can be paid on multiple times. Just don't create a
@@ -4825,7 +4823,7 @@ protected:
         auto const roundedPayment = [&]() {
             auto const stateBefore = getCurrentState(env, broker, keylet);
             BEAST_EXPECT(stateBefore.paymentRemaining == 3239184);
-            BEAST_EXPECT(stateBefore.paymentRemaining > kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION);
+            BEAST_EXPECT(stateBefore.paymentRemaining > kLoanMaximumPaymentsPerTransaction);
 
             return roundToAsset(
                 iouAsset,
@@ -4839,7 +4837,7 @@ protected:
                         TER const expectedTer = tesSUCCESS) {
             auto const stateBefore = getCurrentState(env, broker, keylet);
             BEAST_EXPECT(stateBefore.paymentRemaining <= 3239184);
-            BEAST_EXPECT(stateBefore.paymentRemaining > kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION);
+            BEAST_EXPECT(stateBefore.paymentRemaining > kLoanMaximumPaymentsPerTransaction);
 
             Number const amount = roundedPayment * payFactor;
             auto loanPayTx = env.json(pay(borrower, keylet.key, STAmount{broker.asset, amount}));
@@ -4847,7 +4845,7 @@ protected:
             env(loanPayTx, Ter(expectedTer), Fee(payFee));
             env.close();
             auto const expectedChange = isTesSuccess(expectedTer)
-                ? std::min(kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION, payFactor)
+                ? std::min(kLoanMaximumPaymentsPerTransaction, payFactor)
                 : 0;
 
             auto const stateAfter = getCurrentState(env, broker, keylet);
@@ -4855,8 +4853,8 @@ protected:
                 stateAfter.paymentRemaining == stateBefore.paymentRemaining - expectedChange);
         };
 
-        std::int64_t constexpr kMAX_FEE_INCREMENTS =
-            kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION / kLOAN_PAYMENTS_PER_FEE_INCREMENT;
+        static constexpr std::int64_t kMaxFeeIncrements =
+            kLoanMaximumPaymentsPerTransaction / kLoanPaymentsPerFeeIncrement;
 
         TER const failWithoutFix = feeCapped ? (TER)tesSUCCESS : (TER)telINSUF_FEE_P;
 
@@ -4864,47 +4862,42 @@ protected:
         // The original test case - way over the limit - more fee is always ok
         test(1819878, 363976);
         // The capped fee is only sufficient if the amendment is enabled.
-        test(1819878, kMAX_FEE_INCREMENTS, failWithoutFix);
+        test(1819878, kMaxFeeIncrements, failWithoutFix);
 
         // * Amount exactly at threshold -> capped fee
-        test(kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION, kMAX_FEE_INCREMENTS);
+        test(kLoanMaximumPaymentsPerTransaction, kMaxFeeIncrements);
         // More fee is always ok
-        test(kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION, kMAX_FEE_INCREMENTS + 10);
+        test(kLoanMaximumPaymentsPerTransaction, kMaxFeeIncrements + 10);
 
         // * Amount below threshold -> normal calculation
         test(1, 1);
-        test(kLOAN_PAYMENTS_PER_FEE_INCREMENT * 2, 2);
+        test(kLoanPaymentsPerFeeIncrement * 2, 2);
         test(0, 0, temBAD_AMOUNT);
         test(0, 1, temBAD_AMOUNT);
         // Fee difference rounds evenly
         test(
-            kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - 10,
-            ((kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - 10) / kLOAN_PAYMENTS_PER_FEE_INCREMENT) - 1,
+            kLoanMaximumPaymentsPerTransaction - 10,
+            ((kLoanMaximumPaymentsPerTransaction - 10) / kLoanPaymentsPerFeeIncrement) - 1,
             telINSUF_FEE_P);
         test(
-            kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - 10,
-            ((kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - 10) / kLOAN_PAYMENTS_PER_FEE_INCREMENT));
+            kLoanMaximumPaymentsPerTransaction - 10,
+            ((kLoanMaximumPaymentsPerTransaction - 10) / kLoanPaymentsPerFeeIncrement));
         // More fee is always ok
         test(
-            kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - 10,
-            ((kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - 10) / kLOAN_PAYMENTS_PER_FEE_INCREMENT) + 3);
+            kLoanMaximumPaymentsPerTransaction - 10,
+            ((kLoanMaximumPaymentsPerTransaction - 10) / kLoanPaymentsPerFeeIncrement) + 3);
         // Fee rounds up
-        for (int under = 1; under < kLOAN_PAYMENTS_PER_FEE_INCREMENT; ++under)
+        for (int under = 1; under < kLoanPaymentsPerFeeIncrement; ++under)
         {
-            test(
-                kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - under,
-                kMAX_FEE_INCREMENTS - 1,
-                telINSUF_FEE_P);
-            test(kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - under, kMAX_FEE_INCREMENTS);
+            test(kLoanMaximumPaymentsPerTransaction - under, kMaxFeeIncrements - 1, telINSUF_FEE_P);
+            test(kLoanMaximumPaymentsPerTransaction - under, kMaxFeeIncrements);
         }
         // Only when you get one less fee increment can you pay less
         test(
-            kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - kLOAN_PAYMENTS_PER_FEE_INCREMENT,
-            kMAX_FEE_INCREMENTS - 1);
+            kLoanMaximumPaymentsPerTransaction - kLoanPaymentsPerFeeIncrement,
+            kMaxFeeIncrements - 1);
         // And again, more fee is always ok.
-        test(
-            kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION - kLOAN_PAYMENTS_PER_FEE_INCREMENT,
-            kMAX_FEE_INCREMENTS);
+        test(kLoanMaximumPaymentsPerTransaction - kLoanPaymentsPerFeeIncrement, kMaxFeeIncrements);
     }
 
     void
@@ -4977,7 +4970,7 @@ protected:
             BEAST_EXPECT(to_string(amount) == "3074.745058823529");
             XRPAmount const payFee{
                 baseFee *
-                (amount / stateBefore.periodicPayment / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+                (amount / stateBefore.periodicPayment / kLoanPaymentsPerFeeIncrement + 1)};
             loanPayTx["Amount"]["value"] = to_string(amount);
             env(loanPayTx, Fee(payFee), Ter(tesSUCCESS));
             env.close();
@@ -4989,7 +4982,7 @@ protected:
             BEAST_EXPECT(to_string(amount) == "6732.118170944051");
             XRPAmount const payFee{
                 baseFee *
-                (amount / stateBefore.periodicPayment / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+                (amount / stateBefore.periodicPayment / kLoanPaymentsPerFeeIncrement + 1)};
             loanPayTx["Amount"]["value"] = to_string(amount);
             env(loanPayTx, Fee(payFee), Ter(tesSUCCESS));
             env.close();
@@ -5077,14 +5070,13 @@ protected:
 
         auto const stateBefore = getCurrentState(env, broker, keylet);
         BEAST_EXPECT(stateBefore.paymentRemaining == 5678);
-        BEAST_EXPECT(stateBefore.paymentRemaining > kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION);
+        BEAST_EXPECT(stateBefore.paymentRemaining > kLoanMaximumPaymentsPerTransaction);
 
         auto loanPayTx = env.json(pay(borrower, keylet.key, STAmount{broker.asset, Number{}}));
         Number const amount{9924'81, -2};
         BEAST_EXPECT(to_string(amount) == "9924.81");
         XRPAmount const payFee{
-            baseFee *
-            (amount / stateBefore.periodicPayment / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+            baseFee * (amount / stateBefore.periodicPayment / kLoanPaymentsPerFeeIncrement + 1)};
         loanPayTx["Amount"]["value"] = to_string(amount);
         env(loanPayTx, Fee(payFee), Ter(tesSUCCESS));
         env.close();
@@ -5092,7 +5084,7 @@ protected:
         auto const stateAfter = getCurrentState(env, broker, keylet);
         BEAST_EXPECT(
             stateAfter.paymentRemaining ==
-            stateBefore.paymentRemaining - kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION);
+            stateBefore.paymentRemaining - kLoanMaximumPaymentsPerTransaction);
     }
 
     void
@@ -5133,19 +5125,19 @@ protected:
 
         using timeType = decltype(sfNextPaymentDueDate)::type::value_type;
         static_assert(std::is_same_v<timeType, std::uint32_t>);
-        timeType constexpr kMAX_TIME = std::numeric_limits<timeType>::max();
-        static_assert(kMAX_TIME == 4'294'967'295);
+        constexpr timeType kMaxTime = std::numeric_limits<timeType>::max();
+        static_assert(kMaxTime == 4'294'967'295);
 
         auto const baseJson = [&]() {
             auto createJson = env.json(
                 set(borrower, broker.brokerID, Number{55524'81, -2}),
                 Fee(loanSetFee),
-                kCLOSE_PAYMENT_FEE(0),
-                kGRACE_PERIOD(LoanSet::kDEFAULT_GRACE_PERIOD),
-                kINTEREST_RATE(TenthBips32(12833)),
-                kLATE_INTEREST_RATE(TenthBips32(77048)),
-                kLATE_PAYMENT_FEE(0),
-                kLOAN_ORIGINATION_FEE(218),
+                kClosePaymentFee(0),
+                kGracePeriod(LoanSet::kDefaultGracePeriod),
+                kInterestRate(TenthBips32(12833)),
+                kLateInterestRate(TenthBips32(77048)),
+                kLatePaymentFee(0),
+                kLoanOriginationFee(218),
                 Json(sfCounterpartySignature, json::ValueType::Object));
 
             createJson.removeMember(sfSequence.getJsonName());
@@ -5163,15 +5155,14 @@ protected:
 
             BEAST_EXPECT(startDate >= 50);
 
-            return kMAX_TIME - startDate;
+            return kMaxTime - startDate;
         };
 
         {
             // straight-up overflow: interval
             auto const interval = maxLoanTime() + 1;
             auto const total = 1;
-            auto createJson =
-                env.json(baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total));
+            auto createJson = env.json(baseJson, kPaymentInterval(interval), kPaymentTotal(total));
 
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
@@ -5181,8 +5172,7 @@ protected:
             // min interval is 60
             auto const interval = 60;
             auto const total = maxLoanTime() + 1;
-            auto createJson =
-                env.json(baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total));
+            auto createJson = env.json(baseJson, kPaymentInterval(interval), kPaymentTotal(total));
 
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
@@ -5194,7 +5184,7 @@ protected:
             auto const total = 1;
             auto const grace = interval;
             auto createJson = env.json(
-                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
+                baseJson, kPaymentInterval(interval), kPaymentTotal(total), kGracePeriod(grace));
 
             // The grace period can't be larger than the interval.
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
@@ -5204,8 +5194,7 @@ protected:
             // Overflow with multiplication of a few large intervals
             auto const interval = 1'000'000'000;
             auto const total = 10;
-            auto createJson =
-                env.json(baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total));
+            auto createJson = env.json(baseJson, kPaymentInterval(interval), kPaymentTotal(total));
 
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
@@ -5215,8 +5204,7 @@ protected:
             // min interval is 60
             auto const interval = 60;
             auto const total = 1'000'000'000;
-            auto createJson =
-                env.json(baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total));
+            auto createJson = env.json(baseJson, kPaymentInterval(interval), kPaymentTotal(total));
 
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
@@ -5228,7 +5216,7 @@ protected:
             auto const interval = (maxLoanTime() - total) / total;
             auto const grace = interval;
             auto createJson = env.json(
-                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
+                baseJson, kPaymentInterval(interval), kPaymentTotal(total), kGracePeriod(grace));
 
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
@@ -5243,7 +5231,7 @@ protected:
             auto const interval = maxLoanTime() - grace;
             auto const total = 1;
             auto createJson = env.json(
-                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
+                baseJson, kPaymentInterval(interval), kPaymentTotal(total), kGracePeriod(grace));
 
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tesSUCCESS));
             env.close();
@@ -5268,10 +5256,10 @@ protected:
 
             auto const closeStartDate = (parentCloseTime() / 10 + 1) * 10;
             auto const grace = 5'000;
-            auto const interval = kMAX_TIME - closeStartDate - grace;
+            auto const interval = kMaxTime - closeStartDate - grace;
             auto const total = 1;
             auto createJson = env.json(
-                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
+                baseJson, kPaymentInterval(interval), kPaymentTotal(total), kGracePeriod(grace));
 
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tesSUCCESS));
             env.close();
@@ -5285,7 +5273,7 @@ protected:
 
             // This loan exists
             auto const afterState = getCurrentState(env, broker, keylet);
-            BEAST_EXPECT(afterState.nextPaymentDate == kMAX_TIME - grace);
+            BEAST_EXPECT(afterState.nextPaymentDate == kMaxTime - grace);
             BEAST_EXPECT(afterState.previousPaymentDate == 0);
             BEAST_EXPECT(afterState.paymentRemaining == 1);
         }
@@ -5297,7 +5285,7 @@ protected:
             // Start date when the ledger is closed will be larger
             auto const closeStartDate = (parentCloseTime() / 10 + 1) * 10;
             auto const grace = 5'000;
-            auto const maxLoanTime = kMAX_TIME - closeStartDate - grace;
+            auto const maxLoanTime = kMaxTime - closeStartDate - grace;
             auto const total = [&]() {
                 if (maxLoanTime % 5 == 0)
                     return 5;
@@ -5317,7 +5305,7 @@ protected:
 
             auto const interval = maxLoanTime / total;
             auto createJson = env.json(
-                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
+                baseJson, kPaymentInterval(interval), kPaymentTotal(total), kGracePeriod(grace));
 
             env(createJson, Sig(sfCounterpartySignature, lender), Ter(tesSUCCESS));
             env.close();
@@ -5333,8 +5321,7 @@ protected:
             {
                 NumberRoundModeGuard const mg{Number::RoundingMode::Upward};
                 Number const payment = beforeState.periodicPayment * (total - 1);
-                XRPAmount const payFee{
-                    baseFee * ((total - 1) / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+                XRPAmount const payFee{baseFee * ((total - 1) / kLoanPaymentsPerFeeIncrement + 1)};
                 STAmount const paymentAmount =
                     roundToScale(STAmount{broker.asset, payment}, beforeState.loanScale);
                 auto loanPayTx = env.json(pay(borrower, keylet.key, paymentAmount), Fee(payFee));
@@ -5345,8 +5332,8 @@ protected:
             // The loan is on the last payment
             auto const afterState = getCurrentState(env, broker, keylet);
             BEAST_EXPECT(afterState.paymentRemaining == 1);
-            BEAST_EXPECT(afterState.nextPaymentDate == kMAX_TIME - grace);
-            BEAST_EXPECT(afterState.previousPaymentDate == kMAX_TIME - grace - interval);
+            BEAST_EXPECT(afterState.nextPaymentDate == kMaxTime - grace);
+            BEAST_EXPECT(afterState.previousPaymentDate == kMaxTime - grace - interval);
         }
     }
 
@@ -5368,7 +5355,7 @@ protected:
             .env = env,
             .issuer = issuer,
             .holders = {lender, borrower},
-            .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth | tfMPTCanClawback | tfMPTCanLock,
+            .flags = kMptDexFlags | tfMPTRequireAuth | tfMPTCanClawback | tfMPTCanLock,
             .authHolder = true,
         });
 
@@ -5397,8 +5384,8 @@ protected:
                 err);
         });
 
-        std::uint32_t constexpr kLOAN_SEQUENCE = 1;
-        auto const loanKeylet = keylet::loan(brokerInfo.brokerID, kLOAN_SEQUENCE);
+        static constexpr std::uint32_t kLoanSequence = 1;
+        auto const loanKeylet = keylet::loan(brokerInfo.brokerID, kLoanSequence);
 
         // Can't loan pay if the borrower is not authorized
         forUnauthAuth([&](bool authorized) {
@@ -5422,7 +5409,7 @@ protected:
         env.fund(XRP(100'000), issuer, alice);
         env.close();
 
-        MPTTester mpt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mpt{env, issuer, kMptInitNoFund};
 
         mpt.create({.flags = tfMPTCanTransfer, .mutableFlags = tmfMPTCanMutateCanTransfer});
 
@@ -5549,15 +5536,15 @@ protected:
 
         env(set(borrower, broker.brokerID, principal),
             Sig(sfCounterpartySignature, lender),
-            kLOAN_SERVICE_FEE(serviceFee),
-            kLATE_PAYMENT_FEE(lateFee),
-            kCLOSE_PAYMENT_FEE(closeFee),
-            kINTEREST_RATE(percentageToTenthBips(12)),
-            kLATE_INTEREST_RATE(percentageToTenthBips(24) / 10),
-            kCLOSE_INTEREST_RATE(percentageToTenthBips(5)),
-            kPAYMENT_TOTAL(12),
-            kPAYMENT_INTERVAL(600),
-            kGRACE_PERIOD(0),
+            kLoanServiceFee(serviceFee),
+            kLatePaymentFee(lateFee),
+            kClosePaymentFee(closeFee),
+            kInterestRate(percentageToTenthBips(12)),
+            kLateInterestRate(percentageToTenthBips(24) / 10),
+            kCloseInterestRate(percentageToTenthBips(5)),
+            kPaymentTotal(12),
+            kPaymentInterval(600),
+            kGracePeriod(0),
             Fee(loanSetFee));
         env.close();
 
@@ -5699,9 +5686,9 @@ protected:
                 set(borrower, broker.brokerID, principalRequest),
                 Sig(sfCounterpartySignature, lender),
                 loanSetFee,
-                kPAYMENT_INTERVAL(600),
-                kPAYMENT_TOTAL(1),
-                kGRACE_PERIOD(60));
+                kPaymentInterval(600),
+                kPaymentTotal(1),
+                kGracePeriod(60));
             env(createTx);
             env.close();
 
@@ -5800,18 +5787,18 @@ protected:
         auto createJtx = env.jt(
             set(borrower, broker.brokerID, principalRequest, 0),
             Sig(sfCounterpartySignature, lender),
-            kLOAN_ORIGINATION_FEE(originationFee),
-            kLOAN_SERVICE_FEE(serviceFee),
-            kLATE_PAYMENT_FEE(lateFee),
-            kCLOSE_PAYMENT_FEE(closeFee),
-            kOVERPAYMENT_FEE(percentageToTenthBips(5) / 10),
-            kINTEREST_RATE(interest),
-            kLATE_INTEREST_RATE(lateInterest),
-            kCLOSE_INTEREST_RATE(closeInterest),
-            kOVERPAYMENT_INTEREST_RATE(overpaymentInterest),
-            kPAYMENT_TOTAL(total),
-            kPAYMENT_INTERVAL(interval),
-            kGRACE_PERIOD(grace),
+            kLoanOriginationFee(originationFee),
+            kLoanServiceFee(serviceFee),
+            kLatePaymentFee(lateFee),
+            kClosePaymentFee(closeFee),
+            kOverpaymentFee(percentageToTenthBips(5) / 10),
+            kInterestRate(interest),
+            kLateInterestRate(lateInterest),
+            kCloseInterestRate(closeInterest),
+            kOverpaymentInterestRate(overpaymentInterest),
+            kPaymentTotal(total),
+            kPaymentInterval(interval),
+            kGracePeriod(grace),
             Fee(loanSetFee));
 
         auto const brokerSle = env.le(keylet::loanbroker(broker.brokerID));
@@ -6248,7 +6235,7 @@ protected:
             if (auto const loanSle = env.le(loanKeylet); BEAST_EXPECT(loanSle))
             {
                 BEAST_EXPECT(brokerSle->at(sfDebtTotal) == loanSle->at(sfTotalValueOutstanding));
-                BEAST_EXPECT(brokerSle->at(sfDebtTotal) == beast::kZERO);
+                BEAST_EXPECT(brokerSle->at(sfDebtTotal) == beast::kZero);
             }
         }
     }
@@ -6290,9 +6277,9 @@ protected:
 
         env(set(borrower, brokerKeyLet.key, debtMaximumRequest),
             Sig(sfCounterpartySignature, lender),
-            kINTEREST_RATE(TenthBips32(50'000)),
-            kPAYMENT_TOTAL(2),
-            kPAYMENT_INTERVAL(150),
+            kInterestRate(TenthBips32(50'000)),
+            kPaymentTotal(2),
+            kPaymentInterval(150),
             Txflags(tfLoanOverpayment),
             txFee);
         env.close();
@@ -6346,7 +6333,7 @@ protected:
         // Create a loan with principal 804 XRP and 0% interest (so
         // DebtTotal increases by exactly 804)
         env(loan::set(borrower, brokerInfo.brokerID, xrpAsset(804).value()),
-            loan::kINTEREST_RATE(TenthBips32(0)),
+            loan::kInterestRate(TenthBips32(0)),
             Sig(sfCounterpartySignature, lender),
             Fee(env.current()->fees().base * 2));
         BEAST_EXPECT(env.ter() == tesSUCCESS);
@@ -6492,10 +6479,10 @@ protected:
             auto const serviceFee = 101;
 
             env(set(broker, brokerKeylet.key, debtMaximumRequest),
-                kCOUNTERPARTY(borrower),
+                kCounterparty(borrower),
                 Sig(sfCounterpartySignature, borrower),
-                kLOAN_SERVICE_FEE(serviceFee),
-                kPAYMENT_TOTAL(10),
+                kLoanServiceFee(serviceFee),
+                kPaymentTotal(10),
                 txFee);
             env.close();
 
@@ -6709,9 +6696,9 @@ protected:
         env(loan::set(
                 borrower, result.brokerKeylet().key, asset(10'000).value(), tfLoanOverpayment),
             Sig(sfCounterpartySignature, lender),
-            loan::kPAYMENT_INTERVAL(86400 * 30),
-            loan::kPAYMENT_TOTAL(3),
-            loan::kOVERPAYMENT_INTEREST_RATE(TenthBips32(percentageToTenthBips(20))),
+            loan::kPaymentInterval(86400 * 30),
+            loan::kPaymentTotal(3),
+            loan::kOverpaymentInterestRate(TenthBips32(percentageToTenthBips(20))),
             loanSetFee);
 
         // From calculator
@@ -6754,8 +6741,8 @@ protected:
         auto const keylet = keylet::loan(brokerInfo.brokerID, 1);
         env(set(borrower, brokerInfo.brokerID, 10'000),
             Sig(sfCounterpartySignature, broker),
-            kLOAN_SERVICE_FEE(iou(100).value()),
-            kPAYMENT_INTERVAL(100),
+            kLoanServiceFee(iou(100).value()),
+            kPaymentInterval(100),
             Fee(XRP(100)));
         env.close();
         // Ensure broker has sufficient cover so brokerPayee == brokerOwner
@@ -6812,7 +6799,7 @@ protected:
         env.fund(XRP(20'000), issuer, broker, borrower);
         env.close();
 
-        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mptt{env, issuer, kMptInitNoFund};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
 
         PrettyAsset const mpt{mptt.issuanceID()};
@@ -6834,8 +6821,8 @@ protected:
         auto const keylet = keylet::loan(brokerInfo.brokerID, 1);
         env(set(borrower, brokerInfo.brokerID, 10'000),
             Sig(sfCounterpartySignature, broker),
-            kLOAN_SERVICE_FEE(mpt(100).value()),
-            kPAYMENT_INTERVAL(100),
+            kLoanServiceFee(mpt(100).value()),
+            kPaymentInterval(100),
             Fee(XRP(100)));
         env.close();
         // Ensure broker has sufficient cover so brokerPayee == brokerOwner
@@ -6909,7 +6896,7 @@ protected:
         env(credentials::accept(borrower, issuer, credType));
         env.close();
 
-        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mptt{env, issuer, kMptInitNoFund};
         mptt.create({
             .flags = tfMPTCanClawback | tfMPTRequireAuth | tfMPTCanTransfer | tfMPTCanLock,
             .domainID = domainID,
@@ -6934,8 +6921,8 @@ protected:
         auto const keylet = keylet::loan(brokerInfo.brokerID, 1);
         env(set(borrower, brokerInfo.brokerID, 10'000),
             Sig(sfCounterpartySignature, broker),
-            kLOAN_SERVICE_FEE(mpt(100).value()),
-            kPAYMENT_INTERVAL(100),
+            kLoanServiceFee(mpt(100).value()),
+            kPaymentInterval(100),
             Fee(XRP(100)));
         env.close();
         // Ensure broker has sufficient cover so brokerPayee == brokerOwner
@@ -7013,7 +7000,7 @@ protected:
         env(credentials::accept(borrower, issuer, credType));
         env.close();
 
-        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mptt{env, issuer, kMptInitNoFund};
         mptt.create({
             .flags = tfMPTCanClawback | tfMPTRequireAuth | tfMPTCanTransfer | tfMPTCanLock,
             .domainID = domainID,
@@ -7046,8 +7033,8 @@ protected:
         // Create a loan, this should fail for tecNO_AUTH
         env(set(borrower, brokerInfo.brokerID, 10'000),
             Sig(sfCounterpartySignature, broker),
-            kLOAN_SERVICE_FEE(mpt(100).value()),
-            kPAYMENT_INTERVAL(100),
+            kLoanServiceFee(mpt(100).value()),
+            kPaymentInterval(100),
             Fee(XRP(100)),
             Ter(tecNO_AUTH));
         env.close();
@@ -7103,10 +7090,10 @@ protected:
         auto loanATx = env.jt(
             set(borrowerA, brokerKeylet.key, principalAmount),
             Sig(sfCounterpartySignature, lender),
-            kINTEREST_RATE(TenthBips32(500)),  // 5%
-            kPAYMENT_TOTAL(12),
-            loan::kPAYMENT_INTERVAL(loanPaymentInterval),
-            loan::kGRACE_PERIOD(loanGracePeriod),
+            kInterestRate(TenthBips32(500)),  // 5%
+            kPaymentTotal(12),
+            loan::kPaymentInterval(loanPaymentInterval),
+            loan::kGracePeriod(loanGracePeriod),
             Fee(XRP(10)));  // Sufficient fee for multi-sig transaction
         env(loanATx);
         env.close();
@@ -7117,10 +7104,10 @@ protected:
         auto loanBTx = env.jt(
             set(borrowerB, brokerKeylet.key, principalAmount),
             Sig(sfCounterpartySignature, lender),
-            kINTEREST_RATE(TenthBips32(500)),  // 5%
-            kPAYMENT_TOTAL(12),
-            loan::kPAYMENT_INTERVAL(loanPaymentInterval),
-            loan::kGRACE_PERIOD(loanGracePeriod),
+            kInterestRate(TenthBips32(500)),  // 5%
+            kPaymentTotal(12),
+            loan::kPaymentInterval(loanPaymentInterval),
+            loan::kGracePeriod(loanGracePeriod),
             Fee(XRP(10)));  // Sufficient fee for multi-sig transaction
         env(loanBTx);
         env.close();
@@ -7209,7 +7196,7 @@ protected:
         auto const [currentSeq, vaultKeylet] = [&]() {
             auto const brokerSle = env.le(keylet::loanbroker(brokerInfo.brokerID));
             if (!BEAST_EXPECT(brokerSle))
-                return std::make_tuple(0u, keylet::unchecked(beast::kZERO));
+                return std::make_tuple(0u, keylet::unchecked(beast::kZero));
             auto const currentSeq = brokerSle->at(sfLoanSequence);
             auto const vaultKeylet = keylet::vault(brokerSle->at(sfVaultID));
             return std::make_tuple(currentSeq, vaultKeylet);
@@ -7224,9 +7211,9 @@ protected:
         auto const loanSetFee = Fee(env.current()->fees().base * 2);
         env(set(borrower, brokerInfo.brokerID, iou(principal).value(), flags),
             Sig(sfCounterpartySignature, lender),
-            loan::kINTEREST_RATE(interestRate),
-            loan::kPAYMENT_INTERVAL(paymentInterval),
-            loan::kPAYMENT_TOTAL(paymentTotal),
+            loan::kInterestRate(interestRate),
+            loan::kPaymentInterval(paymentInterval),
+            loan::kPaymentTotal(paymentTotal),
             Fee(loanSetFee));
         env.close();
 
@@ -7294,12 +7281,12 @@ protected:
             auto const delta = currentAssetsTotal - previousAssetsTotal;
 
             BEAST_EXPECT(
-                (delta == beast::kZERO && borrowerDelta <= roundedPayment) ||
-                (delta > beast::kZERO && borrowerDelta > roundedPayment));
+                (delta == beast::kZero && borrowerDelta <= roundedPayment) ||
+                (delta > beast::kZero && borrowerDelta > roundedPayment));
 
             // If tx succeeded but Assets Total didn't change, interest was
             // stolen.
-            if (delta == beast::kZERO && borrowerDelta > roundedPayment)
+            if (delta == beast::kZero && borrowerDelta > roundedPayment)
             {
                 yieldTheftCount++;
             }
@@ -7323,15 +7310,15 @@ protected:
         testcase("Vault withdraw reflects sfLossUnrealized");
 
         // Test constants
-        static constexpr std::int64_t kINITIAL_FUNDING = 1'000'000;
-        static constexpr std::int64_t kLENDER_INITIAL_IOU = 5'000'000;
-        static constexpr std::int64_t kDEPOSITOR_INITIAL_IOU = 1'000'000;
-        static constexpr std::int64_t kBORROWER_INITIAL_IOU = 100'000;
-        static constexpr std::int64_t kDEPOSIT_AMOUNT = 5'000;
-        static constexpr std::int64_t kPRINCIPAL_AMOUNT = 99;
-        static constexpr std::uint64_t kEXPECTED_SHARES_PER_DEPOSITOR = 5'000'000'000;
-        static constexpr std::uint32_t kLOCAL_PAYMENT_INTERVAL = 600;
-        static constexpr std::uint32_t kLOCAL_PAYMENT_TOTAL = 2;
+        static constexpr std::int64_t kInitialFunding = 1'000'000;
+        static constexpr std::int64_t kLenderInitialIou = 5'000'000;
+        static constexpr std::int64_t kDepositorInitialIou = 1'000'000;
+        static constexpr std::int64_t kBorrowerInitialIou = 100'000;
+        static constexpr std::int64_t kDepositAmount = 5'000;
+        static constexpr std::int64_t kPrincipalAmount = 99;
+        static constexpr std::uint64_t kExpectedSharesPerDepositor = 5'000'000'000;
+        static constexpr std::uint32_t kLocalPaymentInterval = 600;
+        static constexpr std::uint32_t kLocalPaymentTotal = 2;
 
         Env env(*this, all_);
 
@@ -7342,7 +7329,7 @@ protected:
         Account const depositorB{"lpB"};
         Account const borrower{"borrowerA"};
 
-        env.fund(XRP(kINITIAL_FUNDING), issuer, lender, depositorA, depositorB, borrower);
+        env.fund(XRP(kInitialFunding), issuer, lender, depositorA, depositorB, borrower);
         env.close();
 
         // Setup trust lines
@@ -7354,10 +7341,10 @@ protected:
         env.close();
 
         // Fund accounts with IOUs
-        env(pay(issuer, lender, iouAsset(kLENDER_INITIAL_IOU)));
-        env(pay(issuer, depositorA, iouAsset(kDEPOSITOR_INITIAL_IOU)));
-        env(pay(issuer, depositorB, iouAsset(kDEPOSITOR_INITIAL_IOU)));
-        env(pay(issuer, borrower, iouAsset(kBORROWER_INITIAL_IOU)));
+        env(pay(issuer, lender, iouAsset(kLenderInitialIou)));
+        env(pay(issuer, depositorA, iouAsset(kDepositorInitialIou)));
+        env(pay(issuer, depositorB, iouAsset(kDepositorInitialIou)));
+        env(pay(issuer, borrower, iouAsset(kBorrowerInitialIou)));
         env.close();
 
         // Create vault and broker, then add deposits from two depositors
@@ -7367,13 +7354,13 @@ protected:
         env(v.deposit({
                 .depositor = depositorA,
                 .id = broker.vaultKeylet().key,
-                .amount = iouAsset(kDEPOSIT_AMOUNT),
+                .amount = iouAsset(kDepositAmount),
             }),
             Ter(tesSUCCESS));
         env(v.deposit({
                 .depositor = depositorB,
                 .id = broker.vaultKeylet().key,
-                .amount = iouAsset(kDEPOSIT_AMOUNT),
+                .amount = iouAsset(kDepositAmount),
             }),
             Ter(tesSUCCESS));
         env.close();
@@ -7385,10 +7372,10 @@ protected:
 
         auto const loanKeylet = keylet::loan(broker.brokerID, sleBroker->at(sfLoanSequence));
 
-        env(set(borrower, broker.brokerID, kPRINCIPAL_AMOUNT),
+        env(set(borrower, broker.brokerID, kPrincipalAmount),
             Sig(sfCounterpartySignature, lender),
-            kPAYMENT_TOTAL(kLOCAL_PAYMENT_TOTAL),
-            kPAYMENT_INTERVAL(kLOCAL_PAYMENT_INTERVAL),
+            kPaymentTotal(kLocalPaymentTotal),
+            kPaymentInterval(kLocalPaymentInterval),
             Fee(env.current()->fees().base * 2),
             Ter(tesSUCCESS));
         env.close();
@@ -7403,7 +7390,7 @@ protected:
             return;
 
         BEAST_EXPECT(
-            vaultAfterImpair->at(sfLossUnrealized) == broker.asset(kPRINCIPAL_AMOUNT).value());
+            vaultAfterImpair->at(sfLossUnrealized) == broker.asset(kPrincipalAmount).value());
 
         // Helper to get share balance for a depositor
         auto const shareAsset = vaultAfterImpair->at(sfShareMPTID);
@@ -7415,8 +7402,8 @@ protected:
         // Verify both depositors have equal shares
         auto const sharesLpA = getShareBalance(depositorA);
         auto const sharesLpB = getShareBalance(depositorB);
-        BEAST_EXPECT(sharesLpA == kEXPECTED_SHARES_PER_DEPOSITOR);
-        BEAST_EXPECT(sharesLpB == kEXPECTED_SHARES_PER_DEPOSITOR);
+        BEAST_EXPECT(sharesLpA == kExpectedSharesPerDepositor);
+        BEAST_EXPECT(sharesLpB == kExpectedSharesPerDepositor);
         BEAST_EXPECT(sharesLpA == sharesLpB);
 
         // Helper to attempt withdrawal
diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp
index 36895dd1cf..1e7763ac62 100644
--- a/src/test/app/MPToken_test.cpp
+++ b/src/test/app/MPToken_test.cpp
@@ -148,7 +148,7 @@ class MPToken_test : public beast::unit_test::Suite
             mptAlice.create(
                 {.maxAmt = 100,
                  .assetScale = 0,
-                 .transferFee = kMAX_TRANSFER_FEE + 1,
+                 .transferFee = kMaxTransferFee + 1,
                  .metadata = "test",
                  .flags = tfMPTCanTransfer,
                  .err = temBAD_TRANSFER_FEE});
@@ -157,7 +157,7 @@ class MPToken_test : public beast::unit_test::Suite
             mptAlice.create(
                 {.maxAmt = 100,
                  .assetScale = 0,
-                 .transferFee = kMAX_TRANSFER_FEE,
+                 .transferFee = kMaxTransferFee,
                  .metadata = "test",
                  .err = temMALFORMED});
 
@@ -185,7 +185,7 @@ class MPToken_test : public beast::unit_test::Suite
                  .metadata = "test",
                  .err = temMALFORMED});
             mptAlice.create(
-                {.maxAmt = kMAX_MP_TOKEN_AMOUNT + 1,  // 9'223'372'036'854'775'808
+                {.maxAmt = kMaxMpTokenAmount + 1,  // 9'223'372'036'854'775'808
                  .assetScale = 0,
                  .transferFee = 0,
                  .metadata = "test",
@@ -207,7 +207,7 @@ class MPToken_test : public beast::unit_test::Suite
             Env env{*this, features};
             MPTTester mptAlice(env, alice);
             mptAlice.create(
-                {.maxAmt = kMAX_MP_TOKEN_AMOUNT,  // 9'223'372'036'854'775'807
+                {.maxAmt = kMaxMpTokenAmount,  // 9'223'372'036'854'775'807
                  .assetScale = 1,
                  .transferFee = 10,
                  .metadata = "123",
@@ -243,7 +243,7 @@ class MPToken_test : public beast::unit_test::Suite
 
                 MPTTester mptAlice(env, alice);
                 mptAlice.create({
-                    .maxAmt = kMAX_MP_TOKEN_AMOUNT,  // 9'223'372'036'854'775'807
+                    .maxAmt = kMaxMpTokenAmount,  // 9'223'372'036'854'775'807
                     .assetScale = 1,
                     .transferFee = 10,
                     .metadata = "123",
@@ -1517,7 +1517,7 @@ class MPToken_test : public beast::unit_test::Suite
             mptAlice.authorize({.account = bob});
 
             // issuer sends holder the default max amount allowed
-            mptAlice.pay(alice, bob, kMAX_MP_TOKEN_AMOUNT);
+            mptAlice.pay(alice, bob, kMaxMpTokenAmount);
 
             // issuer tries to exceed max amount
             auto const err = mpTokensV2 ? tecPATH_DRY : tecPATH_PARTIAL;
@@ -1533,7 +1533,7 @@ class MPToken_test : public beast::unit_test::Suite
             json::Value jv;
             jv[jss::secret] = alice.name();
             jv[jss::tx_json] = pay(alice, bob, mpt);
-            jv[jss::tx_json][jss::Amount][jss::value] = std::to_string(kMAX_MP_TOKEN_AMOUNT + 1);
+            jv[jss::tx_json][jss::Amount][jss::value] = std::to_string(kMaxMpTokenAmount + 1);
             auto const jrr = env.rpc("json", "submit", to_string(jv));
             BEAST_EXPECT(jrr[jss::result][jss::error] == "invalidParams");
         }
@@ -1592,7 +1592,7 @@ class MPToken_test : public beast::unit_test::Suite
             MPTTester mptAlice(env, alice, {.holders = {bob, carol}});
 
             mptAlice.create(
-                {.maxAmt = kMAX_MP_TOKEN_AMOUNT,
+                {.maxAmt = kMaxMpTokenAmount,
                  .ownerCount = 1,
                  .holderCount = 0,
                  .flags = tfMPTCanTransfer});
@@ -1602,14 +1602,14 @@ class MPToken_test : public beast::unit_test::Suite
             mptAlice.authorize({.account = carol});
 
             // issuer sends holder the max amount allowed
-            mptAlice.pay(alice, bob, kMAX_MP_TOKEN_AMOUNT);
-            BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(kMAX_MP_TOKEN_AMOUNT));
+            mptAlice.pay(alice, bob, kMaxMpTokenAmount);
+            BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(kMaxMpTokenAmount));
 
             // payment between the holders
-            mptAlice.pay(bob, carol, kMAX_MP_TOKEN_AMOUNT);
-            BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(kMAX_MP_TOKEN_AMOUNT));
+            mptAlice.pay(bob, carol, kMaxMpTokenAmount);
+            BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(kMaxMpTokenAmount));
             // holder pays back to the issuer
-            mptAlice.pay(carol, alice, kMAX_MP_TOKEN_AMOUNT);
+            mptAlice.pay(carol, alice, kMaxMpTokenAmount);
             BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(0));
         }
 
@@ -2266,7 +2266,7 @@ class MPToken_test : public beast::unit_test::Suite
             auto const mpt = xrpl::test::jtx::MPT(alice.name(), makeMptID(env.seq(alice), alice));
 
             json::Value jv = claw(alice, mpt(1), bob);
-            jv[jss::Amount][jss::value] = std::to_string(kMAX_MP_TOKEN_AMOUNT + 1);
+            jv[jss::Amount][jss::value] = std::to_string(kMaxMpTokenAmount + 1);
             json::Value jv1;
             jv1[jss::secret] = alice.name();
             jv1[jss::tx_json] = jv;
@@ -2712,7 +2712,7 @@ class MPToken_test : public beast::unit_test::Suite
 
             mptAlice.create({.ownerCount = 1, .mutableFlags = tmfMPTCanMutateMetadata});
 
-            std::string const metadata(kMAX_MP_TOKEN_METADATA_LENGTH + 1, 'a');
+            std::string const metadata(kMaxMpTokenMetadataLength + 1, 'a');
             mptAlice.set({.account = alice, .metadata = metadata, .err = temMALFORMED});
         }
 
@@ -2736,7 +2736,7 @@ class MPToken_test : public beast::unit_test::Suite
             mptAlice.set(
                 {.account = alice,
                  .id = mptID,
-                 .transferFee = kMAX_TRANSFER_FEE + 1,
+                 .transferFee = kMaxTransferFee + 1,
                  .err = temBAD_TRANSFER_FEE});
         }
 
@@ -2890,8 +2890,8 @@ class MPToken_test : public beast::unit_test::Suite
                  .flags = tfMPTCanTransfer,
                  .mutableFlags = tmfMPTCanMutateTransferFee});
 
-            for (std::uint16_t const fee : std::initializer_list<std::uint16_t>{
-                     1, 10, 100, 200, 500, 1000, kMAX_TRANSFER_FEE})
+            for (std::uint16_t const fee :
+                 std::initializer_list<std::uint16_t>{1, 10, 100, 200, 500, 1000, kMaxTransferFee})
             {
                 mptAlice.set({.account = alice, .transferFee = fee});
                 BEAST_EXPECT(mptAlice.checkTransferFee(fee));
@@ -3151,23 +3151,23 @@ class MPToken_test : public beast::unit_test::Suite
 
         // MPTCanEscrow is not enabled
         env(escrow::create(carol, bob, mpt(3)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150),
             Ter(tecNO_PERMISSION));
 
         // MPTCanEscrow is enabled now
         mptAlice.set({.account = alice, .mutableFlags = tmfMPTSetCanEscrow});
         env(escrow::create(carol, bob, mpt(3)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150));
 
         // Clear MPTCanEscrow
         mptAlice.set({.account = alice, .mutableFlags = tmfMPTClearCanEscrow});
         env(escrow::create(carol, bob, mpt(3)),
-            escrow::kCONDITION(escrow::kCB1),
-            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCondition(escrow::kCb1),
+            escrow::kFinishTime(env.now() + 1s),
             Fee(baseFee * 150),
             Ter(tecNO_PERMISSION));
     }
@@ -3321,11 +3321,11 @@ class MPToken_test : public beast::unit_test::Suite
         Account const alice("alice");
         Account const bob("bob");
 
-        std::uint64_t constexpr kMAX_AMT = 150;
+        static constexpr std::uint64_t kMaxAmt = 150;
         Env env{*this, features};
 
         MPTTester mptTester(env, issuer, {.holders = {alice, bob}});
-        mptTester.create({.maxAmt = kMAX_AMT, .ownerCount = 1, .flags = tfMPTCanTransfer});
+        mptTester.create({.maxAmt = kMaxAmt, .ownerCount = 1, .flags = tfMPTCanTransfer});
         mptTester.authorize({.account = alice});
         mptTester.authorize({.account = bob});
 
@@ -3362,14 +3362,14 @@ class MPToken_test : public beast::unit_test::Suite
             std::nullopt,
             "aggregate exceeds max");
 
-        runTest(R{{alice.id(), 75}, {bob.id(), 75}}, tesSUCCESS, kMAX_AMT, "aggregate at boundary");
+        runTest(R{{alice.id(), 75}, {bob.id(), 75}}, tesSUCCESS, kMaxAmt, "aggregate at boundary");
 
         runTest(R{{alice.id(), 50}, {bob.id(), 50}}, tesSUCCESS, 100, "aggregate within limit");
 
         runTest(
             R{{alice.id(), 150}, {bob.id(), 0}},
             tesSUCCESS,
-            kMAX_AMT,
+            kMaxAmt,
             "one receiver at max, other zero");
 
         runTest(
@@ -3387,7 +3387,7 @@ class MPToken_test : public beast::unit_test::Suite
         runTest(
             R{{alice.id(), 50}, {bob.id(), 50}},
             tesSUCCESS,
-            kMAX_AMT,
+            kMaxAmt,
             "nonzero outstanding, aggregate at boundary");
 
         runTest(
@@ -3399,7 +3399,7 @@ class MPToken_test : public beast::unit_test::Suite
         runTest(
             R{{alice.id(), 100}, {bob.id(), 0}},
             tesSUCCESS,
-            kMAX_AMT,
+            kMaxAmt,
             "nonzero outstanding, single send at remaining capacity");
 
         runTest(
@@ -3558,13 +3558,13 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, carol, bob, dan},
                  .pay = 100,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             MPTTester eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob, dan},
                  .pay = 100,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             env(offer(bob, eth(10), btc(10)), Txflags(tfPassive));
             env(offer(dan, btc(10), eth(10)), Txflags(tfPassive));
@@ -3603,14 +3603,14 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 100,
-                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
+                 .flags = tfMPTRequireAuth | kMptDexFlags,
                  .authHolder = true});
             MPTTester const eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 100,
-                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
+                 .flags = tfMPTRequireAuth | kMptDexFlags,
                  .authHolder = true});
 
             btc.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
@@ -3917,7 +3917,7 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
+                 .flags = tfMPTCanLock | kMptDexFlags,
                  .mutableFlags = tmfMPTCanMutateRequireAuth | tmfMPTCanMutateCanTrade |
                      tmfMPTCanMutateCanTransfer});
             MPTTester eth(
@@ -3925,21 +3925,21 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
+                 .flags = tfMPTCanLock | kMptDexFlags,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             MPTTester const usd(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
+                 .flags = kMptDexFlags | tfMPTCanLock,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             MPTTester const cad(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
+                 .flags = kMptDexFlags | tfMPTCanLock,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
 
             env(offer(bob, eth(1'000), btc(1'000)), Txflags(tfPassive));
@@ -4028,28 +4028,28 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
+                 .flags = tfMPTCanLock | kMptDexFlags,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             MPTTester eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
+                 .flags = tfMPTCanLock | kMptDexFlags,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             MPTTester usd(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
+                 .flags = kMptDexFlags | tfMPTCanLock,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             MPTTester cad(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
+                 .flags = kMptDexFlags | tfMPTCanLock,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             // takerGets can transfer if:
             //  - CanTransfer is set
@@ -4215,13 +4215,13 @@ class MPToken_test : public beast::unit_test::Suite
                      .issuer = gw,
                      .holders = {alice, carol, bob},
                      .pay = 100,
-                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                     .flags = tfMPTCanLock | kMptDexFlags});
                 MPTTester const eth(
                     {.env = env,
                      .issuer = gw,
                      .holders = {alice, carol, bob},
                      .pay = 100,
-                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                     .flags = tfMPTCanLock | kMptDexFlags});
                 return std::make_pair(btc, eth);
             };
             auto getIOU = [&](Env& env) {
@@ -4350,13 +4350,13 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 100,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
             MPTTester eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 100,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | kMptDexFlags});
 
             env(trust(alice, usd(100)));
             env(pay(gw, alice, usd(100)));
@@ -5842,7 +5842,7 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice, carol},
                  .pay = 100,
-                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock});
+                 .flags = kMptDexFlags | tfMPTCanLock});
 
             mpt.set({.flags = tfMPTLock});
 
@@ -5913,7 +5913,7 @@ class MPToken_test : public beast::unit_test::Suite
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol},
-                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS});
+                 .flags = tfMPTRequireAuth | kMptDexFlags});
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
             env(check::create(alice, carol, btc(50)));
             env.close();
@@ -6060,7 +6060,7 @@ class MPToken_test : public beast::unit_test::Suite
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
-                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
+                 .flags = tfMPTRequireAuth | kMptDexFlags,
                  .authHolder = true});
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
             env(check::create(alice, carol, btc(1)));
@@ -6184,7 +6184,7 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanLock | tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanLock | tfMPTCanClawback | kMptDexFlags});
 
             env.trust(usd(10'000), alice);
             env(pay(gw, alice, usd(10'000)));
@@ -6215,7 +6215,7 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTRequireAuth | tfMPTCanClawback | kMPT_DEX_FLAGS,
+                 .flags = tfMPTRequireAuth | tfMPTCanClawback | kMptDexFlags,
                  .authHolder = true});
 
             env.trust(usd(10'000), alice);
@@ -6299,9 +6299,9 @@ class MPToken_test : public beast::unit_test::Suite
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 10'000,
-                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                 .flags = tfMPTCanClawback | kMptDexFlags});
             auto eur =
-                MPTTester({.env = env, .issuer = gw, .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+                MPTTester({.env = env, .issuer = gw, .flags = tfMPTCanClawback | kMptDexFlags});
             AMM amm(env, gw, usd(1'000), eur(1'000));
             amm.deposit({.account = alice, .asset1In = usd(1'000)});
             // MPToken doesn't exist
@@ -6440,7 +6440,7 @@ class MPToken_test : public beast::unit_test::Suite
             auto usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
-                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
+                 .flags = tfMPTCanLock | kMptDexFlags,
                  .mutableFlags = tmfMPTCanMutateRequireAuth | tmfMPTCanMutateCanTransfer |
                      tmfMPTCanMutateCanClawback | tmfMPTCanMutateCanTrade});
             auto eur = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 1'000'000});
diff --git a/src/test/app/Manifest_test.cpp b/src/test/app/Manifest_test.cpp
index f20847ae5c..55aa93bf79 100644
--- a/src/test/app/Manifest_test.cpp
+++ b/src/test/app/Manifest_test.cpp
@@ -115,7 +115,7 @@ public:
         SecretKey const& ssk,
         int seq)
     {
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = seq;
         st[sfPublicKey] = pk;
         st[sfSigningPubKey] = spk;
@@ -137,7 +137,7 @@ public:
     {
         auto const pk = derivePublicKey(type, sk);
 
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = std::numeric_limits<std::uint32_t>::max();
         st[sfPublicKey] = pk;
 
@@ -156,7 +156,7 @@ public:
     {
         auto const pk = derivePublicKey(type, sk);
 
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = std::numeric_limits<std::uint32_t>::max();
         st[sfPublicKey] = pk;
 
@@ -186,7 +186,7 @@ public:
         auto const pk = derivePublicKey(type, sk);
         auto const spk = derivePublicKey(stype, ssk);
 
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = seq;
         st[sfPublicKey] = pk;
         st[sfSigningPubKey] = spk;
@@ -363,7 +363,7 @@ public:
         auto const kp = randomKeyPair(KeyType::Secp256k1);
         auto const m = makeManifest(sk, KeyType::Ed25519, kp.second, KeyType::Secp256k1, 0);
 
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = 0;
         st[sfPublicKey] = pk;
         st[sfSigningPubKey] = kp.first;
@@ -495,7 +495,7 @@ public:
         auto const spk = derivePublicKey(KeyType::Secp256k1, ssk);
 
         auto buildManifestObject = [&](std::uint16_t version) {
-            STObject st(kSF_GENERIC);
+            STObject st(kSfGeneric);
             st[sfSequence] = 3;
             st[sfPublicKey] = pk;
             st[sfSigningPubKey] = spk;
@@ -573,7 +573,7 @@ public:
                                                std::optional<std::string> domain,
                                                bool noSigningPublic = false,
                                                bool noSignature = false) {
-                    STObject st(kSF_GENERIC);
+                    STObject st(kSfGeneric);
                     st[sfSequence] = seq;
                     st[sfPublicKey] = pk;
 
@@ -724,7 +724,7 @@ public:
                     }
                     {
                         // reject matching master & ephemeral keys
-                        STObject st(kSF_GENERIC);
+                        STObject st(kSfGeneric);
                         st[sfSequence] = 314159;
                         st[sfPublicKey] = pk;
                         st[sfSigningPubKey] = pk;
@@ -797,7 +797,7 @@ public:
         auto const pk2 = derivePublicKey(KeyType::Secp256k1, sk2);
 
         auto test = [&](std::string domain) {
-            STObject st(kSF_GENERIC);
+            STObject st(kSfGeneric);
             st[sfSequence] = 7;
             st[sfPublicKey] = pk1;
             st[sfDomain] = makeSlice(domain);
diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp
index 7588a6f272..f21611df0e 100644
--- a/src/test/app/MultiSign_test.cpp
+++ b/src/test/app/MultiSign_test.cpp
@@ -143,7 +143,7 @@ public:
             env.require(Owners(alice, 1));
         }
         // Remove alice's signer list and get the owner count back.
-        env(signers(alice, jtx::kNONE));
+        env(signers(alice, jtx::kNone));
         env.close();
         env.require(Owners(alice, 0));
     }
@@ -826,7 +826,7 @@ public:
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Remove alice's signer list and get the owner count back.
-        env(signers(alice, jtx::kNONE), Sig(alie));
+        env(signers(alice, jtx::kNone), Sig(alie));
         env.close();
         env.require(Owners(alice, 0));
     }
@@ -871,23 +871,23 @@ public:
         env(fset(alice, asfDisableMaster), Sig(alice));
 
         // R0: A lone regular key cannot be removed.
-        env(regkey(alice, kDISABLED), Sig(alie), Ter(tecNO_ALTERNATIVE_KEY));
+        env(regkey(alice, kDisabled), Sig(alie), Ter(tecNO_ALTERNATIVE_KEY));
 
         // Add a signer list.
         env(signers(alice, 1, {{bogie_, 1}}), Sig(alie));
 
         // R1: The regular key can be removed if there's a signer list.
-        env(regkey(alice, kDISABLED), Sig(alie));
+        env(regkey(alice, kDisabled), Sig(alie));
 
         // L0: A lone signer list cannot be removed.
         auto const baseFee = env.current()->fees().base;
-        env(signers(alice, jtx::kNONE), Msig(bogie_), Fee(2 * baseFee), Ter(tecNO_ALTERNATIVE_KEY));
+        env(signers(alice, jtx::kNone), Msig(bogie_), Fee(2 * baseFee), Ter(tecNO_ALTERNATIVE_KEY));
 
         // Enable the master key.
         env(fclear(alice, asfDisableMaster), Msig(bogie_), Fee(2 * baseFee));
 
         // L1: The signer list can be removed if the master key is enabled.
-        env(signers(alice, jtx::kNONE), Msig(bogie_), Fee(2 * baseFee));
+        env(signers(alice, jtx::kNone), Msig(bogie_), Fee(2 * baseFee));
 
         // Add a signer list.
         env(signers(alice, 1, {{bogie_, 1}}), Sig(alice));
@@ -899,13 +899,13 @@ public:
         env(regkey(alice, alie), Msig(bogie_), Fee(2 * baseFee));
 
         // L2: The signer list can be removed if there's a regular key.
-        env(signers(alice, jtx::kNONE), Sig(alie));
+        env(signers(alice, jtx::kNone), Sig(alie));
 
         // Enable the master key.
         env(fclear(alice, asfDisableMaster), Sig(alie));
 
         // R2: The regular key can be removed if the master key is enabled.
-        env(regkey(alice, kDISABLED), Sig(alie));
+        env(regkey(alice, kDisabled), Sig(alie));
     }
 
     // Verify that the first regular key can be made for free using the
@@ -1398,7 +1398,7 @@ public:
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Should also be able to remove the signer list using a ticket.
-        env(signers(alice, jtx::kNONE), ticket::Use(aliceTicketSeq++));
+        env(signers(alice, jtx::kNone), ticket::Use(aliceTicketSeq++));
         env.close();
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
diff --git a/src/test/app/NFTokenAuth_test.cpp b/src/test/app/NFTokenAuth_test.cpp
index da5760f387..4929cadd65 100644
--- a/src/test/app/NFTokenAuth_test.cpp
+++ b/src/test/app/NFTokenAuth_test.cpp
@@ -582,11 +582,11 @@ public:
     run() override
     {
         using namespace test::jtx;
-        static FeatureBitset const kALL{testableAmendments()};
+        static FeatureBitset const kAll{testableAmendments()};
 
-        static std::array const kFEATURES = {kALL - fixEnforceNFTokenTrustlineV2, kALL};
+        static std::array const kFeatures = {kAll - fixEnforceNFTokenTrustlineV2, kAll};
 
-        for (auto const feature : kFEATURES)
+        for (auto const feature : kFeatures)
         {
             testBuyOfferUnauthorizedSeller(feature);
             testCreateBuyOfferUnauthorizedBuyer(feature);
diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp
index 1e1910866d..f08793da72 100644
--- a/src/test/app/NFTokenBurn_test.cpp
+++ b/src/test/app/NFTokenBurn_test.cpp
@@ -67,7 +67,7 @@ class NFTokenBurn_test : public beast::unit_test::Suite
         using namespace test::jtx;
         uint256 const nftokenID = token::getNextID(env, owner, 0, tfTransferable);
         env(token::mint(owner, 0),
-            token::Uri(std::string(kMAX_TOKEN_URI_LENGTH, 'u')),
+            token::Uri(std::string(kMaxTokenUriLength, 'u')),
             Txflags(tfTransferable));
         env.close();
 
@@ -200,7 +200,7 @@ class NFTokenBurn_test : public beast::unit_test::Suite
         // way each time.
         std::mt19937 engine;
         std::uniform_int_distribution<std::size_t> feeDist(
-            decltype(kMAX_TRANSFER_FEE){}, kMAX_TRANSFER_FEE);
+            decltype(kMaxTransferFee){}, kMaxTransferFee);
 
         alice.nfts.reserve(105);
         while (alice.nfts.size() < 105)
@@ -337,7 +337,7 @@ class NFTokenBurn_test : public beast::unit_test::Suite
         BEAST_EXPECT(nftCount(env, becky.acct) == 0);
         BEAST_EXPECT(nftCount(env, minter.acct) == 0);
 
-        // When all nfts are burned kNONE of the accounts should have
+        // When all nfts are burned kNone of the accounts should have
         // an ownerCount.
         BEAST_EXPECT(ownerCount(env, alice) == 0);
         BEAST_EXPECT(ownerCount(env, becky) == 0);
@@ -861,8 +861,8 @@ class NFTokenBurn_test : public beast::unit_test::Suite
             // When the token is burned, 498 sell offers and 1 buy offer are
             // removed. In total, 499 offers are removed
             std::vector<uint256> offerIndexes;
-            auto const nftokenID = createNftAndOffers(
-                env, alice, offerIndexes, kMAX_DELETABLE_TOKEN_OFFER_ENTRIES - 2);
+            auto const nftokenID =
+                createNftAndOffers(env, alice, offerIndexes, kMaxDeletableTokenOfferEntries - 2);
 
             // Verify all sell offers are present in the ledger.
             for (uint256 const& offerIndex : offerIndexes)
@@ -908,8 +908,8 @@ class NFTokenBurn_test : public beast::unit_test::Suite
             // After we burn the token, 500 of the sell offers should be
             // removed, and one is left over
             std::vector<uint256> offerIndexes;
-            auto const nftokenID = createNftAndOffers(
-                env, alice, offerIndexes, kMAX_DELETABLE_TOKEN_OFFER_ENTRIES + 1);
+            auto const nftokenID =
+                createNftAndOffers(env, alice, offerIndexes, kMaxDeletableTokenOfferEntries + 1);
 
             // Verify all sell offers are present in the ledger.
             for (uint256 const& offerIndex : offerIndexes)
@@ -929,10 +929,10 @@ class NFTokenBurn_test : public beast::unit_test::Suite
                     offerDeletedCount++;
             }
 
-            BEAST_EXPECT(offerIndexes.size() == kMAX_TOKEN_OFFER_CANCEL_COUNT + 1);
+            BEAST_EXPECT(offerIndexes.size() == kMaxTokenOfferCancelCount + 1);
 
             // 500 sell offers should be removed
-            BEAST_EXPECT(offerDeletedCount == kMAX_TOKEN_OFFER_CANCEL_COUNT);
+            BEAST_EXPECT(offerDeletedCount == kMaxTokenOfferCancelCount);
 
             // alice should have ownerCounts of one for the orphaned sell offer
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -952,8 +952,8 @@ class NFTokenBurn_test : public beast::unit_test::Suite
             // are removed.
             // In total, 500 offers are removed
             std::vector<uint256> offerIndexes;
-            auto const nftokenID = createNftAndOffers(
-                env, alice, offerIndexes, kMAX_DELETABLE_TOKEN_OFFER_ENTRIES - 1);
+            auto const nftokenID =
+                createNftAndOffers(env, alice, offerIndexes, kMaxDeletableTokenOfferEntries - 1);
 
             // Verify all sell offers are present in the ledger.
             for (uint256 const& offerIndex : offerIndexes)
diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp
index f52992c468..117f2bc816 100644
--- a/src/test/app/NFTokenDir_test.cpp
+++ b/src/test/app/NFTokenDir_test.cpp
@@ -126,10 +126,10 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // Mint 100 sequential NFTs.  Tweak the taxon so zero is always stored.
         // That's what makes them sequential.
-        constexpr std::size_t kNFT_COUNT = 100;
+        static constexpr std::size_t kNftCount = 100;
         std::vector<uint256> nftIDs;
-        nftIDs.reserve(kNFT_COUNT);
-        for (int i = 0; i < kNFT_COUNT; ++i)
+        nftIDs.reserve(kNftCount);
+        for (int i = 0; i < kNftCount; ++i)
         {
             std::uint32_t const taxon = toUInt32(nft::cipheredTaxon(i, nft::toTaxon(0)));
             nftIDs.emplace_back(token::getNextID(env, issuer, taxon, tfTransferable));
@@ -272,7 +272,7 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // These seeds cause a lopsided split where the new NFT is added
         // to the upper page.
-        static std::initializer_list<std::string_view const> const kSPLIT_AND_ADD_TO_HI{
+        static std::initializer_list<std::string_view const> const kSplitAndAddToHi{
             "sp6JS7f14BuwFY8Mw5p3b8jjQBBTK",  //  0. 0x1d2932ea
             "sp6JS7f14BuwFY8Mw6F7X3EiGKazu",  //  1. 0x1d2932ea
             "sp6JS7f14BuwFY8Mw6FxjntJJfKXq",  //  2. 0x1d2932ea
@@ -318,7 +318,7 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // These seeds cause a lopsided split where the new NFT is added
         // to the lower page.
-        static std::initializer_list<std::string_view const> const kSPLIT_AND_ADD_TO_LO{
+        static std::initializer_list<std::string_view const> const kSplitAndAddToLo{
             "sp6JS7f14BuwFY8Mw5p3b8jjQBBTK",  //  0. 0x1d2932ea
             "sp6JS7f14BuwFY8Mw6F7X3EiGKazu",  //  1. 0x1d2932ea
             "sp6JS7f14BuwFY8Mw6FxjntJJfKXq",  //  2. 0x1d2932ea
@@ -363,8 +363,8 @@ class NFTokenDir_test : public beast::unit_test::Suite
         };
 
         // Run the test cases.
-        exerciseLopsided(kSPLIT_AND_ADD_TO_HI);
-        exerciseLopsided(kSPLIT_AND_ADD_TO_LO);
+        exerciseLopsided(kSplitAndAddToHi);
+        exerciseLopsided(kSplitAndAddToLo);
     }
 
     void
@@ -480,7 +480,7 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // These seeds fill the last 17 entries of the initial page with
         // equivalent NFTs.  The split should keep these together.
-        static std::initializer_list<std::string_view const> const kSEVENTEEN_HI{
+        static std::initializer_list<std::string_view const> const kSeventeenHi{
             // These 16 need to be kept together by the implementation.
             "sp6JS7f14BuwFY8Mw5EYu5z86hKDL",  //  0. 0x399187e9
             "sp6JS7f14BuwFY8Mw5PUAMwc5ygd7",  //  1. 0x399187e9
@@ -521,7 +521,7 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // These seeds fill the first entries of the initial page with
         // equivalent NFTs.  The split should keep these together.
-        static std::initializer_list<std::string_view const> const kSEVENTEEN_LO{
+        static std::initializer_list<std::string_view const> const kSeventeenLo{
             // These 17 need to be kept together by the implementation.
             "sp6JS7f14BuwFY8Mw5EYu5z86hKDL",  //  0. 0x399187e9
             "sp6JS7f14BuwFY8Mw5PUAMwc5ygd7",  //  1. 0x399187e9
@@ -561,8 +561,8 @@ class NFTokenDir_test : public beast::unit_test::Suite
         };
 
         // Run the test cases.
-        exercise(kSEVENTEEN_HI);
-        exercise(kSEVENTEEN_LO);
+        exercise(kSeventeenHi);
+        exercise(kSeventeenLo);
     }
 
     void
@@ -583,7 +583,7 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // Here are 33 seeds that produce identical low 32-bits in their
         // corresponding AccountIDs.
-        static std::initializer_list<std::string_view const> const kSEEDS{
+        static std::initializer_list<std::string_view const> const kSeeds{
             "sp6JS7f14BuwFY8Mw5FnqmbciPvH6",  //  0. 0x9a8ebed3
             "sp6JS7f14BuwFY8Mw5MBGbyMSsXLp",  //  1. 0x9a8ebed3
             "sp6JS7f14BuwFY8Mw5S4PnDyBdKKm",  //  2. 0x9a8ebed3
@@ -621,8 +621,8 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // Create accounts for all of the seeds and fund those accounts.
         std::vector<Account> accounts;
-        accounts.reserve(kSEEDS.size());
-        for (std::string_view const seed : kSEEDS)
+        accounts.reserve(kSeeds.size());
+        for (std::string_view const seed : kSeeds)
         {
             Account const& account =
                 accounts.emplace_back(Account::AcctStringType::Base58Seed, std::string(seed));
@@ -656,10 +656,10 @@ class NFTokenDir_test : public beast::unit_test::Suite
         env.close();
 
         // Verify that the low 96 bits of all generated NFTs is identical.
-        uint256 const expectLowBits = nftIDs.front() & nft::kPAGE_MASK;
+        uint256 const expectLowBits = nftIDs.front() & nft::kPageMask;
         for (uint256 const& nftID : nftIDs)
         {
-            BEAST_EXPECT(expectLowBits == (nftID & nft::kPAGE_MASK));
+            BEAST_EXPECT(expectLowBits == (nftID & nft::kPageMask));
         }
 
         // Remove one NFT and offer from the vectors.  This offer is the one
@@ -731,7 +731,7 @@ class NFTokenDir_test : public beast::unit_test::Suite
         //
         // All of the NFTs should be acquired by the buyer.
         //
-        // Lastly, kNONE of the remaining NFTs should be acquirable by the
+        // Lastly, kNone of the remaining NFTs should be acquirable by the
         // buyer.  They would cause page overflow.
 
         testcase("NFToken consecutive packing");
@@ -747,7 +747,7 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // Here are 33 seeds that produce identical low 32-bits in their
         // corresponding AccountIDs.
-        static std::initializer_list<std::string_view const> const kSEEDS{
+        static std::initializer_list<std::string_view const> const kSeeds{
             "sp6JS7f14BuwFY8Mw56vZeiBuhePx",  //  0. 0x115d0525
             "sp6JS7f14BuwFY8Mw5BodF9tGuTUe",  //  1. 0x115d0525
             "sp6JS7f14BuwFY8Mw5EnhC1cg84J7",  //  2. 0x115d0525
@@ -785,8 +785,8 @@ class NFTokenDir_test : public beast::unit_test::Suite
 
         // Create accounts for all of the seeds and fund those accounts.
         std::vector<Account> accounts;
-        accounts.reserve(kSEEDS.size());
-        for (std::string_view const seed : kSEEDS)
+        accounts.reserve(kSeeds.size());
+        for (std::string_view const seed : kSeeds)
         {
             Account const& account =
                 accounts.emplace_back(Account::AcctStringType::Base58Seed, std::string(seed));
@@ -832,10 +832,10 @@ class NFTokenDir_test : public beast::unit_test::Suite
         // sequence is identical.
         for (auto const& vec : nftIDsByPage)
         {
-            uint256 const expectLowBits = vec.front() & nft::kPAGE_MASK;
+            uint256 const expectLowBits = vec.front() & nft::kPageMask;
             for (uint256 const& nftID : vec)
             {
-                BEAST_EXPECT(expectLowBits == (nftID & nft::kPAGE_MASK));
+                BEAST_EXPECT(expectLowBits == (nftID & nft::kPageMask));
             }
         }
 
@@ -850,11 +850,11 @@ class NFTokenDir_test : public beast::unit_test::Suite
         {
             overflowNFTs.push_back(nftIDsByPage[i].back());
             nftIDsByPage[i].pop_back();
-            BEAST_EXPECT(nftIDsByPage[i].size() == kSEEDS.size() - 1);
+            BEAST_EXPECT(nftIDsByPage[i].size() == kSeeds.size() - 1);
 
             overflowOffers.push_back(offers[i].back());
             offers[i].pop_back();
-            BEAST_EXPECT(offers[i].size() == kSEEDS.size() - 1);
+            BEAST_EXPECT(offers[i].size() == kSeeds.size() - 1);
         }
 
         // buyer accepts all of the offers that won't cause an overflow.
diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp
index 5be33fc4e5..ebd470ec92 100644
--- a/src/test/app/NFToken_test.cpp
+++ b/src/test/app/NFToken_test.cpp
@@ -508,11 +508,11 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
 
         // Can't set a transfer fee if the NFT does not have the tfTRANSFERABLE
         // flag set.
-        env(token::mint(alice, 0u), token::XferFee(kMAX_TRANSFER_FEE), Ter(temMALFORMED));
+        env(token::mint(alice, 0u), token::XferFee(kMaxTransferFee), Ter(temMALFORMED));
 
         // Set a bad transfer fee.
         env(token::mint(alice, 0u),
-            token::XferFee(kMAX_TRANSFER_FEE + 1),
+            token::XferFee(kMaxTransferFee + 1),
             Txflags(tfTransferable),
             Ter(temBAD_NFTOKEN_TRANSFER_FEE));
 
@@ -524,7 +524,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
 
         // Invalid URI: too long.
         env(token::mint(alice, 0u),
-            token::Uri(std::string(kMAX_TOKEN_URI_LENGTH + 1, 'q')),
+            token::Uri(std::string(kMaxTokenUriLength + 1, 'q')),
             Ter(temMALFORMED));
 
         //----------------------------------------------------------------------
@@ -894,7 +894,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
 
         // List of tokens to delete is too long.
         {
-            std::vector<uint256> const offers(kMAX_TOKEN_OFFER_CANCEL_COUNT + 1, buyerOfferIndex);
+            std::vector<uint256> const offers(kMaxTokenOfferCancelCount + 1, buyerOfferIndex);
 
             env(token::cancelOffer(buyer, offers), Ter(temMALFORMED));
             env.close();
@@ -1084,7 +1084,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
         // preclaim
 
         // The buy offer must be non-zero.
-        env(token::acceptBuyOffer(buyer, beast::kZERO), Ter(tecOBJECT_NOT_FOUND));
+        env(token::acceptBuyOffer(buyer, beast::kZero), Ter(tecOBJECT_NOT_FOUND));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
@@ -1105,7 +1105,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
         // The sell offer must be non-zero.
-        env(token::acceptSellOffer(buyer, beast::kZERO), Ter(tecOBJECT_NOT_FOUND));
+        env(token::acceptSellOffer(buyer, beast::kZero), Ter(tecOBJECT_NOT_FOUND));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
@@ -1320,7 +1320,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
         //----------------------------------------------------------------------
         // doApply
         //
-        // As far as I can see kNONE of the failure modes are accessible as
+        // As far as I can see kNone of the failure modes are accessible as
         // long as the preflight and preclaim conditions are met.
     }
 
@@ -2140,14 +2140,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
             // A transfer fee greater than 50% is not allowed.
             env(token::mint(alice),
                 Txflags(tfTransferable),
-                token::XferFee(kMAX_TRANSFER_FEE + 1),
+                token::XferFee(kMaxTransferFee + 1),
                 Ter(temBAD_NFTOKEN_TRANSFER_FEE));
             env.close();
 
             // Make an nft with a transfer fee of 50%.
-            uint256 const nftID =
-                token::getNextID(env, alice, 0u, tfTransferable, kMAX_TRANSFER_FEE);
-            env(token::mint(alice), Txflags(tfTransferable), token::XferFee(kMAX_TRANSFER_FEE));
+            uint256 const nftID = token::getNextID(env, alice, 0u, tfTransferable, kMaxTransferFee);
+            env(token::mint(alice), Txflags(tfTransferable), token::XferFee(kMaxTransferFee));
             env.close();
 
             // Becky buys the nft for XAU(10).  Check balances.
@@ -2298,14 +2297,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
             env(pay(becky, gw, env.balance(becky, gwXAU)));
             env.close();
 
-            STAmount const startXAUBalance(gwXAU, STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET + 5);
+            STAmount const startXAUBalance(gwXAU, STAmount::kMinValue, STAmount::kMinOffset + 5);
             env(pay(gw, alice, startXAUBalance));
             env(pay(gw, minter, startXAUBalance));
             env(pay(gw, becky, startXAUBalance));
             env.close();
 
             // Here is the smallest expressible gwXAU amount.
-            STAmount const tinyXAU(gwXAU, STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET);
+            STAmount const tinyXAU(gwXAU, STAmount::kMinValue, STAmount::kMinOffset);
 
             // minter buys the nft for tinyXAU.  Since the transfer involves
             // alice there should be no transfer fee.
@@ -2338,7 +2337,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
 
             // carol sells to becky.  This is the smallest gwXAU amount
             // to pay for a transfer that enables a transfer fee of 1.
-            STAmount const cheapNFT(gwXAU, STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET + 5);
+            STAmount const cheapNFT(gwXAU, STAmount::kMinValue, STAmount::kMinOffset + 5);
 
             STAmount beckyBalance = env.balance(becky, gwXAU);
             uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
@@ -3619,10 +3618,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
         env.fund(XRP(1000), alice);
         env.close();
 
-        std::string const uri(kMAX_TOKEN_URI_LENGTH, '?');
+        std::string const uri(kMaxTokenUriLength, '?');
         std::vector<uint256> offerIndexes;
-        offerIndexes.reserve(kMAX_TOKEN_OFFER_CANCEL_COUNT + 1);
-        for (uint32_t i = 0; i < kMAX_TOKEN_OFFER_CANCEL_COUNT + 1; ++i)
+        offerIndexes.reserve(kMaxTokenOfferCancelCount + 1);
+        for (uint32_t i = 0; i < kMaxTokenOfferCancelCount + 1; ++i)
         {
             Account const nftAcct(std::string("nftAcct") + std::to_string(i));
             Account const offerAcct(std::string("offerAcct") + std::to_string(i));
@@ -3867,7 +3866,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
             {
                 checkOwnerCountIsOne({issuer, minter, buyer, broker}, __LINE__);
 
-                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE);
+                uint256 const nftID = mintNFT(kMaxTransferFee);
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
@@ -3909,7 +3908,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
             {
                 checkOwnerCountIsOne({issuer, minter, buyer, broker}, __LINE__);
 
-                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE);
+                uint256 const nftID = mintNFT(kMaxTransferFee);
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
@@ -4059,7 +4058,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
                 checkOwnerCountIsOne({issuer, minter, buyer, broker}, __LINE__);
                 setXAUBalance({issuer, minter, buyer, broker}, 1000, __LINE__);
 
-                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE);
+                uint256 const nftID = mintNFT(kMaxTransferFee);
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
@@ -4137,7 +4136,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
                 checkOwnerCountIsOne({issuer, minter, buyer, broker}, __LINE__);
                 setXAUBalance({issuer, minter, buyer, broker}, 1000, __LINE__);
 
-                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE / 2);  // 25%
+                uint256 const nftID = mintNFT(kMaxTransferFee / 2);  // 25%
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
@@ -4174,7 +4173,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
                 checkOwnerCountIsOne({issuer, minter, buyer, broker}, __LINE__);
                 setXAUBalance({issuer, minter, buyer}, 1000, __LINE__);
                 setXAUBalance({broker}, 500, __LINE__);
-                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE / 2);  // 25%
+                uint256 const nftID = mintNFT(kMaxTransferFee / 2);  // 25%
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
@@ -5128,7 +5127,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
             }
             {
                 // Minter attempts to sell the token for XPB 10, which they
-                // have no trust line for and buyer has kNONE of (sellside).
+                // have no trust line for and buyer has kNone of (sellside).
                 reinitializeTrustLineBalances();
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createSellOffer(minter, nftID, gwXPB(10));
@@ -5139,7 +5138,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
             }
             {
                 // Minter attempts to sell the token for XPB 10, which they
-                // have no trust line for and buyer has kNONE of (buyside).
+                // have no trust line for and buyer has kNone of (buyside).
                 reinitializeTrustLineBalances();
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createBuyOffer(
@@ -6368,7 +6367,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
 
                 BEAST_EXPECT(ownerCount(env, bob) == 0);
 
-                // Send bob an kINCREMENT reserve and base fee (to make up for
+                // Send bob an kIncrement reserve and base fee (to make up for
                 // the transaction fee burnt from the prev failed tx) Bob now
                 // owns 250,000,000 drops
                 env(pay(env.master, bob, incReserve + drops(baseFee)));
@@ -6497,8 +6496,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
             env.fund(XRP(10000), alice);
             env.close();
 
-            // Bob is funded with account reserve + kINCREMENT reserve + 1 XRP
-            // kINCREMENT reserve is for the buy offer, and 1 XRP is for offer
+            // Bob is funded with account reserve + kIncrement reserve + 1 XRP
+            // kIncrement reserve is for the buy offer, and 1 XRP is for offer
             // price
             env.fund(acctReserve + incReserve + XRP(1), bob);
             env.close();
@@ -6963,7 +6962,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::Suite
 
             // Invalid URI length > 256
             env(token::modify(issuer, nftId),
-                token::Uri(std::string(kMAX_TOKEN_URI_LENGTH + 1, 'q')),
+                token::Uri(std::string(kMaxTokenUriLength + 1, 'q')),
                 Ter(temMALFORMED));
             env.close();
         }
diff --git a/src/test/app/OfferMPT_test.cpp b/src/test/app/OfferMPT_test.cpp
index 8c07a43983..a52ba7fd58 100644
--- a/src/test/app/OfferMPT_test.cpp
+++ b/src/test/app/OfferMPT_test.cpp
@@ -522,9 +522,9 @@ public:
                 // carol's offer can be partially crossed when EUR is IOU:
                 // 10e-3EUR/1USD
                 using tEUR = std::decay_t<decltype(eur)>;
-                bool constexpr kIS_EURIOU = std::is_same_v<tEUR, IOU>;
+                static constexpr bool kIsEuriou = std::is_same_v<tEUR, IOU>;
                 // partially crossed if IOU, removed but not taken if MPT
-                auto const balanceCarolUSD = kIS_EURIOU ? usd(0) : initialCarolUSD;
+                auto const balanceCarolUSD = kIsEuriou ? usd(0) : initialCarolUSD;
 
                 env.require(offers(carol, 0), Balance(carol, balanceCarolUSD));
                 if (crossBothOffers)
@@ -535,7 +535,7 @@ public:
                 else
                 {
                     // partially crossed if IOU, not crossed if MPT
-                    auto const balanceAliceUSD = kIS_EURIOU ? usd(1) : usd(0);
+                    auto const balanceAliceUSD = kIsEuriou ? usd(1) : usd(0);
                     env.require(offers(alice, 1), Balance(alice, balanceAliceUSD));
                 }
             }
@@ -590,9 +590,9 @@ public:
                     // carol's offer can be partially crossed when EUR is IOU:
                     // 10e-3EUR/1USD
                     using tEUR = std::decay_t<decltype(eur)>;
-                    bool constexpr kIS_EURIOU = std::is_same_v<tEUR, IOU>;
+                    static constexpr bool kIsEuriou = std::is_same_v<tEUR, IOU>;
                     // partially crossed if IOU, removed but not taken if MPT
-                    auto const balanceCarolUSD = kIS_EURIOU ? usd(0) : initialCarolUSD;
+                    auto const balanceCarolUSD = kIsEuriou ? usd(0) : initialCarolUSD;
                     env.require(offers(carol, 0));
                     env.require(Balance(carol, balanceCarolUSD));
                 }
@@ -784,7 +784,7 @@ public:
                 Owners(alice, 1),
                 offers(alice, 0),
                 Balance(bob, startBalance - (f * 2)),
-                Balance(bob, usd(kNONE)),
+                Balance(bob, usd(kNone)),
                 Owners(bob, 1),
                 offers(bob, 1));
 
@@ -1057,7 +1057,7 @@ public:
             offers(alice, 0),
             Owners(alice, 1),
             Balance(bob, startBalance - f),
-            Balance(bob, usd(kNONE)),
+            Balance(bob, usd(kNone)),
             offers(bob, 1),
             Owners(bob, 1));
     }
@@ -1764,7 +1764,7 @@ public:
             env.require(Owners(alice, 2));
 
             env.require(Balance(carol, usd(0)));
-            env.require(Balance(carol, eur(kNONE)));
+            env.require(Balance(carol, eur(kNone)));
 
             env.require(offers(carol, 0));
             env.require(Owners(carol, 1));
@@ -2309,8 +2309,8 @@ public:
             env.close();
 
             env.require(Balance(alice, usd(1'000)));
-            env.require(Balance(alice, eur(kNONE)));
-            env.require(Balance(bob, usd(kNONE)));
+            env.require(Balance(alice, eur(kNone)));
+            env.require(Balance(bob, usd(kNone)));
             env.require(Balance(bob, eur(1'000)));
             env.require(offers(alice, 0));
             env.require(offers(bob, 0));
@@ -2667,7 +2667,7 @@ public:
             // alice submits a tfSell | tfFillOrKill offer that does not cross.
             env(offer(alice, usd(21), XRP(2'100), tfSell | tfFillOrKill), Ter(tecKILLED));
             env.close();
-            env.require(Balance(alice, usd(kNONE)));
+            env.require(Balance(alice, usd(kNone)));
             env.require(offers(alice, 0));
             env.require(Balance(bob, usd(100)));
         }
@@ -3439,14 +3439,14 @@ public:
                  .token = "JPY",
                  .issuer = gw,
                  .holders = {alice},
-                 .limit = kMAX_MP_TOKEN_AMOUNT,
+                 .limit = kMaxMpTokenAmount,
                  .transferFee = 2'000});
             auto const btc = issue2(
                 {.env = env,
                  .token = "BTC",
                  .issuer = gw,
                  .holders = {bob},
-                 .limit = kMAX_MP_TOKEN_AMOUNT,
+                 .limit = kMaxMpTokenAmount,
                  .transferFee = 2'000});
 
             env(pay(gw, alice, jpy(3'699'034'802'280'317)));
@@ -3859,7 +3859,7 @@ public:
 
         // GW requires authorization for holders of its IOUs
         auto gwMUSD =
-            MPTTester({.env = env, .issuer = gw, .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth});
+            MPTTester({.env = env, .issuer = gw, .flags = kMptDexFlags | tfMPTRequireAuth});
         MPT const gwUSD = gwMUSD;
 
         // Have gw authorize bob and alice
@@ -3918,7 +3918,7 @@ public:
         env.close();
 
         auto gwMUSD =
-            MPTTester({.env = env, .issuer = gw, .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth});
+            MPTTester({.env = env, .issuer = gw, .flags = kMptDexFlags | tfMPTRequireAuth});
         MPT const gwUSD = gwMUSD;
 
         // alice can't create an offer because alice doesn't own
@@ -3927,7 +3927,7 @@ public:
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(Balance(alice, gwUSD(kNONE)));
+        env.require(Balance(alice, gwUSD(kNone)));
 
         gwMUSD.authorize({.account = bob});
         gwMUSD.authorize({.account = gw, .holder = bob});
@@ -3998,7 +3998,7 @@ public:
         env.close();
 
         auto gwMUSD =
-            MPTTester({.env = env, .issuer = gw, .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth});
+            MPTTester({.env = env, .issuer = gw, .flags = kMptDexFlags | tfMPTRequireAuth});
         MPT const gwUSD = gwMUSD;
 
         // Test that gw can create an offer to buy gw's currency.
@@ -4769,8 +4769,8 @@ public:
     run() override
     {
         using namespace jtx;
-        static FeatureBitset const kALL{testableAmendments()};
-        testAll(kALL);
+        static FeatureBitset const kAll{testableAmendments()};
+        testAll(kAll);
     }
 };
 
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index 7d6bab60c0..811a18dda5 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -260,7 +260,7 @@ public:
         for (int i = 0; i < 101; ++i)
             env(offer(carol, usd(1), eur(2)));
 
-        env(pay(alice, bob, eur(kEPSILON)), Path(~eur), Sendmax(usd(100)));
+        env(pay(alice, bob, eur(kEpsilon)), Path(~eur), Sendmax(usd(100)));
     }
 
     void
@@ -818,7 +818,7 @@ public:
                 Owners(alice, 1),
                 offers(alice, 0),
                 Balance(bob, startBalance - (f * 2)),
-                Balance(bob, usd(kNONE)),
+                Balance(bob, usd(kNone)),
                 Owners(bob, 1),
                 offers(bob, 1));
 
@@ -1128,7 +1128,7 @@ public:
             offers(alice, 0),
             Owners(alice, 1),
             Balance(bob, startBalance - f),
-            Balance(bob, usd(kNONE)),
+            Balance(bob, usd(kNone)),
             offers(bob, 1),
             Owners(bob, 1));
     }
@@ -1239,7 +1239,7 @@ public:
         BEAST_EXPECT(isOffer(env, accountToTest, XRP(1000), usd(50)));
 
         // now make an offer that will cross and auto-bridge, meaning
-        // the outstanding offers will be taken leaving us with kNONE
+        // the outstanding offers will be taken leaving us with kNone
         env(offer(accountToTest, usd(50), btc(250)));
 
         auto jrr = getBookOffers(env, usd, btc);
@@ -1907,7 +1907,7 @@ public:
         env.require(Owners(alice, 2));
 
         env.require(Balance(carol, usd(0)));
-        env.require(Balance(carol, eur(kNONE)));
+        env.require(Balance(carol, eur(kNone)));
 
         env.require(offers(carol, 0));
         env.require(Owners(carol, 1));
@@ -2535,8 +2535,8 @@ public:
         env.close();
 
         env.require(Balance(alice, usd(1000)));
-        env.require(Balance(alice, eur(kNONE)));
-        env.require(Balance(bob, usd(kNONE)));
+        env.require(Balance(alice, eur(kNone)));
+        env.require(Balance(bob, usd(kNone)));
         env.require(Balance(bob, eur(1000)));
         env.require(offers(alice, 0));
         env.require(offers(bob, 0));
@@ -2881,7 +2881,7 @@ public:
             // alice submits a tfSell | tfFillOrKill offer that does not cross.
             env(offer(alice, usd(21), XRP(2100), tfSell | tfFillOrKill), Ter(killedCode));
             env.close();
-            env.require(Balance(alice, usd(kNONE)));
+            env.require(Balance(alice, usd(kNone)));
             env.require(offers(alice, 0));
             env.require(Balance(bob, usd(100)));
         }
@@ -3156,14 +3156,14 @@ public:
             env(pay(kim, meg, nBux(60)), Path(lex, ned), Sendmax(kBux(200)));
             env.close();
 
-            env.require(Balance(kim, kBux(kNONE)));
-            env.require(Balance(kim, nBux(kNONE)));
+            env.require(Balance(kim, kBux(kNone)));
+            env.require(Balance(kim, nBux(kNone)));
             env.require(Balance(lex, kBux(72)));
             env.require(Balance(lex, nBux(40)));
-            env.require(Balance(meg, kBux(kNONE)));
+            env.require(Balance(meg, kBux(kNone)));
             env.require(Balance(meg, nBux(60)));
-            env.require(Balance(ned, kBux(kNONE)));
-            env.require(Balance(ned, nBux(kNONE)));
+            env.require(Balance(ned, kBux(kNone)));
+            env.require(Balance(ned, nBux(kNone)));
 
             // Now verify that offer crossing is unaffected by QualityOut.
             env(offer(lex, kBux(30), nBux(30)));
@@ -3172,14 +3172,14 @@ public:
             env(offer(kim, nBux(30), kBux(30)));
             env.close();
 
-            env.require(Balance(kim, kBux(kNONE)));
+            env.require(Balance(kim, kBux(kNone)));
             env.require(Balance(kim, nBux(30)));
             env.require(Balance(lex, kBux(102)));
             env.require(Balance(lex, nBux(10)));
-            env.require(Balance(meg, kBux(kNONE)));
+            env.require(Balance(meg, kBux(kNone)));
             env.require(Balance(meg, nBux(60)));
             env.require(Balance(ned, kBux(-30)));
-            env.require(Balance(ned, nBux(kNONE)));
+            env.require(Balance(ned, nBux(kNone)));
         }
         {
             // Make sure things work right when we're auto-bridging as well.
@@ -3512,14 +3512,14 @@ public:
             env(pay(ann, cam, dBux(60)), Path(bob, dan), Sendmax(aBux(200)));
             env.close();
 
-            env.require(Balance(ann, aBux(kNONE)));
-            env.require(Balance(ann, dBux(kNONE)));
+            env.require(Balance(ann, aBux(kNone)));
+            env.require(Balance(ann, dBux(kNone)));
             env.require(Balance(bob, aBux(72)));
             env.require(Balance(bob, dBux(40)));
-            env.require(Balance(cam, aBux(kNONE)));
+            env.require(Balance(cam, aBux(kNone)));
             env.require(Balance(cam, dBux(60)));
-            env.require(Balance(dan, aBux(kNONE)));
-            env.require(Balance(dan, dBux(kNONE)));
+            env.require(Balance(dan, aBux(kNone)));
+            env.require(Balance(dan, dBux(kNone)));
 
             env(offer(bob, aBux(30), dBux(30)));
             env.close();
@@ -3534,14 +3534,14 @@ public:
                 Ter(temBAD_PATH));
             env.close();
 
-            env.require(Balance(ann, aBux(kNONE)));
+            env.require(Balance(ann, aBux(kNone)));
             env.require(Balance(ann, dBux(0)));
             env.require(Balance(bob, aBux(72)));
             env.require(Balance(bob, dBux(40)));
-            env.require(Balance(cam, aBux(kNONE)));
+            env.require(Balance(cam, aBux(kNone)));
             env.require(Balance(cam, dBux(60)));
             env.require(Balance(dan, aBux(0)));
-            env.require(Balance(dan, dBux(kNONE)));
+            env.require(Balance(dan, dBux(kNone)));
         }
     }
 
@@ -4237,7 +4237,7 @@ public:
         env.close();
 
         env.require(offers(alice, 1));
-        env.require(Balance(alice, gwUSD(kNONE)));
+        env.require(Balance(alice, gwUSD(kNone)));
         env(fset(gw, asfRequireAuth));
         env.close();
 
@@ -4261,7 +4261,7 @@ public:
 
         env.require(offers(alice, 0));
         // alice's unauthorized offer is deleted & bob's offer not crossed.
-        env.require(Balance(alice, gwUSD(kNONE)));
+        env.require(Balance(alice, gwUSD(kNone)));
         env.require(offers(bob, 1));
         env.require(Balance(bob, gwUSD(50)));
 
@@ -4272,7 +4272,7 @@ public:
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(Balance(alice, gwUSD(kNONE)));
+        env.require(Balance(alice, gwUSD(kNone)));
 
         env.require(offers(bob, 1));
         env.require(Balance(bob, gwUSD(50)));
@@ -4586,25 +4586,25 @@ public:
             env.close();
 
             auto txn = noop(gw);
-            txn[sfTickSize.fieldName] = Quality::kMIN_TICK_SIZE - 1;
+            txn[sfTickSize.fieldName] = Quality::kMinTickSize - 1;
             env(txn, Ter(temBAD_TICK_SIZE));
 
-            txn[sfTickSize.fieldName] = Quality::kMIN_TICK_SIZE;
+            txn[sfTickSize.fieldName] = Quality::kMinTickSize;
             env(txn);
-            BEAST_EXPECT((*env.le(gw))[sfTickSize] == Quality::kMIN_TICK_SIZE);
+            BEAST_EXPECT((*env.le(gw))[sfTickSize] == Quality::kMinTickSize);
 
             txn = noop(gw);
-            txn[sfTickSize.fieldName] = Quality::kMAX_TICK_SIZE;
+            txn[sfTickSize.fieldName] = Quality::kMaxTickSize;
             env(txn);
             BEAST_EXPECT(!env.le(gw)->isFieldPresent(sfTickSize));
 
             txn = noop(gw);
-            txn[sfTickSize.fieldName] = Quality::kMAX_TICK_SIZE - 1;
+            txn[sfTickSize.fieldName] = Quality::kMaxTickSize - 1;
             env(txn);
-            BEAST_EXPECT((*env.le(gw))[sfTickSize] == Quality::kMAX_TICK_SIZE - 1);
+            BEAST_EXPECT((*env.le(gw))[sfTickSize] == Quality::kMaxTickSize - 1);
 
             txn = noop(gw);
-            txn[sfTickSize.fieldName] = Quality::kMAX_TICK_SIZE + 1;
+            txn[sfTickSize.fieldName] = Quality::kMaxTickSize + 1;
             env(txn, Ter(temBAD_TICK_SIZE));
 
             txn[sfTickSize.fieldName] = 0;
diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp
index 84ef568d52..7e7f5e9bd0 100644
--- a/src/test/app/Oracle_test.cpp
+++ b/src/test/app/Oracle_test.cpp
@@ -286,7 +286,7 @@ private:
                     .err = Ter(tecINVALID_UPDATE_TIME)});
             oracle.set(UpdateArg{.series = {{"XRP", "USD", 740, 1}}, .fee = baseFee});
             BEAST_EXPECT(oracle.expectLastUpdateTime(
-                static_cast<std::uint32_t>(kTEST_START_TIME.count() + 450)));
+                static_cast<std::uint32_t>(kTestStartTime.count() + 450)));
             // Less than the previous lastUpdateTime
             oracle.set(
                 UpdateArg{
@@ -298,7 +298,7 @@ private:
             oracle.set(
                 UpdateArg{
                     .series = {{"XRP", "USD", 740, 1}},
-                    .lastUpdateTime = static_cast<int>(kEPOCH_OFFSET.count() - 1),
+                    .lastUpdateTime = static_cast<int>(kEpochOffset.count() - 1),
                     .fee = baseFee,
                     .err = Ter(tecINVALID_UPDATE_TIME)});
         }
@@ -344,7 +344,7 @@ private:
             Oracle const oracle(
                 env,
                 {.owner = owner,
-                 .series = {{"USD", "BTC", 740, kMAX_PRICE_SCALE + 1}},
+                 .series = {{"USD", "BTC", 740, kMaxPriceScale + 1}},
                  .fee = baseFee,
                  .err = Ter(temMALFORMED)});
         }
@@ -748,7 +748,7 @@ private:
                 .series = {{"XRP", "USD", 741, 1}}, .msig = Msig(becky, bogie), .fee = baseFee});
         BEAST_EXPECT(oracle.expectPrice({{"XRP", "USD", 741, 1}}));
         // remove the signer list
-        env(signers(alice, jtx::kNONE), Sig(alie));
+        env(signers(alice, jtx::kNone), Sig(alie));
         env.close();
         env.require(Owners(alice, 1));
         // create new signer list
diff --git a/src/test/app/PathMPT_test.cpp b/src/test/app/PathMPT_test.cpp
index c09bc83be8..da5597cf05 100644
--- a/src/test/app/PathMPT_test.cpp
+++ b/src/test/app/PathMPT_test.cpp
@@ -112,7 +112,7 @@ public:
             MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 100});
 
         auto& app = env.app();
-        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
+        Resource::Charge loadType = Resource::kFeeReferenceRpc;
         Resource::Consumer c;
 
         RPC::JsonContext context{
@@ -125,15 +125,15 @@ public:
              .role = Role::USER,
              .coro = {},
              .infoSub = {},
-             .apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED},
+             .apiVersion = RPC::kApiVersionIfUnspecified},
             {},
             {}};
         json::Value result;
         Gate g;
         // Test RPC::Tuning::max_src_cur source currencies.
         std::vector<MPTID> numSrc;
-        numSrc.reserve(RPC::Tuning::kMAX_SRC_CUR);
-        for (std::uint8_t i = 0; i < RPC::Tuning::kMAX_SRC_CUR; ++i)
+        numSrc.reserve(RPC::Tuning::kMaxSrcCur);
+        for (std::uint8_t i = 0; i < RPC::Tuning::kMaxSrcCur; ++i)
             numSrc.push_back(makeMptID(i, bob));
         app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
             context.params = xrpl::test::detail::rpf(alice, bob, usd, numSrc);
@@ -145,7 +145,7 @@ public:
         BEAST_EXPECT(!result.isMember(jss::error));
 
         // Test more than RPC::Tuning::max_src_cur source currencies.
-        numSrc.push_back(makeMptID(RPC::Tuning::kMAX_SRC_CUR, bob));
+        numSrc.push_back(makeMptID(RPC::Tuning::kMaxSrcCur, bob));
         app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
             context.params = xrpl::test::detail::rpf(alice, bob, usd, numSrc);
             context.coro = coro;
@@ -157,7 +157,7 @@ public:
 
         // Test RPC::Tuning::max_auto_src_cur source currencies.
         numSrc.clear();
-        for (auto i = 0; i < (RPC::Tuning::kMAX_AUTO_SRC_CUR - 1); ++i)
+        for (auto i = 0; i < (RPC::Tuning::kMaxAutoSrcCur - 1); ++i)
         {
             auto curm = MPTTester({.env = env, .issuer = alice, .holders = {bob}});
             numSrc.push_back(curm.issuanceID());
diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp
index cfdc954578..22044a2572 100644
--- a/src/test/app/Path_test.cpp
+++ b/src/test/app/Path_test.cpp
@@ -151,7 +151,7 @@ public:
         using namespace jtx;
 
         auto& app = env.app();
-        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
+        Resource::Charge loadType = Resource::kFeeReferenceRpc;
         Resource::Consumer c;
 
         RPC::JsonContext context{
@@ -164,7 +164,7 @@ public:
              .role = Role::USER,
              .coro = {},
              .infoSub = {},
-             .apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED},
+             .apiVersion = RPC::kApiVersionIfUnspecified},
             {},
             {}};
 
@@ -216,7 +216,7 @@ public:
 
         STAmount da;
         if (result.isMember(jss::destination_amount))
-            da = amountFromJson(kSF_GENERIC, result[jss::destination_amount]);
+            da = amountFromJson(kSfGeneric, result[jss::destination_amount]);
 
         STAmount sa;
         STPathSet paths;
@@ -228,10 +228,10 @@ public:
                 auto const& path = alts[0u];
 
                 if (path.isMember(jss::source_amount))
-                    sa = amountFromJson(kSF_GENERIC, path[jss::source_amount]);
+                    sa = amountFromJson(kSfGeneric, path[jss::source_amount]);
 
                 if (path.isMember(jss::destination_amount))
-                    da = amountFromJson(kSF_GENERIC, path[jss::destination_amount]);
+                    da = amountFromJson(kSfGeneric, path[jss::destination_amount]);
 
                 if (path.isMember(jss::paths_computed))
                 {
@@ -262,7 +262,7 @@ public:
         env.close();
 
         auto& app = env.app();
-        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
+        Resource::Charge loadType = Resource::kFeeReferenceRpc;
         Resource::Consumer c;
 
         RPC::JsonContext context{
@@ -275,14 +275,14 @@ public:
              .role = Role::USER,
              .coro = {},
              .infoSub = {},
-             .apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED},
+             .apiVersion = RPC::kApiVersionIfUnspecified},
             {},
             {}};
         json::Value result;
         Gate g;
         // Test RPC::Tuning::max_src_cur source currencies.
         app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
-            context.params = rpf(Account("alice"), Account("bob"), RPC::Tuning::kMAX_SRC_CUR);
+            context.params = rpf(Account("alice"), Account("bob"), RPC::Tuning::kMaxSrcCur);
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
@@ -292,7 +292,7 @@ public:
 
         // Test more than RPC::Tuning::max_src_cur source currencies.
         app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
-            context.params = rpf(Account("alice"), Account("bob"), RPC::Tuning::kMAX_SRC_CUR + 1);
+            context.params = rpf(Account("alice"), Account("bob"), RPC::Tuning::kMaxSrcCur + 1);
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
@@ -301,7 +301,7 @@ public:
         BEAST_EXPECT(result.isMember(jss::error));
 
         // Test RPC::Tuning::max_auto_src_cur source currencies.
-        for (auto i = 0; i < (RPC::Tuning::kMAX_AUTO_SRC_CUR - 1); ++i)
+        for (auto i = 0; i < (RPC::Tuning::kMaxAutoSrcCur - 1); ++i)
             env.trust(Account("alice")[std::to_string(i + 100)](100), "bob");
         app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
             context.params = rpf(Account("alice"), Account("bob"), 0);
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index 2deecefef6..b81afa830e 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -246,7 +246,7 @@ struct PayChan_test : public beast::unit_test::Suite
             BEAST_EXPECT(!channelExists(*env.current(), chan));
             auto const feeDrops = env.current()->fees().base;
             auto const delta = chanAmt - chanBal;
-            assert(delta > beast::kZERO);
+            assert(delta > beast::kZero);
             BEAST_EXPECT(env.balance(alice) == preAlice + delta);
             BEAST_EXPECT(env.balance(bob) == preBob - feeDrops);
         }
@@ -1916,7 +1916,7 @@ struct PayChan_test : public beast::unit_test::Suite
             STAmount const reqAmt = authAmt + drops(1);
             assert(reqAmt <= chanAmt);
             // Note that since claim() returns a tem (neither tec nor tes),
-            // the ticket is not consumed.  So we don't kINCREMENT bobTicket.
+            // the ticket is not consumed.  So we don't kIncrement bobTicket.
             auto const sig = signClaimAuth(alice.pk(), alice.sk(), chan, authAmt);
             env(claim(bob, chan, reqAmt, authAmt, Slice(sig), alice.pk()),
                 ticket::Use(bobTicketSeq),
@@ -1951,7 +1951,7 @@ struct PayChan_test : public beast::unit_test::Suite
             BEAST_EXPECT(!channelExists(*env.current(), chan));
             auto const feeDrops = env.current()->fees().base;
             auto const delta = chanAmt - chanBal;
-            assert(delta > beast::kZERO);
+            assert(delta > beast::kZero);
             BEAST_EXPECT(env.balance(alice) == preAlice + delta);
             BEAST_EXPECT(env.balance(bob) == preBob - feeDrops);
         }
diff --git a/src/test/app/PayStrandMPT_test.cpp b/src/test/app/PayStrandMPT_test.cpp
index 5550a26ab2..20e582fbf7 100644
--- a/src/test/app/PayStrandMPT_test.cpp
+++ b/src/test/app/PayStrandMPT_test.cpp
@@ -328,7 +328,7 @@ struct PayStrandMPT_test : public beast::unit_test::Suite
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
-                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
+                 .flags = kMptDexFlags | tfMPTCanLock,
                  .maxAmt = 1'000});
             MPT const usd = usdm;
             env(pay(gw, alice, usd(100)));
@@ -361,7 +361,7 @@ struct PayStrandMPT_test : public beast::unit_test::Suite
             auto usdm = MPTTester(
                 {.env = env,
                  .issuer = gw,
-                 .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth,
+                 .flags = kMptDexFlags | tfMPTRequireAuth,
                  .maxAmt = 1'000});
             MPT const usd = usdm;
 
diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp
index 78b152d690..67a37833b2 100644
--- a/src/test/app/PayStrand_test.cpp
+++ b/src/test/app/PayStrand_test.cpp
@@ -308,12 +308,12 @@ struct ExistingElementPool
         currencyNames.clear();
         currencyNames.reserve(numCur);
 
-        constexpr size_t kBUF_SIZE = 32;
-        char buf[kBUF_SIZE];
+        static constexpr size_t kBufSize = 32;
+        char buf[kBufSize];
 
         for (size_t id = 0; id < numAct; ++id)
         {
-            snprintf(buf, kBUF_SIZE, "A%zu", id);
+            snprintf(buf, kBufSize, "A%zu", id);
             accounts.emplace_back(buf);
         }
 
@@ -321,15 +321,15 @@ struct ExistingElementPool
         {
             if (id < 10)
             {
-                snprintf(buf, kBUF_SIZE, "CC%zu", id);
+                snprintf(buf, kBufSize, "CC%zu", id);
             }
             else if (id < 100)
             {
-                snprintf(buf, kBUF_SIZE, "C%zu", id);
+                snprintf(buf, kBufSize, "C%zu", id);
             }
             else
             {
-                snprintf(buf, kBUF_SIZE, "%zu", id);
+                snprintf(buf, kBufSize, "%zu", id);
             }
             currencies.emplace_back(toCurrency(buf));
             currencyNames.emplace_back(buf);
diff --git a/src/test/app/PermissionedDEX_test.cpp b/src/test/app/PermissionedDEX_test.cpp
index 45b4a58901..be377c0c1d 100644
--- a/src/test/app/PermissionedDEX_test.cpp
+++ b/src/test/app/PermissionedDEX_test.cpp
@@ -140,7 +140,7 @@ class PermissionedDEX_test : public beast::unit_test::Suite
     static uint256
     getBookDirKey(Book const& book, STAmount const& takerPays, STAmount const& takerGets)
     {
-        return keylet::quality(keylet::kBOOK(book), getRate(takerGets, takerPays)).key;
+        return keylet::quality(keylet::kBook(book), getRate(takerGets, takerPays)).key;
     }
 
     static std::optional<uint256>
diff --git a/src/test/app/PermissionedDomains_test.cpp b/src/test/app/PermissionedDomains_test.cpp
index 0593b06eaa..0857a4bdef 100644
--- a/src/test/app/PermissionedDomains_test.cpp
+++ b/src/test/app/PermissionedDomains_test.cpp
@@ -135,7 +135,7 @@ class PermissionedDomains_test : public beast::unit_test::Suite
             {alice10, "credential9"},
             {alice11, "credential10"},
             {alice12, "credential11"}};
-        BEAST_EXPECT(credentials11.size() == kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE + 1);
+        BEAST_EXPECT(credentials11.size() == kMaxPermissionedDomainCredentialsArraySize + 1);
         env(pdomain::setTx(account, credentials11, domain), Ter(temARRAY_TOO_LARGE));
 
         // Test credentials including non-existent issuer.
@@ -172,12 +172,12 @@ class PermissionedDomains_test : public beast::unit_test::Suite
         env(txJsonMutable, Ter(temMALFORMED));
 
         // Make too long CredentialType.
-        constexpr std::string_view kLONG_CREDENTIAL_TYPE =
+        static constexpr std::string_view kLongCredentialType =
             "Cred0123456789012345678901234567890123456789012345678901234567890";
-        static_assert(kLONG_CREDENTIAL_TYPE.size() == kMAX_CREDENTIAL_TYPE_LENGTH + 1);
+        static_assert(kLongCredentialType.size() == kMaxCredentialTypeLength + 1);
         txJsonMutable["AcceptedCredentials"][2u] = credentialOrig;
         txJsonMutable["AcceptedCredentials"][2u][jss::Credential]["CredentialType"] =
-            std::string(kLONG_CREDENTIAL_TYPE);
+            std::string(kLongCredentialType);
         BEAST_EXPECT(exceptionExpected(env, txJsonMutable).starts_with("invalidParams"));
 
         // Remove Credentialtype from a credential and apply.
@@ -309,12 +309,12 @@ class PermissionedDomains_test : public beast::unit_test::Suite
 
         // Make longest possible CredentialType.
         {
-            constexpr std::string_view kLONG_CREDENTIAL_TYPE =
+            static constexpr std::string_view kLongCredentialType =
                 "Cred0123456789012345678901234567890123456789012345678901234567"
                 "89";
-            static_assert(kLONG_CREDENTIAL_TYPE.size() == kMAX_CREDENTIAL_TYPE_LENGTH);
+            static_assert(kLongCredentialType.size() == kMaxCredentialTypeLength);
             pdomain::Credentials const longCredentials{
-                {alice[1], std::string(kLONG_CREDENTIAL_TYPE)}};
+                {alice[1], std::string(kLongCredentialType)}};
 
             env(pdomain::setTx(alice[0], longCredentials));
 
@@ -358,7 +358,7 @@ class PermissionedDomains_test : public beast::unit_test::Suite
         };
         uint256 domain2;
         {
-            BEAST_EXPECT(credentials10.size() == kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE);
+            BEAST_EXPECT(credentials10.size() == kMaxPermissionedDomainCredentialsArraySize);
             BEAST_EXPECT(credentials10 != pdomain::sortCredentials(credentials10));
             env(pdomain::setTx(alice[0], credentials10));
             auto tx = env.tx()->getJson(JsonOptions::Values::None);
@@ -402,11 +402,11 @@ class PermissionedDomains_test : public beast::unit_test::Suite
 
         // Try to delete the account with domains.
         auto const acctDelFee(drops(env.current()->fees().increment));
-        constexpr std::size_t kDELETE_DELTA = 255;
+        static constexpr std::size_t kDeleteDelta = 255;
         {
             // Close enough ledgers to make it potentially deletable if empty.
             std::size_t const ownerSeq = env.seq(alice[0]);
-            while (kDELETE_DELTA + ownerSeq > env.current()->seq())
+            while (kDeleteDelta + ownerSeq > env.current()->seq())
                 env.close();
             env(acctdelete(alice[0], alice[2]), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         }
@@ -417,7 +417,7 @@ class PermissionedDomains_test : public beast::unit_test::Suite
                 env(pdomain::deleteTx(alice[0], objs.first));
             env.close();
             std::size_t const ownerSeq = env.seq(alice[0]);
-            while (kDELETE_DELTA + ownerSeq > env.current()->seq())
+            while (kDeleteDelta + ownerSeq > env.current()->seq())
                 env.close();
             env(acctdelete(alice[0], alice[2]), Fee(acctDelFee));
         }
diff --git a/src/test/app/RCLValidations_test.cpp b/src/test/app/RCLValidations_test.cpp
index 6b3ea8cdbe..df8e873c75 100644
--- a/src/test/app/RCLValidations_test.cpp
+++ b/src/test/app/RCLValidations_test.cpp
@@ -69,7 +69,7 @@ class RCLValidations_test : public beast::unit_test::Suite
         jtx::Env env(*this);
         Config const config;
         auto prev = std::make_shared<Ledger const>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
@@ -235,7 +235,7 @@ class RCLValidations_test : public beast::unit_test::Suite
         auto& j = env.journal;
         Config const config;
         auto prev = std::make_shared<Ledger const>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
diff --git a/src/test/app/ReducedOffer_test.cpp b/src/test/app/ReducedOffer_test.cpp
index 4a2c2dba0a..47a2c1294c 100644
--- a/src/test/app/ReducedOffer_test.cpp
+++ b/src/test/app/ReducedOffer_test.cpp
@@ -560,8 +560,8 @@ public:
                                          Amounts const& carolOffer) -> unsigned int {
                 // alice submits an offer that may become a blocker.
                 std::uint32_t const aliceOfferSeq = env.seq(alice);
-                static Amounts const kALICE_INITIAL_OFFER(usd(2), drops(3382562));
-                env(offer(alice, kALICE_INITIAL_OFFER.in, kALICE_INITIAL_OFFER.out));
+                static Amounts const kAliceInitialOffer(usd(2), drops(3382562));
+                env(offer(alice, kAliceInitialOffer.in, kAliceInitialOffer.out));
                 env.close();
                 STAmount const initialRate = Quality(jsonOfferToAmounts(ledgerEntryOffer(
                                                          env, alice, aliceOfferSeq)[jss::node]))
@@ -598,8 +598,8 @@ public:
 
                     Amounts const aliceReducedOffer = jsonOfferToAmounts(aliceOffer[jss::node]);
 
-                    BEAST_EXPECT(aliceReducedOffer.in < kALICE_INITIAL_OFFER.in);
-                    BEAST_EXPECT(aliceReducedOffer.out < kALICE_INITIAL_OFFER.out);
+                    BEAST_EXPECT(aliceReducedOffer.in < kAliceInitialOffer.in);
+                    BEAST_EXPECT(aliceReducedOffer.out < kAliceInitialOffer.out);
                     STAmount const inLedgerRate = Quality(aliceReducedOffer).rate();
                     badRate = inLedgerRate > initialRate ? 1 : 0;
 
@@ -641,12 +641,12 @@ public:
                 return badRate;
             };
 
-            constexpr int kLOOP_COUNT = 100;
+            static constexpr int kLoopCount = 100;
             unsigned int blockedCount = 0;
             {
                 STAmount increaseGets = usd(0);
                 STAmount const step(increaseGets.asset(), 1, -8);
-                for (unsigned int i = 0; i < kLOOP_COUNT; ++i)
+                for (unsigned int i = 0; i < kLoopCount; ++i)
                 {
                     blockedCount +=
                         exerciseOfferTrio(Amounts(drops(1642020), usd(1) + increaseGets));
diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp
index fdcf03e53c..ee3e25e2f4 100644
--- a/src/test/app/Regression_test.cpp
+++ b/src/test/app/Regression_test.cpp
@@ -85,12 +85,12 @@ struct Regression_test : public beast::unit_test::Suite
         // be reproduced against an open ledger. Make a local
         // closed ledger and work with it directly.
         auto closed = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
             env.app().getNodeFamily());
-        auto expectedDrops = kINITIAL_XRP;
+        auto expectedDrops = kInitialXrp;
         BEAST_EXPECT(closed->header().drops == expectedDrops);
 
         auto const aliceXRP = 400;
@@ -138,7 +138,7 @@ struct Regression_test : public beast::unit_test::Suite
 
             BEAST_EXPECT(balance == XRP(0));
         }
-        expectedDrops -= aliceXRP * kDROPS_PER_XRP;
+        expectedDrops -= aliceXRP * kDropsPerXrp;
         BEAST_EXPECT(next->header().drops == expectedDrops);
     }
 
@@ -211,7 +211,7 @@ struct Regression_test : public beast::unit_test::Suite
         // our fee limit.
         for (int i = 0; i < 5; ++i)
         {
-            envs(noop(alice), Fee(kNONE), Seq(kNONE))(params);
+            envs(noop(alice), Fee(kNone), Seq(kNone))(params);
 
             auto tx = env.tx();
             if (BEAST_EXPECT(tx))
diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp
index 574874e005..f03fabd92c 100644
--- a/src/test/app/SHAMapStore_test.cpp
+++ b/src/test/app/SHAMapStore_test.cpp
@@ -36,14 +36,14 @@ namespace xrpl::test {
 
 class SHAMapStore_test : public beast::unit_test::Suite
 {
-    static auto const kDELETE_INTERVAL = 8;
+    static auto const kDeleteInterval = 8;
 
     static auto
     onlineDelete(std::unique_ptr<Config> cfg)
     {
-        cfg->LEDGER_HISTORY = kDELETE_INTERVAL;
+        cfg->LEDGER_HISTORY = kDeleteInterval;
         auto& section = cfg->section(ConfigSection::nodeDatabase());
-        section.set("online_delete", std::to_string(kDELETE_INTERVAL));
+        section.set("online_delete", std::to_string(kDeleteInterval));
         return cfg;
     }
 
@@ -196,7 +196,7 @@ public:
         auto const firstSeq = waitForReady(env);
         auto lastRotated = firstSeq - 1;
 
-        for (auto i = firstSeq + 1; i < kDELETE_INTERVAL + firstSeq; ++i)
+        for (auto i = firstSeq + 1; i < kDeleteInterval + firstSeq; ++i)
         {
             env.fund(XRP(10000), noripple("test" + std::to_string(i)));
             env.close();
@@ -206,7 +206,7 @@ public:
         }
         BEAST_EXPECT(store.getLastRotated() == lastRotated);
 
-        for (auto i = 3; i < kDELETE_INTERVAL + lastRotated; ++i)
+        for (auto i = 3; i < kDeleteInterval + lastRotated; ++i)
         {
             ledgers.emplace(i, env.rpc("ledger", std::to_string(i)));
             BEAST_EXPECT(
@@ -214,31 +214,31 @@ public:
                 !getHash(ledgers[i]).empty());
         }
 
-        ledgerCheck(env, kDELETE_INTERVAL + 1, 2);
-        transactionCheck(env, kDELETE_INTERVAL);
-        accountTransactionCheck(env, 2 * kDELETE_INTERVAL);
+        ledgerCheck(env, kDeleteInterval + 1, 2);
+        transactionCheck(env, kDeleteInterval);
+        accountTransactionCheck(env, 2 * kDeleteInterval);
 
         {
             // Closing one more ledger triggers a rotate
             env.close();
 
             auto ledger = env.rpc("ledger", "current");
-            BEAST_EXPECT(goodLedger(env, ledger, std::to_string(kDELETE_INTERVAL + 4)));
+            BEAST_EXPECT(goodLedger(env, ledger, std::to_string(kDeleteInterval + 4)));
         }
 
         store.rendezvous();
 
-        BEAST_EXPECT(store.getLastRotated() == kDELETE_INTERVAL + 3);
+        BEAST_EXPECT(store.getLastRotated() == kDeleteInterval + 3);
         lastRotated = store.getLastRotated();
         BEAST_EXPECT(lastRotated == 11);
 
         // That took care of the fake hashes
-        ledgerCheck(env, kDELETE_INTERVAL + 1, 3);
-        transactionCheck(env, kDELETE_INTERVAL);
-        accountTransactionCheck(env, 2 * kDELETE_INTERVAL);
+        ledgerCheck(env, kDeleteInterval + 1, 3);
+        transactionCheck(env, kDeleteInterval);
+        accountTransactionCheck(env, 2 * kDeleteInterval);
 
         // The last iteration of this loop should trigger a rotate
-        for (auto i = lastRotated - 1; i < lastRotated + kDELETE_INTERVAL - 1; ++i)
+        for (auto i = lastRotated - 1; i < lastRotated + kDeleteInterval - 1; ++i)
         {
             env.close();
 
@@ -247,7 +247,7 @@ public:
 
             ledgers.emplace(i, env.rpc("ledger", std::to_string(i)));
             BEAST_EXPECT(
-                store.getLastRotated() == lastRotated || i == lastRotated + kDELETE_INTERVAL - 2);
+                store.getLastRotated() == lastRotated || i == lastRotated + kDeleteInterval - 2);
             BEAST_EXPECT(
                 goodLedger(env, ledgers[i], std::to_string(i), true) &&
                 !getHash(ledgers[i]).empty());
@@ -255,9 +255,9 @@ public:
 
         store.rendezvous();
 
-        BEAST_EXPECT(store.getLastRotated() == kDELETE_INTERVAL + lastRotated);
+        BEAST_EXPECT(store.getLastRotated() == kDeleteInterval + lastRotated);
 
-        ledgerCheck(env, kDELETE_INTERVAL + 1, lastRotated);
+        ledgerCheck(env, kDeleteInterval + 1, lastRotated);
         transactionCheck(env, 0);
         accountTransactionCheck(env, 0);
     }
@@ -283,7 +283,7 @@ public:
         BEAST_EXPECT(bad(canDelete, RpcNotEnabled));
 
         // Close ledgers without triggering a rotate
-        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDeleteInterval; ++ledgerSeq)
         {
             env.close();
 
@@ -314,7 +314,7 @@ public:
         lastRotated = store.getLastRotated();
 
         // Close enough ledgers to trigger another rotate
-        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL + 1; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDeleteInterval + 1; ++ledgerSeq)
         {
             env.close();
 
@@ -324,7 +324,7 @@ public:
 
         store.rendezvous();
 
-        ledgerCheck(env, kDELETE_INTERVAL + 1, lastRotated);
+        ledgerCheck(env, kDeleteInterval + 1, lastRotated);
         BEAST_EXPECT(lastRotated != store.getLastRotated());
     }
 
@@ -352,7 +352,7 @@ public:
         BEAST_EXPECT(!RPC::containsError(canDelete[jss::result]));
         BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == 0);
 
-        auto const firstBatch = kDELETE_INTERVAL + ledgerSeq;
+        auto const firstBatch = kDeleteInterval + ledgerSeq;
         for (; ledgerSeq < firstBatch; ++ledgerSeq)
         {
             env.close();
@@ -367,9 +367,9 @@ public:
         BEAST_EXPECT(lastRotated == store.getLastRotated());
 
         // This does not kick off a cleanup
-        canDelete = env.rpc("can_delete", std::to_string(ledgerSeq + (kDELETE_INTERVAL / 2)));
+        canDelete = env.rpc("can_delete", std::to_string(ledgerSeq + (kDeleteInterval / 2)));
         BEAST_EXPECT(!RPC::containsError(canDelete[jss::result]));
-        BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == ledgerSeq + (kDELETE_INTERVAL / 2));
+        BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == ledgerSeq + (kDeleteInterval / 2));
 
         store.rendezvous();
 
@@ -391,7 +391,7 @@ public:
         BEAST_EXPECT(store.getLastRotated() == ledgerSeq - 1);
         lastRotated = ledgerSeq - 1;
 
-        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDeleteInterval; ++ledgerSeq)
         {
             // No cleanups in this loop.
             env.close();
@@ -425,7 +425,7 @@ public:
         BEAST_EXPECT(
             canDelete[jss::result][jss::can_delete] == std::numeric_limits<unsigned int>::max());
 
-        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDeleteInterval; ++ledgerSeq)
         {
             // No cleanups in this loop.
             env.close();
@@ -458,7 +458,7 @@ public:
         BEAST_EXPECT(!RPC::containsError(canDelete[jss::result]));
         BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == ledgerSeq - 1);
 
-        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDeleteInterval; ++ledgerSeq)
         {
             // No cleanups in this loop.
             env.close();
@@ -527,11 +527,11 @@ public:
         auto writableBackend = makeBackendRotating(env, scheduler, writableDb);
         auto archiveBackend = makeBackendRotating(env, scheduler, archiveDb);
 
-        constexpr int kREAD_THREADS = 4;
+        static constexpr int kReadThreads = 4;
         auto nscfg = env.app().config().section(ConfigSection::nodeDatabase());
         auto dbr = std::make_unique<NodeStore::DatabaseRotatingImp>(
             scheduler,
-            kREAD_THREADS,
+            kReadThreads,
             std::move(writableBackend),
             std::move(archiveBackend),
             nscfg,
diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp
index b9cba43011..b5d1af9ef0 100644
--- a/src/test/app/SetRegularKey_test.cpp
+++ b/src/test/app/SetRegularKey_test.cpp
@@ -54,7 +54,7 @@ public:
         env(noop(alice), Sig(alice));
 
         testcase("Revoke regular key");
-        env(regkey(alice, kDISABLED));
+        env(regkey(alice, kDisabled));
         env(noop(alice), Sig(bob), Ter(tefBAD_AUTH));
         env(noop(alice), Sig(alice));
     }
@@ -154,7 +154,7 @@ public:
         env.close();
 
         // Disable the regular key using a ticket.
-        env(regkey(alice, kDISABLED), Sig(alie), ticket::Use(--ticketSeq));
+        env(regkey(alice, kDisabled), Sig(alie), ticket::Use(--ticketSeq));
         env.close();
 
         // alice should be able to sign using the master key but not the
diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp
index ed6f91f475..8f7d844019 100644
--- a/src/test/app/TheoreticalQuality_test.cpp
+++ b/src/test/app/TheoreticalQuality_test.cpp
@@ -125,9 +125,9 @@ class RandomAccountParams
     std::uint32_t const initialBalance_;
 
     // probability of changing a value from its default
-    constexpr static double kPROB_CHANGE_DEFAULT = 0.75;
+    static constexpr double kProbChangeDefault = 0.75;
     // probability that an account redeems into another account
-    constexpr static double kPROB_REDEEM = 0.5;
+    static constexpr double kProbRedeem = 0.5;
     std::uniform_real_distribution<> zeroOneDist_{0.0, 1.0};
     std::uniform_real_distribution<> transferRateDist_{1.0, 2.0};
     std::uniform_real_distribution<> qualityPercentDist_{80, 120};
@@ -135,7 +135,7 @@ class RandomAccountParams
     bool
     shouldSet()
     {
-        return zeroOneDist_(engine_) <= kPROB_CHANGE_DEFAULT;
+        return zeroOneDist_(engine_) <= kProbChangeDefault;
     };
 
     void
@@ -206,7 +206,7 @@ public:
         Currency const& currency)
     {
         using namespace jtx;
-        if (zeroOneDist_(engine_) > kPROB_REDEEM)
+        if (zeroOneDist_(engine_) > kProbRedeem)
             return;
         setInitialBalance(env, acc, peer, currency);
     }
@@ -290,8 +290,8 @@ class TheoreticalQuality_test : public beast::unit_test::Suite
         auto compareClose = [](Quality const& q1, Quality const& q2) {
             // relative diff is fabs(a-b)/min(a,b)
             // can't get access to internal value. Use the rate
-            constexpr double kTOLERANCE = 0.0000001;
-            return relativeDistance(q1, q2) <= kTOLERANCE;
+            static constexpr double kTolerance = 0.0000001;
+            return relativeDistance(q1, q2) <= kTolerance;
         };
 
         for (auto const& strand : sr.second)
@@ -339,7 +339,7 @@ public:
 
         auto const currency = toCurrency("USD");
 
-        constexpr std::size_t const kNUM_ACCOUNTS = 4;
+        static constexpr std::size_t kNumAccounts = 4;
 
         // There are three relevant trust lines: `alice->bob`, `bob->carol`, and
         // `carol->dan`. There are four accounts. If we count the number of
@@ -355,7 +355,7 @@ public:
         // randomly sample the test space.
         int const numTestIterations = reqNumIterations.value_or(250);
 
-        constexpr std::uint32_t kPAYMENT_AMOUNT = 1;
+        static constexpr std::uint32_t kPaymentAmount = 1;
 
         // Class to randomly set account transfer rates, qualities, and other
         // params.
@@ -373,15 +373,15 @@ public:
             auto const bob = Account("bob" + iterAsStr);
             auto const carol = Account("carol" + iterAsStr);
             auto const dan = Account("dan" + iterAsStr);
-            std::array<Account, kNUM_ACCOUNTS> accounts{{alice, bob, carol, dan}};
-            static_assert(kNUM_ACCOUNTS == 4, "Path is only correct for four accounts");
+            std::array<Account, kNumAccounts> accounts{{alice, bob, carol, dan}};
+            static_assert(kNumAccounts == 4, "Path is only correct for four accounts");
             Path const accountsPath(accounts[1], accounts[2]);
             env.fund(XRP(10000), alice, bob, carol, dan);
             env.close();
 
             // iterate through all pairs of accounts, randomly set the transfer
             // rate, qIn, qOut, and if the account issues or redeems
-            for (std::size_t ii = 0; ii < kNUM_ACCOUNTS; ++ii)
+            for (std::size_t ii = 0; ii < kNumAccounts; ++ii)
             {
                 rndAccParams.maybeSetTransferRate(env, accounts[ii]);
                 // The payment is from:
@@ -389,7 +389,7 @@ public:
                 // set the trust lines and initial balances for each pair of
                 // neighboring accounts
                 std::size_t const j = ii + 1;
-                if (j == kNUM_ACCOUNTS)
+                if (j == kNumAccounts)
                     continue;
 
                 rndAccParams.setupTrustLines(env, accounts[ii], accounts[j], currency);
@@ -399,7 +399,7 @@ public:
             // Accounts are set up, make the payment
             IOU const iou{accounts.back(), currency};
             RippleCalcTestParams const rcp{env.json(
-                pay(accounts.front(), accounts.back(), iou(kPAYMENT_AMOUNT)),
+                pay(accounts.front(), accounts.back(), iou(kPaymentAmount)),
                 accountsPath,
                 Txflags(tfNoRippleDirect))};
 
@@ -422,7 +422,7 @@ public:
 
         int const numTestIterations = reqNumIterations.value_or(100);
 
-        constexpr std::uint32_t kPAYMENT_AMOUNT = 1;
+        static constexpr std::uint32_t kPaymentAmount = 1;
 
         Currency const eurCurrency = toCurrency("EUR");
         Currency const usdCurrency = toCurrency("USD");
@@ -444,8 +444,8 @@ public:
             auto const oscar = Account("oscar" + iterAsStr);  // offer owner
             auto const usdb = bob["USD"];
             auto const eurc = carol["EUR"];
-            constexpr std::size_t const kNUM_ACCOUNTS = 5;
-            std::array<Account, kNUM_ACCOUNTS> const accounts{{alice, bob, carol, dan, oscar}};
+            static constexpr std::size_t kNumAccounts = 5;
+            std::array<Account, kNumAccounts> const accounts{{alice, bob, carol, dan, oscar}};
 
             // sendmax should be in USDB and delivered amount should be in EURC
             // normalized path should be:
@@ -478,8 +478,8 @@ public:
             IOU const srcIOU{bob, usdCurrency};
             IOU const dstIOU{carol, eurCurrency};
             RippleCalcTestParams const rcp{env.json(
-                pay(alice, dan, dstIOU(kPAYMENT_AMOUNT)),
-                Sendmax(srcIOU(100 * kPAYMENT_AMOUNT)),
+                pay(alice, dan, dstIOU(kPaymentAmount)),
+                Sendmax(srcIOU(100 * kPaymentAmount)),
                 bookPath,
                 Txflags(tfNoRippleDirect))};
 
diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp
index 83bcc8676e..626cdbe44d 100644
--- a/src/test/app/Ticket_test.cpp
+++ b/src/test/app/Ticket_test.cpp
@@ -673,12 +673,12 @@ class Ticket_test : public beast::unit_test::Suite
 
         // Successfully create several tickets (using a sequence).
         std::uint32_t ticketSeq{env.seq(alice)};
-        static constexpr std::uint32_t kTICKET_COUNT{10};
-        env(ticket::create(alice, kTICKET_COUNT));
+        static constexpr std::uint32_t kTicketCount{10};
+        env(ticket::create(alice, kTicketCount));
         uint256 const txHash1{getTxID()};
 
         // Just for grins use the tickets in reverse from largest to smallest.
-        ticketSeq += kTICKET_COUNT;
+        ticketSeq += kTicketCount;
         env(noop(alice), ticket::Use(--ticketSeq));
         uint256 const txHash2{getTxID()};
 
@@ -757,7 +757,7 @@ class Ticket_test : public beast::unit_test::Suite
     testSignWithTicketSequence()
     {
         // The sign and the submit RPC commands automatically fill in the
-        // Sequence field of a transaction if kNONE is provided.  If a
+        // Sequence field of a transaction if kNone is provided.  If a
         // TicketSequence is provided in the transaction, then the
         // auto-filled Sequence should be zero.
         testcase("Sign with TicketSequence");
@@ -779,7 +779,7 @@ class Ticket_test : public beast::unit_test::Suite
 
         {
             // Test that the "sign" RPC command fills in a "Sequence": 0 field
-            // if kNONE is provided.
+            // if kNone is provided.
 
             // Create a noop transaction using a TicketSequence but don't fill
             // in the Sequence field.
@@ -812,7 +812,7 @@ class Ticket_test : public beast::unit_test::Suite
         }
         {
             // Test that the "submit" RPC command fills in a "Sequence": 0
-            // field if kNONE is provided.
+            // field if kNone is provided.
 
             // Create a noop transaction using a TicketSequence but don't fill
             // in the Sequence field.
diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp
index 50340497a4..6672b3f834 100644
--- a/src/test/app/Transaction_ordering_test.cpp
+++ b/src/test/app/Transaction_ordering_test.cpp
@@ -110,16 +110,16 @@ struct Transaction_ordering_test : public beast::unit_test::Suite
         env.fund(XRP(1000), noripple(alice));
 
         auto const aliceSequence = env.seq(alice);
-        static constexpr auto kSIZE = 5;
+        static constexpr auto kSize = 5;
 
         std::vector<JTx> tx;
-        tx.reserve(kSIZE);
-        for (auto i = 0; i < kSIZE; ++i)
+        tx.reserve(kSize);
+        for (auto i = 0; i < kSize; ++i)
         {
             tx.emplace_back(env.jt(noop(alice), Seq(aliceSequence + i), LastLedgerSeq(7)));
         }
 
-        for (auto i = 1; i < kSIZE; ++i)
+        for (auto i = 1; i < kSize; ++i)
         {
             env(tx[i], Ter(terPRE_SEQ));
             BEAST_EXPECT(env.seq(alice) == aliceSequence);
@@ -127,11 +127,11 @@ struct Transaction_ordering_test : public beast::unit_test::Suite
 
         env(tx[0]);
         env.app().getJobQueue().rendezvous();
-        BEAST_EXPECT(env.seq(alice) == aliceSequence + kSIZE);
+        BEAST_EXPECT(env.seq(alice) == aliceSequence + kSize);
 
         env.close();
 
-        for (auto i = 0; i < kSIZE; ++i)
+        for (auto i = 0; i < kSize; ++i)
         {
             auto const result = env.rpc("tx", to_string(tx[i].stx->getTransactionID()));
             BEAST_EXPECT(result["result"]["meta"]["TransactionResult"] == "tesSUCCESS");
diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp
index c950739078..d8882cf346 100644
--- a/src/test/app/TxQ_test.cpp
+++ b/src/test/app/TxQ_test.cpp
@@ -60,8 +60,8 @@ namespace xrpl::test {
 class TxQPosNegFlows_test : public beast::unit_test::Suite
 {
     // Same as corresponding values from TxQ.h
-    static constexpr FeeLevel64 kBASE_FEE_LEVEL{256};
-    static constexpr FeeLevel64 kMIN_ESCALATION_FEE_LEVEL = kBASE_FEE_LEVEL * 500;
+    static constexpr FeeLevel64 kBaseFeeLevel{256};
+    static constexpr FeeLevel64 kMinEscalationFeeLevel = kBaseFeeLevel * 500;
 
     static void
     fillQueue(jtx::Env& env, jtx::Account const& account)
@@ -109,7 +109,7 @@ class TxQPosNegFlows_test : public beast::unit_test::Suite
     {
         FeeLevel64 const expectedMedFeeLevel = (feeLevel1 + feeLevel2 + FeeLevel64{1}) / 2;
 
-        return std::max(expectedMedFeeLevel, kMIN_ESCALATION_FEE_LEVEL).fee();
+        return std::max(expectedMedFeeLevel, kMinEscalationFeeLevel).fee();
     }
 
     static auto
@@ -276,8 +276,8 @@ public:
 
         //////////////////////////////////////////////////////////////
 
-        constexpr auto kLARGE_FEE_MULTIPLIER = 700;
-        auto const largeFee = baseFee * kLARGE_FEE_MULTIPLIER;
+        static constexpr auto kLargeFeeMultiplier = 700;
+        auto const largeFee = baseFee * kLargeFeeMultiplier;
 
         // Stuff the ledger and queue so we can verify that
         // stuff gets kicked out.
@@ -319,7 +319,7 @@ public:
         // is put back in. Neat.
         env.close();
         // clang-format off
-        checkMetrics(*this, env, 2, 8, 5, 4, kBASE_FEE_LEVEL.fee(), calcMedFeeLevel(FeeLevel64{kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER}));
+        checkMetrics(*this, env, 2, 8, 5, 4, kBaseFeeLevel.fee(), calcMedFeeLevel(FeeLevel64{kBaseFeeLevel.fee() * kLargeFeeMultiplier}));
         // clang-format on
 
         env.close();
@@ -742,8 +742,8 @@ public:
         // Queue an item with a sufficient LastLedgerSeq.
         env(noop(alice), LastLedgerSeq(8), queued);
 
-        constexpr auto kLARGE_FEE_MULTIPLIER = 700;
-        auto const largeFee = baseFee * kLARGE_FEE_MULTIPLIER;
+        static constexpr auto kLargeFeeMultiplier = 700;
+        auto const largeFee = baseFee * kLargeFeeMultiplier;
 
         // Queue items with higher fees to force the previous
         // txn to wait.
@@ -756,7 +756,7 @@ public:
             auto& txQ = env.app().getTxQ();
             auto aliceStat = txQ.getAccountTxs(alice.id());
             BEAST_EXPECT(aliceStat.size() == 1);
-            BEAST_EXPECT(aliceStat.begin()->feeLevel == kBASE_FEE_LEVEL);
+            BEAST_EXPECT(aliceStat.begin()->feeLevel == kBaseFeeLevel);
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
             BEAST_EXPECT(aliceStat.begin()->lastValid && *aliceStat.begin()->lastValid == 8);
             BEAST_EXPECT(!aliceStat.begin()->consequences.isBlocker());
@@ -764,12 +764,11 @@ public:
             auto bobStat = txQ.getAccountTxs(bob.id());
             BEAST_EXPECT(bobStat.size() == 1);
             BEAST_EXPECT(
-                bobStat.begin()->feeLevel ==
-                FeeLevel64{kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER});
+                bobStat.begin()->feeLevel == FeeLevel64{kBaseFeeLevel.fee() * kLargeFeeMultiplier});
             BEAST_EXPECT(!bobStat.begin()->lastValid);
             BEAST_EXPECT(!bobStat.begin()->consequences.isBlocker());
 
-            auto noStat = txQ.getAccountTxs(Account::kMASTER.id());
+            auto noStat = txQ.getAccountTxs(Account::kMaster.id());
             BEAST_EXPECT(noStat.empty());
         }
 
@@ -787,12 +786,12 @@ public:
         env.close();
         // alice's transaction is still hanging around
         // clang-format off
-        checkMetrics(*this, env, 1, 8, 5, 4, kBASE_FEE_LEVEL.fee(), kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER);
+        checkMetrics(*this, env, 1, 8, 5, 4, kBaseFeeLevel.fee(), kBaseFeeLevel.fee() * kLargeFeeMultiplier);
         // clang-format on
         BEAST_EXPECT(env.seq(alice) == 3);
 
-        constexpr auto kANOTHER_LARGE_FEE_MULTIPLIER = 800;
-        auto const anotherLargeFee = baseFee * kANOTHER_LARGE_FEE_MULTIPLIER;
+        static constexpr auto kAnotherLargeFeeMultiplier = 800;
+        auto const anotherLargeFee = baseFee * kAnotherLargeFeeMultiplier;
         // Keep alice's transaction waiting.
         // clang-format off
         env(noop(bob), Fee(anotherLargeFee), queued);
@@ -802,7 +801,7 @@ public:
         env(noop(edgar), Fee(anotherLargeFee), queued);
         env(noop(felicia), Fee(anotherLargeFee - 1), queued);
         env(noop(felicia), Fee(anotherLargeFee - 1), Seq(env.seq(felicia) + 1), queued);
-        checkMetrics(*this, env, 8, 8, 5, 4, kBASE_FEE_LEVEL.fee() + 1, kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER);
+        checkMetrics(*this, env, 8, 8, 5, 4, kBaseFeeLevel.fee() + 1, kBaseFeeLevel.fee() * kLargeFeeMultiplier);
         // clang-format on
 
         env.close();
@@ -810,7 +809,7 @@ public:
         // into the ledger, so her transaction is gone,
         // though one of felicia's is still in the queue.
         // clang-format off
-        checkMetrics(*this, env, 1, 10, 6, 5, kBASE_FEE_LEVEL.fee(), kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER);
+        checkMetrics(*this, env, 1, 10, 6, 5, kBaseFeeLevel.fee(), kBaseFeeLevel.fee() * kLargeFeeMultiplier);
         // clang-format on
         BEAST_EXPECT(env.seq(alice) == 3);
         BEAST_EXPECT(env.seq(felicia) == 7);
@@ -818,7 +817,7 @@ public:
         env.close();
         // And now the queue is empty
         // clang-format off
-        checkMetrics(*this, env, 0, 12, 1, 6, kBASE_FEE_LEVEL.fee(), kBASE_FEE_LEVEL.fee() * kANOTHER_LARGE_FEE_MULTIPLIER);
+        checkMetrics(*this, env, 0, 12, 1, 6, kBaseFeeLevel.fee(), kBaseFeeLevel.fee() * kAnotherLargeFeeMultiplier);
         // clang-format on
         BEAST_EXPECT(env.seq(alice) == 3);
         BEAST_EXPECT(env.seq(felicia) == 8);
@@ -868,8 +867,8 @@ public:
         fillQueue(env, alice);
         checkMetrics(*this, env, 0, 6, 4, 3);
 
-        constexpr auto kALICE_FEE_MULTIPLIER = 3;
-        auto feeAlice = baseFee * kALICE_FEE_MULTIPLIER;
+        static constexpr auto kAliceFeeMultiplier = 3;
+        auto feeAlice = baseFee * kAliceFeeMultiplier;
         auto seqAlice = env.seq(alice);
         for (int i = 0; i < 4; ++i)
         {
@@ -894,7 +893,7 @@ public:
             ++seqCarol;
         }
         // clang-format off
-        checkMetrics(*this, env, 6, 6, 4, 3, (kBASE_FEE_LEVEL.fee() * kALICE_FEE_MULTIPLIER) + 1);
+        checkMetrics(*this, env, 6, 6, 4, 3, (kBaseFeeLevel.fee() * kAliceFeeMultiplier) + 1);
         // clang-format on
 
         // Carol submits high enough to beat Bob's average fee which kicks
@@ -1027,17 +1026,17 @@ public:
         // Close an empty ledger to shrink queue from the flag-ledger
         // size to 2*3=6, independent of amendment count.
         env.close();
-        constexpr std::size_t kINIT_QUEUE_MAX = 6;
-        checkMetrics(*this, env, 0, kINIT_QUEUE_MAX, 0, 3);
+        static constexpr std::size_t kInitQueueMax = 6;
+        checkMetrics(*this, env, 0, kInitQueueMax, 0, 3);
 
         // Create several accounts while the fee is cheap so they all apply.
         env.fund(drops(2000), noripple(alice));
         env.fund(XRP(500000), noripple(bob, charlie, daria));
-        checkMetrics(*this, env, 0, kINIT_QUEUE_MAX, 4, 3);
+        checkMetrics(*this, env, 0, kInitQueueMax, 4, 3);
 
         // Alice - price starts exploding: held
         env(noop(alice), Fee(11), queued);
-        checkMetrics(*this, env, 1, kINIT_QUEUE_MAX, 4, 3);
+        checkMetrics(*this, env, 1, kInitQueueMax, 4, 3);
 
         auto aliceSeq = env.seq(alice);
         auto bobSeq = env.seq(bob);
@@ -1045,28 +1044,28 @@ public:
 
         // Alice - try to queue a second transaction, but leave a gap
         env(noop(alice), Seq(aliceSeq + 2), Fee(100), Ter(telCAN_NOT_QUEUE));
-        checkMetrics(*this, env, 1, kINIT_QUEUE_MAX, 4, 3);
+        checkMetrics(*this, env, 1, kInitQueueMax, 4, 3);
 
         // Alice - queue a second transaction. Yay!
         env(noop(alice), Seq(aliceSeq + 1), Fee(13), queued);
-        checkMetrics(*this, env, 2, kINIT_QUEUE_MAX, 4, 3);
+        checkMetrics(*this, env, 2, kInitQueueMax, 4, 3);
 
         // Alice - queue a third transaction. Yay.
         env(noop(alice), Seq(aliceSeq + 2), Fee(17), queued);
-        checkMetrics(*this, env, 3, kINIT_QUEUE_MAX, 4, 3);
+        checkMetrics(*this, env, 3, kInitQueueMax, 4, 3);
 
         // Bob - queue a transaction
         env(noop(bob), queued);
-        checkMetrics(*this, env, 4, kINIT_QUEUE_MAX, 4, 3);
+        checkMetrics(*this, env, 4, kInitQueueMax, 4, 3);
 
         // Bob - queue a second transaction
         env(noop(bob), Seq(bobSeq + 1), Fee(50), queued);
-        checkMetrics(*this, env, 5, kINIT_QUEUE_MAX, 4, 3);
+        checkMetrics(*this, env, 5, kInitQueueMax, 4, 3);
 
         // Charlie - queue a transaction, with a higher fee
         // than default
         env(noop(charlie), Fee(15), queued);
-        checkMetrics(*this, env, 6, kINIT_QUEUE_MAX, 4, 3, 257);
+        checkMetrics(*this, env, 6, kInitQueueMax, 4, 3, 257);
 
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
         BEAST_EXPECT(env.seq(bob) == bobSeq);
@@ -1536,7 +1535,7 @@ public:
                 {
                     double const feeMultiplier = static_cast<double>(cost.drops()) / baseFee;
                     medFeeLevel =
-                        FeeLevel64{static_cast<uint64_t>(feeMultiplier * kBASE_FEE_LEVEL.fee())};
+                        FeeLevel64{static_cast<uint64_t>(feeMultiplier * kBaseFeeLevel.fee())};
                 }
 
                 env(noop(alice), Fee(cost));
@@ -1547,7 +1546,7 @@ public:
             env.close();
             // If not for the maximum, the per ledger would be 11.
             // clang-format off
-            checkMetrics(*this, env, 0, 10, 0, 5, kBASE_FEE_LEVEL.fee(), calcMedFeeLevel(medFeeLevel));
+            checkMetrics(*this, env, 0, 10, 0, 5, kBaseFeeLevel.fee(), calcMedFeeLevel(medFeeLevel));
             // clang-format on
         }
 
@@ -2802,13 +2801,13 @@ public:
                 envs(
                     noop(alice),
                     Fee(baseFee * 100),
-                    Seq(kNONE),
+                    Seq(kNone),
                     Json(jss::LastLedgerSequence, lastLedgerSeq),
                     Ter(terQUEUED))(submitParams);
             }
             else
             {
-                envs(noop(alice), Fee(baseFee * 100), Seq(kNONE), Ter(terQUEUED))(submitParams);
+                envs(noop(alice), Fee(baseFee * 100), Seq(kNone), Ter(terQUEUED))(submitParams);
             }
         }
         checkMetrics(*this, env, 5, std::nullopt, 7, 6);
@@ -2819,7 +2818,7 @@ public:
             for (auto const& tx : aliceStat)
             {
                 BEAST_EXPECT(tx.seqProxy == seq);
-                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBASE_FEE_LEVEL.fee() * 100});
+                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBaseFeeLevel.fee() * 100});
                 if (seq.value() == aliceSeq + 2)
                 {
                     BEAST_EXPECT(tx.lastValid && *tx.lastValid == lastLedgerSeq);
@@ -2834,7 +2833,7 @@ public:
         // Put some txs in the queue for bob.
         // Give them a higher fee so they'll beat alice's.
         for (int i = 0; i < 8; ++i)
-            envs(noop(bob), Fee(baseFee * 200), Seq(kNONE), Ter(terQUEUED))();
+            envs(noop(bob), Fee(baseFee * 200), Seq(kNone), Ter(terQUEUED))();
         checkMetrics(*this, env, 13, std::nullopt, 7, 6);
 
         env.close();
@@ -2843,14 +2842,14 @@ public:
         // Give them a higher fee so they'll beat alice's.
         fillQueue(env, bob);
         for (int i = 0; i < 9; ++i)
-            envs(noop(bob), Fee(baseFee * 200), Seq(kNONE), Ter(terQUEUED))();
+            envs(noop(bob), Fee(baseFee * 200), Seq(kNone), Ter(terQUEUED))();
         checkMetrics(*this, env, 14, 14, 8, 7, 25601);
         env.close();
         // Put some more txs in the queue for bob.
         // Give them a higher fee so they'll beat alice's.
         fillQueue(env, bob);
         for (int i = 0; i < 10; ++i)
-            envs(noop(bob), Fee(baseFee * 200), Seq(kNONE), Ter(terQUEUED))();
+            envs(noop(bob), Fee(baseFee * 200), Seq(kNone), Ter(terQUEUED))();
         checkMetrics(*this, env, 15, 16, 9, 8);
         env.close();
         checkMetrics(*this, env, 4, 18, 10, 9);
@@ -2872,13 +2871,13 @@ public:
                     ++seq;
 
                 BEAST_EXPECT(tx.seqProxy.isSeq() && tx.seqProxy.value() == seq);
-                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBASE_FEE_LEVEL.fee() * 100});
+                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBaseFeeLevel.fee() * 100});
                 BEAST_EXPECT(!tx.lastValid);
                 ++seq;
             }
         }
         // Now, fill the gap.
-        envs(noop(alice), Fee(baseFee * 100), Seq(kNONE), Ter(terQUEUED))(submitParams);
+        envs(noop(alice), Fee(baseFee * 100), Seq(kNone), Ter(terQUEUED))(submitParams);
         checkMetrics(*this, env, 5, 18, 10, 9);
         {
             auto aliceStat = txQ.getAccountTxs(alice.id());
@@ -2887,7 +2886,7 @@ public:
             for (auto const& tx : aliceStat)
             {
                 BEAST_EXPECT(tx.seqProxy.isSeq() && tx.seqProxy.value() == seq);
-                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBASE_FEE_LEVEL * 100});
+                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBaseFeeLevel * 100});
                 BEAST_EXPECT(!tx.lastValid);
                 ++seq;
             }
@@ -2980,10 +2979,10 @@ public:
         }
 
         auto submitParams = json::Value(json::ValueType::Object);
-        envs(noop(alice), Fee(baseFee * 10), Seq(kNONE), Ter(terQUEUED))(submitParams);
-        envs(noop(alice), Fee(baseFee * 10), Seq(kNONE), Ter(terQUEUED))(submitParams);
-        envs(noop(alice), Fee(baseFee * 10), Seq(kNONE), Ter(terQUEUED))(submitParams);
-        envs(noop(alice), Fee(baseFee * 10), Seq(kNONE), Ter(terQUEUED))(submitParams);
+        envs(noop(alice), Fee(baseFee * 10), Seq(kNone), Ter(terQUEUED))(submitParams);
+        envs(noop(alice), Fee(baseFee * 10), Seq(kNone), Ter(terQUEUED))(submitParams);
+        envs(noop(alice), Fee(baseFee * 10), Seq(kNone), Ter(terQUEUED))(submitParams);
+        envs(noop(alice), Fee(baseFee * 10), Seq(kNone), Ter(terQUEUED))(submitParams);
         checkMetrics(*this, env, 4, 6, 4, 3);
 
         {
@@ -3014,7 +3013,7 @@ public:
             {
                 auto const& item = queued[i];
                 BEAST_EXPECT(item[jss::seq] == data[jss::Sequence].asInt() + i);
-                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBASE_FEE_LEVEL.fee() * 10));
+                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBaseFeeLevel.fee() * 10));
                 BEAST_EXPECT(!item.isMember(jss::LastLedgerSequence));
 
                 BEAST_EXPECT(item.isMember(jss::fee));
@@ -3031,12 +3030,12 @@ public:
         checkMetrics(*this, env, 0, 8, 4, 4);
 
         // Fill the ledger and then queue up a blocker.
-        envs(noop(alice), Seq(kNONE))(submitParams);
+        envs(noop(alice), Seq(kNone))(submitParams);
 
         envs(
             fset(alice, asfAccountTxnID),
             Fee(baseFee * 10),
-            Seq(kNONE),
+            Seq(kNone),
             Json(jss::LastLedgerSequence, 10),
             Ter(terQUEUED))(submitParams);
         checkMetrics(*this, env, 1, 8, 5, 4);
@@ -3069,7 +3068,7 @@ public:
             {
                 auto const& item = queued[i];
                 BEAST_EXPECT(item[jss::seq] == data[jss::Sequence].asInt() + i);
-                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBASE_FEE_LEVEL.fee() * 10));
+                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBaseFeeLevel.fee() * 10));
                 BEAST_EXPECT(item.isMember(jss::fee));
                 BEAST_EXPECT(item[jss::fee] == std::to_string(baseFee * 10));
                 BEAST_EXPECT(item.isMember(jss::max_spend_drops));
@@ -3090,7 +3089,7 @@ public:
             }
         }
 
-        envs(noop(alice), Fee(baseFee * 10), Seq(kNONE), Ter(telCAN_NOT_QUEUE_BLOCKED))(
+        envs(noop(alice), Fee(baseFee * 10), Seq(kNone), Ter(telCAN_NOT_QUEUE_BLOCKED))(
             submitParams);
         checkMetrics(*this, env, 1, 8, 5, 4);
 
@@ -3122,7 +3121,7 @@ public:
             {
                 auto const& item = queued[i];
                 BEAST_EXPECT(item[jss::seq] == data[jss::Sequence].asInt() + i);
-                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBASE_FEE_LEVEL.fee() * 10));
+                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBaseFeeLevel.fee() * 10));
 
                 if (i == queued.size() - 1)
                 {
@@ -3683,7 +3682,7 @@ public:
             for (auto const& tx : aliceQueue)
             {
                 BEAST_EXPECT(tx.seqProxy == seq);
-                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBASE_FEE_LEVEL.fee() * 10});
+                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBaseFeeLevel.fee() * 10});
                 seq.advanceBy(1);
             }
 
@@ -4062,10 +4061,10 @@ public:
         Account const ellie("ellie");
         Account const fiona("fiona");
 
-        constexpr int kLEDGERS_IN_QUEUE = 30;
+        static constexpr int kLedgersInQueue = 30;
         auto cfg = makeConfig(
             {{"minimum_txn_in_ledger_standalone", "1"},
-             {"ledgers_in_queue", std::to_string(kLEDGERS_IN_QUEUE)},
+             {"ledgers_in_queue", std::to_string(kLedgersInQueue)},
              {"maximum_txn_per_account", "10"}},
             {{"account_reserve", "1000"}, {"owner_reserve", "50"}});
 
@@ -4090,7 +4089,7 @@ public:
         env.close();
 
         auto const metrics = env.app().getTxQ().getMetrics(*env.current());
-        checkMetrics(*this, env, 0, kLEDGERS_IN_QUEUE * metrics.txPerLedger, 0, 2);
+        checkMetrics(*this, env, 0, kLedgersInQueue * metrics.txPerLedger, 0, 2);
 
         // Close ledgers until the amendments show up.
         int i = 0;
@@ -4101,7 +4100,7 @@ public:
                 break;
         }
         auto expectedPerLedger = xrpl::detail::numUpVotedAmendments() + 1;
-        checkMetrics(*this, env, 0, kLEDGERS_IN_QUEUE * expectedPerLedger, 0, expectedPerLedger);
+        checkMetrics(*this, env, 0, kLedgersInQueue * expectedPerLedger, 0, expectedPerLedger);
 
         // Now wait 2 weeks modulo 256 ledgers for the amendments to be
         // enabled.  Speed the process by closing ledgers every 80 minutes,
@@ -4120,7 +4119,7 @@ public:
             *this,
             env,
             0,
-            kLEDGERS_IN_QUEUE * expectedPerLedger,
+            kLedgersInQueue * expectedPerLedger,
             expectedPerLedger + 1,
             expectedPerLedger);
 
@@ -4153,7 +4152,7 @@ public:
             *this,
             env,
             expectedInQueue,
-            kLEDGERS_IN_QUEUE * expectedPerLedger,
+            kLedgersInQueue * expectedPerLedger,
             expectedPerLedger + 1,
             expectedPerLedger);
 
@@ -4179,7 +4178,7 @@ public:
                 *this,
                 env,
                 expectedInQueue,
-                kLEDGERS_IN_QUEUE * expectedPerLedger,
+                kLedgersInQueue * expectedPerLedger,
                 expectedInLedger,
                 expectedPerLedger);
             {
@@ -4383,7 +4382,7 @@ public:
         //    b) For just now having a queued transaction fail on apply()
         //       because of the sequence gap.
         //
-        // Verify that kNONE of alice's queued transactions actually applied to
+        // Verify that kNone of alice's queued transactions actually applied to
         // her account.
         BEAST_EXPECT(env.seq(alice) == seqSaveAlice);
         seqAlice = seqSaveAlice;
diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp
index 5cde63fdc3..15bd1bc586 100644
--- a/src/test/app/ValidatorList_test.cpp
+++ b/src/test/app/ValidatorList_test.cpp
@@ -81,7 +81,7 @@ private:
         SecretKey const& ssk,
         int seq)
     {
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = seq;
         st[sfPublicKey] = pk;
 
@@ -104,7 +104,7 @@ private:
     static std::string
     makeRevocationString(PublicKey const& pk, SecretKey const& sk)
     {
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = std::numeric_limits<std::uint32_t>::max();
         st[sfPublicKey] = pk;
 
@@ -603,15 +603,15 @@ private:
         BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgPublisherKeys));
 
         std::map<std::size_t, std::vector<Validator>> const lists = []() {
-            auto constexpr kLIST_SIZE = 20;
-            auto constexpr kNUM_LISTS = 9;
+            static constexpr auto kListSize = 20;
+            static constexpr auto kNumLists = 9;
             std::map<std::size_t, std::vector<Validator>> lists;
             // 1-based to correspond with the individually named blobs below.
-            for (auto i = 1; i <= kNUM_LISTS; ++i)
+            for (auto i = 1; i <= kNumLists; ++i)
             {
                 auto& list = lists[i];
-                list.reserve(kLIST_SIZE);
-                while (list.size() < kLIST_SIZE)
+                list.reserve(kListSize);
+                while (list.size() < kListSize)
                     list.push_back(randomValidator());
             }
             return lists;
@@ -949,10 +949,10 @@ private:
         BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgPublisherKeys));
 
         std::vector<Validator> const list = []() {
-            auto constexpr kLIST_SIZE = 20;
+            static constexpr auto kListSize = 20;
             std::vector<Validator> list;
-            list.reserve(kLIST_SIZE);
-            while (list.size() < kLIST_SIZE)
+            list.reserve(kListSize);
+            while (list.size() < kListSize)
                 list.push_back(randomValidator());
             return list;
         }();
@@ -1545,10 +1545,10 @@ private:
             // locals[0]: from 0 to maxKeys - 4
             // locals[1]: from 1 to maxKeys - 2
             // locals[2]: from 2 to maxKeys
-            constexpr static int kPUBLISHERS = 3;
+            static constexpr int kPublishers = 3;
             std::array<
                 std::pair<decltype(valKeys)::const_iterator, decltype(valKeys)::const_iterator>,
-                kPUBLISHERS>
+                kPublishers>
                 locals = {
                     std::make_pair(valKeys.cbegin(), valKeys.cend() - 4),
                     std::make_pair(valKeys.cbegin() + 1, valKeys.cend() - 2),
@@ -1588,7 +1588,7 @@ private:
             };
 
             // Apply multiple published lists
-            for (auto i = 0; i < kPUBLISHERS; ++i)
+            for (auto i = 0; i < kPublishers; ++i)
                 addPublishedList(i);
             BEAST_EXPECT(trustedKeys->getListThreshold() == 1);
 
@@ -1635,10 +1635,10 @@ private:
             // locals[2]: from 2 to maxKeys
             // intersection of at least 2: same as locals[1]
             // intersection when 1 is dropped: from 2 to maxKeys - 4
-            constexpr static int kPUBLISHERS = 3;
+            static constexpr int kPublishers = 3;
             std::array<
                 std::pair<decltype(valKeys)::const_iterator, decltype(valKeys)::const_iterator>,
-                kPUBLISHERS>
+                kPublishers>
                 locals = {
                     std::make_pair(valKeys.cbegin(), valKeys.cend() - 4),
                     std::make_pair(valKeys.cbegin() + 1, valKeys.cend() - 2),
@@ -1703,7 +1703,7 @@ private:
             // Apply multiple published lists
             // validUntil1 is expiration time for locals[1]
             NetClock::time_point validUntil1, validUntil2;
-            for (auto i = 0; i < kPUBLISHERS; ++i)
+            for (auto i = 0; i < kPublishers; ++i)
                 addPublishedList(i, validUntil1, validUntil2);
             BEAST_EXPECT(trustedKeys->getListThreshold() == 2);
 
@@ -2548,10 +2548,10 @@ private:
         jtx::Env env(*this);
         auto& app = env.app();
 
-        constexpr std::size_t kMAX_KEYS = 20;
+        static constexpr std::size_t kMaxKeys = 20;
         hash_set<NodeID> activeValidators;
         std::vector<Validator> valKeys;
-        while (valKeys.size() != kMAX_KEYS)
+        while (valKeys.size() != kMaxKeys)
         {
             valKeys.push_back(randomValidator());
             activeValidators.emplace(calcNodeID(valKeys.back().masterPublic));
@@ -2592,13 +2592,13 @@ private:
                 auto const pubSigningKeys = randomKeyPair(KeyType::Secp256k1);
                 cfgPublishers.push_back(strHex(publisherPublic));
 
-                constexpr auto kREVOKED = std::numeric_limits<std::uint32_t>::max();
+                constexpr auto kRevoked = std::numeric_limits<std::uint32_t>::max();
                 auto const manifest = base64Encode(makeManifestString(
                     publisherPublic,
                     publisherSecret,
                     pubSigningKeys.first,
                     pubSigningKeys.second,
-                    i < countRevoked ? kREVOKED : 1));
+                    i < countRevoked ? kRevoked : 1));
                 publishers.push_back(
                     Publisher{
                         .revoked = i < countRevoked,
@@ -2640,7 +2640,7 @@ private:
         };
 
         // Test cases use 5 publishers.
-        constexpr auto kQUORUM_DISABLED = std::numeric_limits<std::size_t>::max();
+        constexpr auto kQuorumDisabled = std::numeric_limits<std::size_t>::max();
         {
             // List threshold = 5 (same as number of trusted publishers)
             ManifestCache pubManifests;
@@ -2688,7 +2688,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -2746,7 +2746,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().empty());
 
             hash_set<NodeID> removed;
@@ -2811,7 +2811,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -2881,7 +2881,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -2947,7 +2947,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -3014,7 +3014,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().empty());
 
             hash_set<NodeID> removed;
@@ -3080,7 +3080,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == keysTotal);
 
             BEAST_EXPECT(trustedKeys->trusted(self.masterPublic));
@@ -3139,7 +3139,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == keysTotal);
 
             BEAST_EXPECT(trustedKeys->trusted(self.masterPublic));
@@ -3197,7 +3197,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == keysTotal);
 
             BEAST_EXPECT(trustedKeys->trusted(self.masterPublic));
@@ -3253,7 +3253,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == keysTotal);
 
             for (auto const& val : valKeys)
@@ -3298,7 +3298,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == keysTotal);
 
             hash_set<NodeID> added;
@@ -3319,7 +3319,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -3365,7 +3365,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == keysTotal);
 
             hash_set<NodeID> added;
@@ -3385,7 +3385,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -3432,7 +3432,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == keysTotal);
 
             hash_set<NodeID> added;
@@ -3452,7 +3452,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().empty());
 
             hash_set<NodeID> removed;
@@ -3512,7 +3512,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -3573,7 +3573,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -3634,7 +3634,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().empty());
 
             hash_set<NodeID> removed;
@@ -3696,7 +3696,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -3843,7 +3843,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
@@ -3911,7 +3911,7 @@ private:
                 env.app().getOPs(),
                 env.app().getOverlay(),
                 env.app().getHashRouter());
-            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
+            BEAST_EXPECT(trustedKeys->quorum() == kQuorumDisabled);
             BEAST_EXPECT(trustedKeys->getTrustedMasterKeys().size() == 1);
 
             hash_set<NodeID> removed;
diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp
index ff0da77fa1..b10667c467 100644
--- a/src/test/app/ValidatorSite_test.cpp
+++ b/src/test/app/ValidatorSite_test.cpp
@@ -45,8 +45,8 @@ realValidatorContents()
 )vl";
 }
 
-auto constexpr kDEFAULT_EXPIRES = std::chrono::seconds{3600};
-auto constexpr kDEFAULT_EFFECTIVE_OVERLAP = std::chrono::seconds{30};
+constexpr auto kDefaultExpires = std::chrono::seconds{3600};
+constexpr auto kDefaultEffectiveOverlap = std::chrono::seconds{30};
 }  // namespace detail
 
 namespace test {
@@ -129,8 +129,8 @@ private:
         bool failFetch = false;
         bool failApply = false;
         int serverVersion = 1;
-        std::chrono::seconds expiresFromNow = detail::kDEFAULT_EXPIRES;
-        std::chrono::seconds effectiveOverlap = detail::kDEFAULT_EFFECTIVE_OVERLAP;
+        std::chrono::seconds expiresFromNow = detail::kDefaultExpires;
+        std::chrono::seconds effectiveOverlap = detail::kDefaultEffectiveOverlap;
         int expectedRefreshMin = 0;
     };
     void
@@ -172,7 +172,7 @@ private:
         };
         std::vector<Publisher> servers;
 
-        auto constexpr kLIST_SIZE = 20;
+        static constexpr auto kListSize = 20;
         std::vector<std::string> cfgPublishers;
 
         for (auto const& cfg : paths)
@@ -180,8 +180,8 @@ private:
             servers.emplace_back(cfg);
             auto& item = servers.back();
             item.isRetry = cfg.path == "/bad-resource";
-            item.list.reserve(kLIST_SIZE);
-            while (item.list.size() < kLIST_SIZE)
+            item.list.reserve(kListSize);
+            while (item.list.size() < kListSize)
                 item.list.push_back(TrustedPublisherServer::randomValidator());
 
             NetClock::time_point const expires = env.timeKeeper().now() + cfg.expiresFromNow;
@@ -405,7 +405,7 @@ public:
                   false,
                   false,
                   1,
-                  detail::kDEFAULT_EXPIRES,
+                  detail::kDefaultExpires,
                   std::chrono::seconds{-90}}});
             // fetch single site with unending redirect (fails to load)
             testFetchList(
@@ -495,7 +495,7 @@ public:
                   false,
                   true,
                   1,
-                  std::chrono::seconds{json::Value::kMIN_INT}}});
+                  std::chrono::seconds{json::Value::kMinInt}}});
             // force an out-of-range validUntil value on the future list
             // The first list is accepted. The second fails. The parser
             // returns the "best" result, so this looks like a success.
@@ -507,7 +507,7 @@ public:
                   false,
                   false,
                   1,
-                  std::chrono::seconds{json::Value::kMAX_INT - 300},
+                  std::chrono::seconds{json::Value::kMaxInt - 300},
                   299s}});
             // force an out-of-range validFrom value
             // The first list is accepted. The second fails. The parser
@@ -520,7 +520,7 @@ public:
                   false,
                   false,
                   1,
-                  std::chrono::seconds{json::Value::kMAX_INT - 300},
+                  std::chrono::seconds{json::Value::kMaxInt - 300},
                   301s}});
             // force an out-of-range validUntil value on _both_ lists
             testFetchList(
@@ -531,8 +531,8 @@ public:
                   false,
                   true,
                   1,
-                  std::chrono::seconds{json::Value::kMIN_INT},
-                  std::chrono::seconds{json::Value::kMAX_INT - 6000}}});
+                  std::chrono::seconds{json::Value::kMinInt},
+                  std::chrono::seconds{json::Value::kMaxInt - 6000}}});
             // verify refresh intervals are properly clamped
             testFetchList(
                 good,
@@ -542,8 +542,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::kDEFAULT_EXPIRES,
-                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
+                  detail::kDefaultExpires,
+                  detail::kDefaultEffectiveOverlap,
                   1}});  // minimum of 1 minute
             testFetchList(
                 good,
@@ -553,8 +553,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::kDEFAULT_EXPIRES,
-                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
+                  detail::kDefaultExpires,
+                  detail::kDefaultEffectiveOverlap,
                   1}});  // minimum of 1 minute
             testFetchList(
                 good,
@@ -564,8 +564,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::kDEFAULT_EXPIRES,
-                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
+                  detail::kDefaultExpires,
+                  detail::kDefaultEffectiveOverlap,
                   10}});  // 10 minutes is fine
             testFetchList(
                 good,
@@ -575,8 +575,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::kDEFAULT_EXPIRES,
-                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
+                  detail::kDefaultExpires,
+                  detail::kDefaultEffectiveOverlap,
                   10}});  // 10 minutes is fine
             testFetchList(
                 good,
@@ -586,8 +586,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::kDEFAULT_EXPIRES,
-                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
+                  detail::kDefaultExpires,
+                  detail::kDefaultEffectiveOverlap,
                   60 * 24}});  // max of 24 hours
             testFetchList(
                 good,
@@ -597,8 +597,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::kDEFAULT_EXPIRES,
-                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
+                  detail::kDefaultExpires,
+                  detail::kDefaultEffectiveOverlap,
                   60 * 24}});  // max of 24 hours
         }
         using namespace boost::filesystem;
diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp
index 2f32cf605a..cd4c35f1a5 100644
--- a/src/test/app/Vault_test.cpp
+++ b/src/test/app/Vault_test.cpp
@@ -69,7 +69,7 @@ class Vault_test : public beast::unit_test::Suite
     using PrettyAsset = xrpl::test::jtx::PrettyAsset;
     using PrettyAmount = xrpl::test::jtx::PrettyAmount;
 
-    static auto constexpr kNEGATIVE_AMOUNT = [](PrettyAsset const& asset) -> PrettyAmount {
+    static constexpr auto kNegativeAmount = [](PrettyAsset const& asset) -> PrettyAmount {
         return {STAmount{asset.raw(), 1ul, 0, true, STAmount::Unchecked{}}, ""};
     };
 
@@ -570,7 +570,7 @@ class Vault_test : public beast::unit_test::Suite
         });
 
         testCases("MPT", [&](Env& env) -> Asset {
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
             mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
             PrettyAsset const asset = mptt.issuanceID();
             mptt.authorize({.account = depositor});
@@ -634,7 +634,7 @@ class Vault_test : public beast::unit_test::Suite
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
-                    env(tx, kDATA("test"), Ter{resultAfterCreate});
+                    env(tx, kData("test"), Ter{resultAfterCreate});
                 }
 
                 {
@@ -683,7 +683,7 @@ class Vault_test : public beast::unit_test::Suite
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
-                    env(tx, kDATA("Test"));
+                    env(tx, kData("Test"));
 
                     tx[sfDomainID] = to_string(BaseUInt<256>(13ul));
                     env(tx, Ter{temDISABLED});
@@ -815,33 +815,33 @@ class Vault_test : public beast::unit_test::Suite
             {
                 auto tx = vault.set({
                     .owner = owner,
-                    .id = beast::kZERO,
+                    .id = beast::kZero,
                 });
                 env(tx, Ter{temMALFORMED});
             }
 
             {
                 auto tx =
-                    vault.deposit({.depositor = owner, .id = beast::kZERO, .amount = asset(10)});
+                    vault.deposit({.depositor = owner, .id = beast::kZero, .amount = asset(10)});
                 env(tx, Ter(temMALFORMED));
             }
 
             {
                 auto tx =
-                    vault.withdraw({.depositor = owner, .id = beast::kZERO, .amount = asset(10)});
+                    vault.withdraw({.depositor = owner, .id = beast::kZero, .amount = asset(10)});
                 env(tx, Ter{temMALFORMED});
             }
 
             {
                 auto tx = vault.clawback(
-                    {.issuer = issuer, .id = beast::kZERO, .holder = owner, .amount = asset(10)});
+                    {.issuer = issuer, .id = beast::kZero, .holder = owner, .amount = asset(10)});
                 env(tx, Ter{temMALFORMED});
             }
 
             {
                 auto tx = vault.del({
                     .owner = owner,
-                    .id = beast::kZERO,
+                    .id = beast::kZero,
                 });
                 env(tx, Ter{temMALFORMED});
             }
@@ -982,7 +982,7 @@ class Vault_test : public beast::unit_test::Suite
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
-                    tx[sfAssetsMaximum] = kNEGATIVE_AMOUNT(asset).number();
+                    tx[sfAssetsMaximum] = kNegativeAmount(asset).number();
                     env(tx, Ter{temMALFORMED});
                 }
             });
@@ -995,7 +995,7 @@ class Vault_test : public beast::unit_test::Suite
 
                 {
                     auto tx = vault.deposit(
-                        {.depositor = owner, .id = keylet.key, .amount = kNEGATIVE_AMOUNT(asset)});
+                        {.depositor = owner, .id = keylet.key, .amount = kNegativeAmount(asset)});
                     env(tx, Ter(temBAD_AMOUNT));
                 }
 
@@ -1027,7 +1027,7 @@ class Vault_test : public beast::unit_test::Suite
 
                 {
                     auto tx = vault.withdraw(
-                        {.depositor = owner, .id = keylet.key, .amount = kNEGATIVE_AMOUNT(asset)});
+                        {.depositor = owner, .id = keylet.key, .amount = kNegativeAmount(asset)});
                     env(tx, Ter(temBAD_AMOUNT));
                 }
 
@@ -1060,7 +1060,7 @@ class Vault_test : public beast::unit_test::Suite
                     {.issuer = issuer,
                      .id = keylet.key,
                      .holder = owner,
-                     .amount = kNEGATIVE_AMOUNT(asset)});
+                     .amount = kNegativeAmount(asset)});
                 env(tx, Ter(temBAD_AMOUNT));
             }
         });
@@ -1085,7 +1085,7 @@ class Vault_test : public beast::unit_test::Suite
 
                 {
                     auto tx = tx1;
-                    tx[sfAssetsMaximum] = kNEGATIVE_AMOUNT(asset).number();
+                    tx[sfAssetsMaximum] = kNegativeAmount(asset).number();
                     env(tx, Ter{temMALFORMED});
                 }
 
@@ -1415,7 +1415,7 @@ class Vault_test : public beast::unit_test::Suite
             env.fund(XRP(1000), issuer, owner, depositor);
             env.close();
             Vault vault{env};
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
             // Locked because that is the default flag.
             mptt.create();
             Asset const asset = mptt.issuanceID();
@@ -1588,12 +1588,12 @@ class Vault_test : public beast::unit_test::Suite
             env.close();
             Vault vault{env};
 
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
-            auto const kNONE = LedgerSpecificFlags(0);
+            MPTTester mptt{env, issuer, kMptInitNoFund};
+            auto const kNone = LedgerSpecificFlags(0);
             mptt.create(
                 {.flags = tfMPTCanTransfer | tfMPTCanLock |
-                     (args.enableClawback ? tfMPTCanClawback : kNONE) |
-                     (args.requireAuth ? tfMPTRequireAuth : kNONE),
+                     (args.enableClawback ? tfMPTCanClawback : kNone) |
+                     (args.requireAuth ? tfMPTRequireAuth : kNone),
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             PrettyAsset const asset = mptt.issuanceID();
             mptt.authorize({.account = owner});
@@ -1872,8 +1872,8 @@ class Vault_test : public beast::unit_test::Suite
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
             Env const env{*this, testableAmendments()};
             return {
-                env.current()->fees().accountReserve(0).drops() / kDROPS_PER_XRP.drops(),
-                env.current()->fees().increment.drops() / kDROPS_PER_XRP.drops()};
+                env.current()->fees().accountReserve(0).drops() / kDropsPerXrp.drops(),
+                env.current()->fees().increment.drops() / kDropsPerXrp.drops()};
         }();
 
         testCase(
@@ -2211,7 +2211,7 @@ class Vault_test : public beast::unit_test::Suite
             env.close();
             Vault const vault{env};
 
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
             mptt.create(
                 {.flags = tfMPTCanTransfer | tfMPTCanLock | lsfMPTCanClawback | tfMPTRequireAuth});
             mptt.authorize({.account = owner});
@@ -2820,10 +2820,10 @@ class Vault_test : public beast::unit_test::Suite
 
                 {
                     BEAST_EXPECT(env.balance(owner, asset) == startingOwnerBalance.value());
-                    BEAST_EXPECT(env.balance(vaultAccount(keylet), asset) == beast::kZERO);
+                    BEAST_EXPECT(env.balance(vaultAccount(keylet), asset) == beast::kZero);
                     auto const vault = env.le(keylet);
-                    BEAST_EXPECT(vault->at(sfAssetsAvailable) == beast::kZERO);
-                    BEAST_EXPECT(vault->at(sfAssetsTotal) == beast::kZERO);
+                    BEAST_EXPECT(vault->at(sfAssetsAvailable) == beast::kZero);
+                    BEAST_EXPECT(vault->at(sfAssetsTotal) == beast::kZero);
                 }
 
                 env(vault.del({.owner = owner, .id = keylet.key}));
@@ -2834,8 +2834,8 @@ class Vault_test : public beast::unit_test::Suite
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
             Env const env{*this, testableAmendments()};
             return {
-                env.current()->fees().accountReserve(0).drops() / kDROPS_PER_XRP.drops(),
-                env.current()->fees().increment.drops() / kDROPS_PER_XRP.drops()};
+                env.current()->fees().accountReserve(0).drops() / kDropsPerXrp.drops(),
+                env.current()->fees().increment.drops() / kDropsPerXrp.drops()};
         }();
 
         testCase(
@@ -3376,9 +3376,9 @@ class Vault_test : public beast::unit_test::Suite
             AccountID const accountId = xrpl::pseudoAccountAddress(*env.current(), keylet.key);
 
             env(pay(env.master.id(), accountId, XRP(1000)),
-                Seq(kAUTOFILL),
-                Fee(kAUTOFILL),
-                Sig(kAUTOFILL));
+                Seq(kAutofill),
+                Fee(kAutofill),
+                Sig(kAutofill));
         }
 
         auto [tx, keylet1] = vault.create({.owner = owner, .asset = xrpIssue()});
@@ -4198,10 +4198,10 @@ class Vault_test : public beast::unit_test::Suite
 
             // Borrow 40: assetsAvailable=60, assetsTotal=100
             env(set(d.depositor, brokerKeylet.key, STAmount(d.asset, Number(40, 0))),
-                loan::kINTEREST_RATE(TenthBips32(0)),
-                kGRACE_PERIOD(60),
-                kPAYMENT_INTERVAL(120),
-                kPAYMENT_TOTAL(10),
+                loan::kInterestRate(TenthBips32(0)),
+                kGracePeriod(60),
+                kPaymentInterval(120),
+                kPaymentTotal(10),
                 Sig(sfCounterpartySignature, d.owner),
                 Fee(env.current()->fees().base * 2),
                 Ter(tesSUCCESS));
@@ -4280,17 +4280,17 @@ class Vault_test : public beast::unit_test::Suite
                                json::Value const& issuance = json::ValueType::Null) {
             BEAST_EXPECT(vault.isObject());
 
-            constexpr auto kCHECK_STRING =
+            static constexpr auto kCheckString =
                 [](auto& node, SField const& field, std::string v) -> bool {
                 return node.isMember(field.fieldName) && node[field.fieldName].isString() &&
                     node[field.fieldName] == v;
             };
-            constexpr auto kCHECK_OBJECT =
+            static constexpr auto kCheckObject =
                 [](auto& node, SField const& field, json::Value v) -> bool {
                 return node.isMember(field.fieldName) && node[field.fieldName].isObject() &&
                     node[field.fieldName] == v;
             };
-            constexpr auto kCHECK_INT = [](auto& node, SField const& field, int v) -> bool {
+            static constexpr auto kCheckInt = [](auto& node, SField const& field, int v) -> bool {
                 return node.isMember(field.fieldName) &&
                     ((node[field.fieldName].isInt() && node[field.fieldName] == json::Int(v)) ||
                      (node[field.fieldName].isUInt() && node[field.fieldName] == json::UInt(v)));
@@ -4298,31 +4298,30 @@ class Vault_test : public beast::unit_test::Suite
 
             BEAST_EXPECT(vault["LedgerEntryType"].asString() == "Vault");
             BEAST_EXPECT(vault[jss::index].asString() == strHex(keylet.key));
-            BEAST_EXPECT(kCHECK_INT(vault, sfFlags, 0));
+            BEAST_EXPECT(kCheckInt(vault, sfFlags, 0));
             // Ignore all other standard fields, this test doesn't care
 
-            BEAST_EXPECT(kCHECK_STRING(vault, sfAccount, toBase58(sle->at(sfAccount))));
-            BEAST_EXPECT(kCHECK_OBJECT(vault, sfAsset, toJson(sle->at(sfAsset))));
-            BEAST_EXPECT(kCHECK_STRING(vault, sfAssetsAvailable, "50"));
-            BEAST_EXPECT(kCHECK_STRING(vault, sfAssetsMaximum, "1000"));
-            BEAST_EXPECT(kCHECK_STRING(vault, sfAssetsTotal, "50"));
+            BEAST_EXPECT(kCheckString(vault, sfAccount, toBase58(sle->at(sfAccount))));
+            BEAST_EXPECT(kCheckObject(vault, sfAsset, toJson(sle->at(sfAsset))));
+            BEAST_EXPECT(kCheckString(vault, sfAssetsAvailable, "50"));
+            BEAST_EXPECT(kCheckString(vault, sfAssetsMaximum, "1000"));
+            BEAST_EXPECT(kCheckString(vault, sfAssetsTotal, "50"));
             BEAST_EXPECT(!vault.isMember(sfLossUnrealized.getJsonName()));
 
             auto const strShareID = strHex(sle->at(sfShareMPTID));
-            BEAST_EXPECT(kCHECK_STRING(vault, sfShareMPTID, strShareID));
-            BEAST_EXPECT(kCHECK_STRING(vault, sfOwner, toBase58(owner.id())));
-            BEAST_EXPECT(kCHECK_INT(vault, sfSequence, sequence));
-            BEAST_EXPECT(
-                kCHECK_INT(vault, sfWithdrawalPolicy, kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE));
+            BEAST_EXPECT(kCheckString(vault, sfShareMPTID, strShareID));
+            BEAST_EXPECT(kCheckString(vault, sfOwner, toBase58(owner.id())));
+            BEAST_EXPECT(kCheckInt(vault, sfSequence, sequence));
+            BEAST_EXPECT(kCheckInt(vault, sfWithdrawalPolicy, kVaultStrategyFirstComeFirstServe));
 
             if (issuance.isObject())
             {
                 BEAST_EXPECT(issuance["LedgerEntryType"].asString() == "MPTokenIssuance");
                 BEAST_EXPECT(issuance[jss::mpt_issuance_id].asString() == strShareID);
-                BEAST_EXPECT(kCHECK_INT(issuance, sfSequence, 1));
-                BEAST_EXPECT(kCHECK_INT(
+                BEAST_EXPECT(kCheckInt(issuance, sfSequence, 1));
+                BEAST_EXPECT(kCheckInt(
                     issuance, sfFlags, int(lsfMPTCanEscrow | lsfMPTCanTrade | lsfMPTCanTransfer)));
-                BEAST_EXPECT(kCHECK_STRING(issuance, sfOutstandingAmount, "50000000"));
+                BEAST_EXPECT(kCheckString(issuance, sfOutstandingAmount, "50000000"));
             }
         };
 
@@ -4716,10 +4715,10 @@ class Vault_test : public beast::unit_test::Suite
 
             // Create a simple Loan for the full amount of Vault assets
             env(set(depositor, brokerKeylet.key, asset(100).value()),
-                loan::kINTEREST_RATE(TenthBips32(0)),
-                kGRACE_PERIOD(60),
-                kPAYMENT_INTERVAL(120),
-                kPAYMENT_TOTAL(10),
+                loan::kInterestRate(TenthBips32(0)),
+                kGracePeriod(60),
+                kPaymentInterval(120),
+                kPaymentTotal(10),
                 Sig(sfCounterpartySignature, owner),
                 Fee(env.current()->fees().base * 2),
                 Ter(tesSUCCESS));
@@ -4897,7 +4896,7 @@ class Vault_test : public beast::unit_test::Suite
         testCase(iou, "IOU (owner is issuer)", issuer, depositor);
 
         // Test MPT
-        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mptt{env, issuer, kMptInitNoFund};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
         PrettyAsset const mpt = mptt.issuanceID();
         mptt.authorize({.account = owner});
@@ -5107,10 +5106,10 @@ class Vault_test : public beast::unit_test::Suite
                 // Depositor borrows 40 units, reducing assetsAvailable to 60
                 // while assetsTotal stays at 100
                 env(set(depositor, brokerKeylet.key, asset(40).value()),
-                    loan::kINTEREST_RATE(TenthBips32(0)),
-                    kGRACE_PERIOD(60),
-                    kPAYMENT_INTERVAL(120),
-                    kPAYMENT_TOTAL(10),
+                    loan::kInterestRate(TenthBips32(0)),
+                    kGracePeriod(60),
+                    kPaymentInterval(120),
+                    kPaymentTotal(10),
                     Sig(sfCounterpartySignature, owner),
                     Fee(env.current()->fees().base * 2),
                     Ter(tesSUCCESS));
@@ -5164,10 +5163,10 @@ class Vault_test : public beast::unit_test::Suite
 
                 // Depositor borrows 40 units
                 env(set(depositor, brokerKeylet.key, asset(40).value()),
-                    loan::kINTEREST_RATE(TenthBips32(0)),
-                    kGRACE_PERIOD(60),
-                    kPAYMENT_INTERVAL(120),
-                    kPAYMENT_TOTAL(10),
+                    loan::kInterestRate(TenthBips32(0)),
+                    kGracePeriod(60),
+                    kPaymentInterval(120),
+                    kPaymentTotal(10),
                     Sig(sfCounterpartySignature, owner),
                     Fee(env.current()->fees().base * 2),
                     Ter(tesSUCCESS));
@@ -5219,10 +5218,10 @@ class Vault_test : public beast::unit_test::Suite
 
                 // Depositor borrows 40 units: assetsAvailable=60, assetsTotal=100
                 env(set(depositor, brokerKeylet.key, asset(40).value()),
-                    loan::kINTEREST_RATE(TenthBips32(0)),
-                    kGRACE_PERIOD(60),
-                    kPAYMENT_INTERVAL(120),
-                    kPAYMENT_TOTAL(10),
+                    loan::kInterestRate(TenthBips32(0)),
+                    kGracePeriod(60),
+                    kPaymentInterval(120),
+                    kPaymentTotal(10),
                     Sig(sfCounterpartySignature, owner),
                     Fee(env.current()->fees().base * 2),
                     Ter(tesSUCCESS));
@@ -5273,10 +5272,10 @@ class Vault_test : public beast::unit_test::Suite
 
                 // Depositor borrows 40 units: assetsAvailable=60, assetsTotal=100
                 env(set(depositor, brokerKeylet.key, asset(40).value()),
-                    loan::kINTEREST_RATE(TenthBips32(0)),
-                    kGRACE_PERIOD(60),
-                    kPAYMENT_INTERVAL(120),
-                    kPAYMENT_TOTAL(10),
+                    loan::kInterestRate(TenthBips32(0)),
+                    kGracePeriod(60),
+                    kPaymentInterval(120),
+                    kPaymentTotal(10),
                     Sig(sfCounterpartySignature, owner),
                     Fee(env.current()->fees().base * 2),
                     Ter(tesSUCCESS));
@@ -5321,10 +5320,10 @@ class Vault_test : public beast::unit_test::Suite
 
                 // Depositor borrows all 100 units: assetsAvailable=0, assetsTotal=100
                 env(set(depositor, brokerKeylet.key, asset(100).value()),
-                    loan::kINTEREST_RATE(TenthBips32(0)),
-                    kGRACE_PERIOD(60),
-                    kPAYMENT_INTERVAL(120),
-                    kPAYMENT_TOTAL(10),
+                    loan::kInterestRate(TenthBips32(0)),
+                    kGracePeriod(60),
+                    kPaymentInterval(120),
+                    kPaymentTotal(10),
                     Sig(sfCounterpartySignature, owner),
                     Fee(env.current()->fees().base * 2),
                     Ter(tesSUCCESS));
@@ -5393,7 +5392,7 @@ class Vault_test : public beast::unit_test::Suite
         testCase(iou, "IOU", owner, depositor, issuer);
 
         // Test MPT
-        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+        MPTTester mptt{env, issuer, kMptInitNoFund};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
 
         PrettyAsset const mpt = mptt.issuanceID();
@@ -5429,10 +5428,10 @@ class Vault_test : public beast::unit_test::Suite
             // Depositor borrows 40 units, reducing assetsAvailable to 60
             // while assetsTotal stays at 100
             env(set(depositor, brokerKeylet.key, iou(40).value()),
-                loan::kINTEREST_RATE(TenthBips32(0)),
-                kGRACE_PERIOD(60),
-                kPAYMENT_INTERVAL(120),
-                kPAYMENT_TOTAL(10),
+                loan::kInterestRate(TenthBips32(0)),
+                kGracePeriod(60),
+                kPaymentInterval(120),
+                kPaymentTotal(10),
                 Sig(sfCounterpartySignature, owner),
                 Fee(env.current()->fees().base * 2),
                 Ter(tesSUCCESS));
@@ -5495,10 +5494,10 @@ class Vault_test : public beast::unit_test::Suite
             static_cast<std::uint64_t>(std::numeric_limits<std::int64_t>::max()) + 1);
         BEAST_EXPECT(maxInt64Plus1 == "9223372036854775808");
 
-        auto const initialXRP = to_string(kINITIAL_XRP);
+        auto const initialXRP = to_string(kInitialXrp);
         BEAST_EXPECT(initialXRP == "100000000000000000");
 
-        auto const initialXRPPlus1 = to_string(kINITIAL_XRP + 1);
+        auto const initialXRPPlus1 = to_string(kInitialXrp + 1);
         BEAST_EXPECT(initialXRPPlus1 == "100000000000000001");
 
         {
@@ -5546,7 +5545,7 @@ class Vault_test : public beast::unit_test::Suite
             testcase("Assets Maximum: MPT");
 
             PrettyAsset const mptAsset = [&]() {
-                MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+                MPTTester mptt{env, issuer, kMptInitNoFund};
                 mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
                 env.close();
                 PrettyAsset const mptAsset = mptt["MPT"];
@@ -5686,7 +5685,7 @@ class Vault_test : public beast::unit_test::Suite
                 if (!BEAST_EXPECT(vaultSle))
                     return;
 
-                BEAST_EXPECT(vaultSle->at(sfAssetsMaximum) == kNUM_ZERO);
+                BEAST_EXPECT(vaultSle->at(sfAssetsMaximum) == kNumZero);
             }
 
             // What _can't_ IOUs do?
@@ -5738,7 +5737,7 @@ class Vault_test : public beast::unit_test::Suite
             env.fund(XRP(10000), issuer, owner, depositor, bob);
             env.close();
 
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
             mptt.create(
                 {.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock | tfMPTCanEscrow});
             mptt.authorize({.account = owner});
@@ -5751,8 +5750,8 @@ class Vault_test : public beast::unit_test::Suite
             // Escrow 60 of 100 MPT tokens: sfMPTAmount drops to 40
             auto const escrowSeq = env.seq(depositor);
             env(escrow::create(depositor, bob, asset(60)),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -5780,8 +5779,8 @@ class Vault_test : public beast::unit_test::Suite
 
             // Clean up escrow
             env(escrow::finish(bob, depositor, escrowSeq),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFULFILLMENT(escrow::kFB1),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFulfillment(escrow::kFb1),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -5800,7 +5799,7 @@ class Vault_test : public beast::unit_test::Suite
             env.fund(XRP(10000), issuer, owner, depositor, bob);
             env.close();
 
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
             mptt.create(
                 {.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock | tfMPTCanEscrow});
             mptt.authorize({.account = owner});
@@ -5840,8 +5839,8 @@ class Vault_test : public beast::unit_test::Suite
             // Escrow 60% of shares
             auto const escrowAmount = shares(Number{6, vaultSle->at(sfScale) + 1});
             env(escrow::create(depositor, bob, escrowAmount),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -5877,7 +5876,7 @@ class Vault_test : public beast::unit_test::Suite
             env.fund(XRP(10000), issuer, owner, depositor, bob);
             env.close();
 
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
             mptt.create(
                 {.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock | tfMPTCanEscrow});
             mptt.authorize({.account = owner});
@@ -5917,8 +5916,8 @@ class Vault_test : public beast::unit_test::Suite
             // Escrow 60% of shares
             auto const escrowAmount = shares(Number{6, vaultSle->at(sfScale) + 1});
             env(escrow::create(depositor, bob, escrowAmount),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
@@ -6066,7 +6065,7 @@ class Vault_test : public beast::unit_test::Suite
             Vault const vault{env};
 
             // Create an MPT asset for the vault
-            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            MPTTester mptt{env, issuer, kMptInitNoFund};
             mptt.create({.flags = tfMPTCanTransfer | tfMPTCanLock});
             PrettyAsset const asset = mptt.issuanceID();
             mptt.authorize({.account = owner});
@@ -6097,8 +6096,8 @@ class Vault_test : public beast::unit_test::Suite
 
             // Escrow 500 of those shares
             env(escrow::create(depositor, bob, STAmount{shareIssue, 500}),
-                escrow::kCONDITION(escrow::kCB1),
-                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCondition(escrow::kCb1),
+                escrow::kFinishTime(env.now() + 1s),
                 Fee(baseFee * 150),
                 Ter(tesSUCCESS));
             env.close();
diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp
index 07e840a08f..6266d5870d 100644
--- a/src/test/app/XChain_test.cpp
+++ b/src/test/app/XChain_test.cpp
@@ -231,7 +231,7 @@ struct XEnv : public jtx::XChainBridgeObjects, public SEnv<T>
                 this->fund(xrpFunds, s.account);
 
             // Signer's list must match the attestation signers
-            // env_(jtx::signers(Account::kMASTER, quorum, signers));
+            // env_(jtx::signers(Account::kMaster, quorum, signers));
         }
         this->close();
     }
@@ -500,7 +500,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         // disabled.
         {
             Env env(*this, testableAmendments() - featureXChainBridge);
-            env(createBridge(Account::kMASTER, jvb), Ter(temDISABLED));
+            env(createBridge(Account::kMaster, jvb), Ter(temDISABLED));
         }
 
         // coverage test: BridgeCreate::preclaim() returns tecNO_ISSUER.
@@ -772,7 +772,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 "Issuing chain is XRP and issuing chain door account is "
                 "the root account ",
                 [&](auto& env, bool) {
-                    b = Account::kMASTER;
+                    b = Account::kMaster;
                     ib = xrpIssue();
                 })};
 
@@ -974,8 +974,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -987,11 +987,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
 
             scEnv
@@ -1020,8 +1020,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -1033,15 +1033,15 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             // Now modify the reward on the bridge
             mcEnv.tx(bridgeModify(mcDoor, jvb, XRP(2), XRP(10))).close();
-            scEnv.tx(bridgeModify(Account::kMASTER, jvb, XRP(2), XRP(10))).close();
+            scEnv.tx(bridgeModify(Account::kMaster, jvb, XRP(2), XRP(10))).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
 
             scEnv
@@ -1073,8 +1073,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -1086,15 +1086,15 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             // change signers - claim should not be processed is the batch
             // is signed by original signers
-            scEnv.tx(jtx::signers(Account::kMASTER, quorum, alt_signers)).close();
+            scEnv.tx(jtx::signers(Account::kMaster, quorum, alt_signers)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
 
             // submit claim using outdated signers - should fail
@@ -1191,7 +1191,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         // normal bridge create for sanity check with the exact necessary
         // account balance
         XEnv(*this, true)
-            .tx(createBridge(Account::kMASTER, jvb))
+            .tx(createBridge(Account::kMaster, jvb))
             .fund(res1, scuAlice)  // acct reserve + 1 object
             .close()
             .tx(xchainCreateClaimId(scuAlice, jvb, reward, mcAlice))
@@ -1203,7 +1203,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             test::Balance const scAliceBal(xenv, scAlice);
 
-            xenv.tx(createBridge(Account::kMASTER, jvb))
+            xenv.tx(createBridge(Account::kMaster, jvb))
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
@@ -1219,7 +1219,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
         // Creating the new object would put the account below the reserve
         XEnv(*this, true)
-            .tx(createBridge(Account::kMASTER, jvb))
+            .tx(createBridge(Account::kMaster, jvb))
             .fund(res1 - xrp_dust, scuAlice)  // barely not enough
             .close()
             .tx(xchainCreateClaimId(scuAlice, jvb, reward, mcAlice), Ter(tecINSUFFICIENT_RESERVE))
@@ -1229,7 +1229,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         // by giving the reward amount for the other side, as well as a
         // completely non-matching reward)
         XEnv(*this, true)
-            .tx(createBridge(Account::kMASTER, jvb))
+            .tx(createBridge(Account::kMaster, jvb))
             .close()
             .tx(xchainCreateClaimId(scAlice, jvb, split_reward_quorum, mcAlice),
                 Ter(tecXCHAIN_REWARD_MISMATCH))
@@ -1237,7 +1237,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
         // A reward amount that isn't XRP
         XEnv(*this, true)
-            .tx(createBridge(Account::kMASTER, jvb))
+            .tx(createBridge(Account::kMaster, jvb))
             .close()
             .tx(xchainCreateClaimId(scAlice, jvb, mcUSD(1), mcAlice),
                 Ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT))
@@ -1246,7 +1246,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         // coverage test: xchain_create_claim_id transaction with incorrect
         // flag
         XEnv(*this, true)
-            .tx(createBridge(Account::kMASTER, jvb))
+            .tx(createBridge(Account::kMaster, jvb))
             .close()
             .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice),
                 Txflags(tfFillOrKill),
@@ -1256,7 +1256,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         // coverage test: xchain_create_claim_id transaction with xchain
         // feature disabled
         XEnv(*this, true)
-            .tx(createBridge(Account::kMASTER, jvb))
+            .tx(createBridge(Account::kMaster, jvb))
             .disableFeature(featureXChainBridge)
             .close()
             .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice), Ter(temDISABLED))
@@ -1417,8 +1417,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -1429,7 +1429,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             auto const amt = XRP(1000);
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMaster, scBob, scAlice, payees, withClaim);
 
             scEnv
                 .multiTx(claimAttestations(
@@ -1442,7 +1442,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                     claimID,
                     dst,
                     signers,
-                    kUT_XCHAIN_DEFAULT_QUORUM))
+                    kUtXchainDefaultQuorum))
                 .close();
             scEnv
                 .tx(claimAttestation(
@@ -1450,11 +1450,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                     jvb,
                     mcAlice,
                     amt,
-                    payees[kUT_XCHAIN_DEFAULT_QUORUM],
+                    payees[kUtXchainDefaultQuorum],
                     true,
                     claimID,
                     dst,
-                    signers[kUT_XCHAIN_DEFAULT_QUORUM]))
+                    signers[kUtXchainDefaultQuorum]))
                 .close();
 
             if (withClaim)
@@ -1483,12 +1483,12 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             std::uint32_t const quorum7 = 7;
             std::vector<Signer> const signers = [] {
-                constexpr int kNUM_SIGNERS = 4;
+                static constexpr int kNumSigners = 4;
                 std::uint32_t const weights[] = {1, 2, 4, 4};
 
                 std::vector<Signer> result;
-                result.reserve(kNUM_SIGNERS);
-                for (int i = 0; i < kNUM_SIGNERS; ++i)
+                result.reserve(kNumSigners);
+                for (int i = 0; i < kNumSigners; ++i)
                 {
                     using namespace std::literals;
                     auto const a = Account("signer_"s + std::to_string(i));
@@ -1499,8 +1499,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum7, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum7, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -1513,7 +1513,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::kMASTER, scBob, scAlice, &payees[0], 3, withClaim);
+                scEnv, Account::kMaster, scBob, scAlice, &payees[0], 3, withClaim);
 
             scEnv
                 .multiTx(claimAttestations(
@@ -1541,12 +1541,12 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             std::uint32_t const quorum7 = 7;
             std::vector<Signer> const signers = [] {
-                constexpr int kNUM_SIGNERS = 4;
+                static constexpr int kNumSigners = 4;
                 std::uint32_t const weights[] = {1, 2, 4, 4};
 
                 std::vector<Signer> result;
-                result.reserve(kNUM_SIGNERS);
-                for (int i = 0; i < kNUM_SIGNERS; ++i)
+                result.reserve(kNumSigners);
+                for (int i = 0; i < kNumSigners; ++i)
                 {
                     using namespace std::literals;
                     auto const a = Account("signer_"s + std::to_string(i));
@@ -1558,8 +1558,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum7, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum7, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -1572,7 +1572,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::kMASTER, scBob, scAlice, &payees[2], 2, withClaim);
+                scEnv, Account::kMaster, scBob, scAlice, &payees[2], 2, withClaim);
 
             scEnv
                 .multiTx(claimAttestations(
@@ -1600,12 +1600,12 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             std::uint32_t const quorum7 = 7;
             std::vector<Signer> const signers = [] {
-                constexpr int kNUM_SIGNERS = 4;
+                static constexpr int kNumSigners = 4;
                 std::uint32_t const weights[] = {1, 2, 4, 4};
 
                 std::vector<Signer> result;
-                result.reserve(kNUM_SIGNERS);
-                for (int i = 0; i < kNUM_SIGNERS; ++i)
+                result.reserve(kNumSigners);
+                for (int i = 0; i < kNumSigners; ++i)
                 {
                     using namespace std::literals;
                     auto const a = Account("signer_"s + std::to_string(i));
@@ -1616,8 +1616,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum7, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum7, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -1630,7 +1630,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::kMASTER, scBob, scAlice, &payees[0], 2, withClaim);
+                scEnv, Account::kMaster, scBob, scAlice, &payees[0], 2, withClaim);
 
             scEnv
                 .multiTx(claimAttestations(
@@ -1659,12 +1659,12 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             std::uint32_t const quorum7 = 7;
             std::vector<Signer> const signers = [] {
-                constexpr int kNUM_SIGNERS = 4;
+                static constexpr int kNumSigners = 4;
                 std::uint32_t const weights[] = {1, 2, 4, 4};
 
                 std::vector<Signer> result;
-                result.reserve(kNUM_SIGNERS);
-                for (int i = 0; i < kNUM_SIGNERS; ++i)
+                result.reserve(kNumSigners);
+                for (int i = 0; i < kNumSigners; ++i)
                 {
                     using namespace std::literals;
                     auto const a = Account("signer_"s + std::to_string(i));
@@ -1675,8 +1675,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum7, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum7, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -1690,7 +1690,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::kMASTER, scBob, scAlice, &payees[1], 2, withClaim);
+                scEnv, Account::kMaster, scBob, scAlice, &payees[1], 2, withClaim);
 
             scEnv
                 .multiTx(claimAttestations(
@@ -1738,15 +1738,15 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 BEAST_EXPECT(carol.diff() == -(amt + reward + fee));
             }
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb, reward, XRP(20)))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close();
 
             {
                 // send first batch of account create attest for all 3
                 // account create
                 test::Balance const attester(scEnv, scAttester);
-                test::Balance const door(scEnv, Account::kMASTER);
+                test::Balance const door(scEnv, Account::kMaster);
 
                 scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 2))
                     .multiTx(attCreateAcctVec(3, amt, scuCarol, 2))
@@ -1767,7 +1767,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 // complete attestations for 2nd account create => should
                 // not complete
                 test::Balance const attester(scEnv, scAttester);
-                test::Balance const door(scEnv, Account::kMASTER);
+                test::Balance const door(scEnv, Account::kMaster);
 
                 scEnv.multiTx(attCreateAcctVec(2, amt, scuBob, 3, 2)).close();
 
@@ -1783,7 +1783,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 // complete attestations for 3rd account create => should
                 // not complete
                 test::Balance const attester(scEnv, scAttester);
-                test::Balance const door(scEnv, Account::kMASTER);
+                test::Balance const door(scEnv, Account::kMaster);
 
                 scEnv.multiTx(attCreateAcctVec(3, amt, scuCarol, 3, 2)).close();
 
@@ -1799,7 +1799,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 // complete attestations for 1st account create => account
                 // should be created
                 test::Balance const attester(scEnv, scAttester);
-                test::Balance const door(scEnv, Account::kMASTER);
+                test::Balance const door(scEnv, Account::kMaster);
 
                 scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 3, 1)).close();
 
@@ -1818,7 +1818,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 // resend attestations for 3rd account create => still
                 // should not complete
                 test::Balance const attester(scEnv, scAttester);
-                test::Balance const door(scEnv, Account::kMASTER);
+                test::Balance const door(scEnv, Account::kMaster);
 
                 scEnv.multiTx(attCreateAcctVec(3, amt, scuCarol, 3, 2)).close();
 
@@ -1835,7 +1835,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 // resend attestations for 2nd account create => account
                 // should be created
                 test::Balance const attester(scEnv, scAttester);
-                test::Balance const door(scEnv, Account::kMASTER);
+                test::Balance const door(scEnv, Account::kMaster);
 
                 scEnv.multiTx(attCreateAcctVec(2, amt, scuBob, 1)).close();
 
@@ -1851,7 +1851,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 // resend attestations for 3rc account create => account
                 // should be created
                 test::Balance const attester(scEnv, scAttester);
-                test::Balance const door(scEnv, Account::kMASTER);
+                test::Balance const door(scEnv, Account::kMaster);
 
                 scEnv.multiTx(attCreateAcctVec(3, amt, scuCarol, 1)).close();
 
@@ -1885,12 +1885,12 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 BEAST_EXPECT(carol.diff() == -(amtPlusReward + fee));
             }
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb, reward, XRP(20)))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close();
 
             test::Balance const attester(scEnv, scAttester);
-            test::Balance const door(scEnv, Account::kMASTER);
+            test::Balance const door(scEnv, Account::kMaster);
 
             scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 2)).close();
             BEAST_EXPECT(!!scEnv.caClaimID(jvb, 1));   // claim id present
@@ -1926,12 +1926,12 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 BEAST_EXPECT(carol.diff() == -(amtPlusReward + fee));
             }
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb, reward, XRP(20)))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close();
 
             test::Balance const attester(scEnv, scAttester);
-            test::Balance const door(scEnv, Account::kMASTER);
+            test::Balance const door(scEnv, Account::kMaster);
             test::Balance const alice(scEnv, scAlice);
 
             scEnv.multiTx(attCreateAcctVec(1, amt, scAlice, 2)).close();
@@ -1968,13 +1968,13 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 BEAST_EXPECT(carol.diff() == -(amtPlusReward + fee));
             }
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb, reward, XRP(20)))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .tx(fset("scAlice", asfDepositAuth))  // set deposit auth
                 .close();
 
             test::Balance const attester(scEnv, scAttester);
-            test::Balance const door(scEnv, Account::kMASTER);
+            test::Balance const door(scEnv, Account::kMaster);
             test::Balance const alice(scEnv, scAlice);
 
             scEnv.multiTx(attCreateAcctVec(1, amt, scAlice, 2)).close();
@@ -2020,13 +2020,13 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             }
 
             std::uint32_t const redQuorum = 2;
-            scEnv.tx(createBridge(Account::kMASTER, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::kMASTER, redQuorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb, reward, XRP(20)))
+                .tx(jtx::signers(Account::kMaster, redQuorum, signers))
                 .close();
 
             {
                 test::Balance const attester(scEnv, scAttester);
-                test::Balance const door(scEnv, Account::kMASTER);
+                test::Balance const door(scEnv, Account::kMaster);
                 auto const badAmt = XRP(10);
                 std::uint32_t txCount = 0;
 
@@ -2105,8 +2105,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         // coverage test: add_attestation transaction with incorrect flag
         {
             XEnv scEnv(*this, true);
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(claimAttestation(
                         scAttester, jvb, mcAlice, XRP(1000), payees[0], true, 1, {}, signers[0]),
@@ -2119,8 +2119,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         // disabled
         {
             XEnv scEnv(*this, true);
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .disableFeature(featureXChainBridge)
                 .close()
                 .tx(claimAttestation(
@@ -2144,8 +2144,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2207,13 +2207,13 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
 
-            for (auto i = 0; i < kUT_XCHAIN_DEFAULT_NUM_SIGNERS - 2; ++i)
+            for (auto i = 0; i < kUtXchainDefaultNumSigners - 2; ++i)
                 scEnv.fund(amt, alt_signers[i].account);
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, alt_signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, alt_signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2241,14 +2241,14 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             {
                 // B3: public key and non-exist (unfunded) account mismatch
                 // G3: public key and non-exist (unfunded) account match
-                auto const unfundedSigner1 = alt_signers[kUT_XCHAIN_DEFAULT_NUM_SIGNERS - 1];
-                auto const unfundedSigner2 = alt_signers[kUT_XCHAIN_DEFAULT_NUM_SIGNERS - 2];
+                auto const unfundedSigner1 = alt_signers[kUtXchainDefaultNumSigners - 1];
+                auto const unfundedSigner2 = alt_signers[kUtXchainDefaultNumSigners - 2];
                 auto att = claimAttestation(
                     scAttester,
                     jvb,
                     mcAlice,
                     amt,
-                    payees[kUT_XCHAIN_DEFAULT_NUM_SIGNERS - 1],
+                    payees[kUtXchainDefaultNumSigners - 1],
                     true,
                     claimID,
                     dst,
@@ -2327,7 +2327,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         BridgeDef xrpB{
             .doorA = doorA,
             .issueA = xrpIssue(),
-            .doorB = Account::kMASTER,
+            .doorB = Account::kMaster,
             .issueB = xrpIssue(),
             .reward = XRP(1),             // reward
             .minAccountCreate = XRP(20),  // minAccountCreate
@@ -2399,8 +2399,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2412,11 +2412,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
 
             scEnv
@@ -2445,8 +2445,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
             scEnv
-                .tx(createBridge(Account::kMASTER, jvb))
-                //.tx(jtx::signers(Account::kMASTER, quorum, signers))
+                .tx(createBridge(Account::kMaster, jvb))
+                //.tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2457,9 +2457,9 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::kMASTER, scBob, scAlice, &payees[0], 1, withClaim);
+                scEnv, Account::kMaster, scBob, scAlice, &payees[0], 1, withClaim);
 
-            jtx::Signer const masterSigner(Account::kMASTER);
+            jtx::Signer const masterSigner(Account::kMaster);
             scEnv
                 .tx(claimAttestation(
                         scAttester, jvb, mcAlice, amt, payees[0], true, claimID, dst, masterSigner),
@@ -2481,9 +2481,9 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
             scEnv
-                .tx(createBridge(Account::kMASTER, jvb))
-                //.tx(jtx::signers(Account::kMASTER, quorum, signers))
-                .tx(jtx::regkey(Account::kMASTER, payees[0]))
+                .tx(createBridge(Account::kMaster, jvb))
+                //.tx(jtx::signers(Account::kMaster, quorum, signers))
+                .tx(jtx::regkey(Account::kMaster, payees[0]))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2494,7 +2494,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::kMASTER, scBob, scAlice, &payees[0], 1, withClaim);
+                scEnv, Account::kMaster, scBob, scAlice, &payees[0], 1, withClaim);
 
             jtx::Signer const masterSigner(payees[0]);
             scEnv
@@ -2515,10 +2515,10 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            auto jvbUnknown = bridge(mcBob, xrpIssue(), Account::kMASTER, xrpIssue());
+            auto jvbUnknown = bridge(mcBob, xrpIssue(), Account::kMaster, xrpIssue());
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvbUnknown, reward, mcAlice), Ter(tecNO_ENTRY))
                 .close();
@@ -2529,7 +2529,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             mcEnv.tx(xchainCommit(mcAlice, jvbUnknown, claimID, amt, dst), Ter(tecNO_ENTRY))
                 .close();
 
-            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMaster, scBob, scAlice, payees, withClaim);
             scEnv
                 .tx(claimAttestation(
                         scAttester,
@@ -2565,8 +2565,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2576,7 +2576,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             std::uint32_t const claimID = 1;
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMaster, scBob, scAlice, payees, withClaim);
 
             // attest using non-existent claim id
             scEnv
@@ -2605,8 +2605,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2618,11 +2618,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
 
             scEnv
@@ -2654,8 +2654,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2665,7 +2665,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             std::uint32_t const claimID = 1;
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMaster, scBob, scAlice, payees, withClaim);
 
             // don't send any attestations
 
@@ -2693,8 +2693,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2704,7 +2704,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             std::uint32_t const claimID = 1;
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMaster, scBob, scAlice, payees, withClaim);
 
             auto tooFew = quorum - 1;
             scEnv
@@ -2734,8 +2734,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2745,7 +2745,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             std::uint32_t const claimID = 1;
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMaster, scBob, scAlice, payees, withClaim);
 
             scEnv
                 .multiTx(
@@ -2776,8 +2776,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2789,11 +2789,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
 
             scEnv
@@ -2822,8 +2822,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -2835,11 +2835,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
 
             scEnv
@@ -2869,8 +2869,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             STAmount const hugeReward{XRP(20000)};
             BEAST_EXPECT(hugeReward > scEnv.balance(scAlice));
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb, hugeReward))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb, hugeReward))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, hugeReward, mcAlice))
                 .close();
@@ -2882,11 +2882,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
 
             if (withClaim)
@@ -2905,7 +2905,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             {
                 auto txns = claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers);
-                for (int i = 0; i < kUT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
+                for (int i = 0; i < kUtXchainDefaultQuorum - 1; ++i)
                 {
                     scEnv.tx(txns[i]).close();
                 }
@@ -2931,8 +2931,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .fund(
                     res0 + reward,
                     scuAlice)  // just not enough because of fees
@@ -2946,7 +2946,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             std::uint32_t const claimID = 1;
             mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scuAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMaster, scBob, scuAlice, payees, withClaim);
 
             scEnv
                 .tx(claimAttestation(
@@ -2975,8 +2975,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .tx(fset("scBob", asfDepositAuth))  // set deposit auth
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
@@ -2989,15 +2989,15 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
             auto txns = claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers);
-            for (int i = 0; i < kUT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
+            for (int i = 0; i < kUtXchainDefaultQuorum - 1; ++i)
             {
                 scEnv.tx(txns[i]).close();
             }
@@ -3045,8 +3045,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .tx(fset("scBob", asfRequireDest))  // set dest tag
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
@@ -3059,15 +3059,15 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
             auto txns = claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers);
-            for (int i = 0; i < kUT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
+            for (int i = 0; i < kUtXchainDefaultQuorum - 1; ++i)
             {
                 scEnv.tx(txns[i]).close();
             }
@@ -3116,8 +3116,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .tx(fset("scBob", asfDepositAuth))  // set deposit auth
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
@@ -3153,8 +3153,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -3166,11 +3166,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
             scEnv.multiTx(claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers));
@@ -3198,8 +3198,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -3211,11 +3211,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
             test::Balance const scAliceBal(scEnv, scAlice);
             scEnv.multiTx(claimAttestations(
@@ -3246,8 +3246,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             mcEnv.tx(createBridge(mcDoor, jvb, tiny_reward)).close();
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb, tiny_reward))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb, tiny_reward))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, tiny_reward, mcAlice))
                 .close();
@@ -3259,11 +3259,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM,
+                kUtXchainDefaultQuorum,
                 withClaim);
             test::Balance const scAliceBal(scEnv, scAlice);
             scEnv.multiTx(claimAttestations(
@@ -3298,8 +3298,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             std::vector<Account> altPayees{payees.begin(), payees.end() - 1};
             altPayees.back() = Account("inexistent");
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -3311,11 +3311,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM - 1,
+                kUtXchainDefaultQuorum - 1,
                 withClaim);
             scEnv.multiTx(claimAttestations(
                 scAttester, jvb, mcAlice, amt, altPayees, true, claimID, dst, signers));
@@ -3340,9 +3340,9 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             XEnv scEnv(*this, true);
 
             mcEnv.tx(createBridge(mcDoor, jvb)).close();
-            auto& unpaid = payees[kUT_XCHAIN_DEFAULT_QUORUM - 1];
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            auto& unpaid = payees[kUtXchainDefaultQuorum - 1];
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .tx(fset(unpaid, asfDepositAuth))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
@@ -3361,11 +3361,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::kMASTER,
+                Account::kMaster,
                 scBob,
                 scAlice,
                 &payees[0],
-                kUT_XCHAIN_DEFAULT_QUORUM - 1,
+                kUtXchainDefaultQuorum - 1,
                 withClaim);
             scEnv.multiTx(claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers));
@@ -3389,7 +3389,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 
         // coverage test: xchain_claim transaction with incorrect flag
         XEnv(*this, true)
-            .tx(createBridge(Account::kMASTER, jvb))
+            .tx(createBridge(Account::kMaster, jvb))
             .close()
             .tx(xchainClaim(scAlice, jvb, 1, XRP(1000), scBob),
                 Txflags(tfFillOrKill),
@@ -3399,7 +3399,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         // coverage test: xchain_claim transaction with xchain feature
         // disabled
         XEnv(*this, true)
-            .tx(createBridge(Account::kMASTER, jvb))
+            .tx(createBridge(Account::kMaster, jvb))
             .disableFeature(featureXChainBridge)
             .close()
             .tx(xchainClaim(scAlice, jvb, 1, XRP(1000), scBob), Ter(temDISABLED))
@@ -3427,21 +3427,21 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             auto const amt = XRP(111);
             auto const amtPlusReward = amt + reward;
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close();
 
-            test::Balance const door(scEnv, Account::kMASTER);
+            test::Balance const door(scEnv, Account::kMaster);
 
             // scEnv.tx(att_create_acct_batch1(1, amt,
-            // Account::kMASTER)).close();
-            scEnv.multiTx(attCreateAcctVec(1, amt, Account::kMASTER, 2)).close();
+            // Account::kMaster)).close();
+            scEnv.multiTx(attCreateAcctVec(1, amt, Account::kMaster, 2)).close();
             BEAST_EXPECT(!!scEnv.caClaimID(jvb, 1));   // claim id present
             BEAST_EXPECT(scEnv.claimCount(jvb) == 0);  // claim count is one less
 
             // scEnv.tx(att_create_acct_batch2(1, amt,
-            // Account::kMASTER)).close();
-            scEnv.multiTx(attCreateAcctVec(1, amt, Account::kMASTER, 2, 2)).close();
+            // Account::kMaster)).close();
+            scEnv.multiTx(attCreateAcctVec(1, amt, Account::kMaster, 2, 2)).close();
             BEAST_EXPECT(!scEnv.caClaimID(jvb, 1));    // claim id deleted
             BEAST_EXPECT(scEnv.claimCount(jvb) == 1);  // claim count was incremented
 
@@ -3639,7 +3639,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
         {
             XEnv scEnv(*this, true);
 
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
                 .close()
                 .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
@@ -3666,8 +3666,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             std::uint32_t const claimID = 1;
             std::optional<Account> const dst{scBob};
             auto const amt = XRP(1000);
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close();
             scEnv.tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice)).close();
             auto jvAtt = claimAttestation(
@@ -3675,11 +3675,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 jvb,
                 mcAlice,
                 amt,
-                payees[kUT_XCHAIN_DEFAULT_QUORUM],
+                payees[kUtXchainDefaultQuorum],
                 true,
                 claimID,
                 dst,
-                signers[kUT_XCHAIN_DEFAULT_QUORUM]);
+                signers[kUtXchainDefaultQuorum]);
             {
                 // Change to an invalid keytype
                 auto k = jvAtt["PublicKey"].asString();
@@ -3696,8 +3696,8 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
             Account const dst{scBob};
             auto const amt = XRP(1000);
             auto const rewardAmt = XRP(1);
-            scEnv.tx(createBridge(Account::kMASTER, jvb))
-                .tx(jtx::signers(Account::kMASTER, quorum, signers))
+            scEnv.tx(createBridge(Account::kMaster, jvb))
+                .tx(jtx::signers(Account::kMaster, quorum, signers))
                 .close();
             auto jvAtt = createAccountAttestation(
                 scAttester,
@@ -3705,11 +3705,11 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
                 mcAlice,
                 amt,
                 rewardAmt,
-                payees[kUT_XCHAIN_DEFAULT_QUORUM],
+                payees[kUtXchainDefaultQuorum],
                 true,
                 createCount,
                 dst,
-                signers[kUT_XCHAIN_DEFAULT_QUORUM]);
+                signers[kUtXchainDefaultQuorum]);
             {
                 // Change to an invalid keytype
                 auto k = jvAtt["PublicKey"].asString();
@@ -3746,7 +3746,7 @@ struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObj
 struct XChainSim_test : public beast::unit_test::Suite, public jtx::XChainBridgeObjects
 {
 private:
-    static constexpr size_t kNUM_SIGNERS = 5;
+    static constexpr size_t kNumSigners = 5;
 
     // --------------------------------------------------
     enum class WithClaim { No, Yes };
@@ -3759,7 +3759,7 @@ private:
         bool a2b;  // direction of transfer
         WithClaim with_claim{WithClaim::No};
         uint32_t claim_id{0};
-        std::array<bool, kNUM_SIGNERS> attested{};
+        std::array<bool, kNumSigners> attested{};
     };
 
     struct AccountCreate
@@ -3770,7 +3770,7 @@ private:
         STAmount reward;
         bool a2b;
         uint32_t claim_id{0};
-        std::array<bool, kNUM_SIGNERS> attested{};
+        std::array<bool, kNumSigners> attested{};
     };
 
     using ENV = XEnv<XChainSim_test>;
@@ -3961,7 +3961,7 @@ private:
         };
 
         using SignerAttns = std::unordered_map<BridgeID, Claims>;
-        using SignersAttns = std::array<SignerAttns, kNUM_SIGNERS>;
+        using SignersAttns = std::array<SignerAttns, kNumSigners>;
 
         ENV& env;
         std::map<jtx::Account, AccountStateTrack> accounts;
@@ -4096,9 +4096,9 @@ private:
 
             // check all signers, but start at a random one
             size_t i = 0;
-            for (i = 0; i < kNUM_SIGNERS; ++i)
+            for (i = 0; i < kNumSigners; ++i)
             {
-                size_t const signerIdx = (rnd + i) % kNUM_SIGNERS;
+                size_t const signerIdx = (rnd + i) % kNumSigners;
 
                 if (!(cr_.attested[signerIdx]))
                 {
@@ -4122,7 +4122,7 @@ private:
                 }
             }
 
-            if (i == kNUM_SIGNERS)
+            if (i == kNumSigners)
                 return;  // did not attest
 
             auto& counters = st.counters[&bridge_];
@@ -4240,7 +4240,7 @@ private:
             auto r = bridge_.reward;
             auto reward = divide(r, STAmount(bridge_.quorum), r.asset());
 
-            for (size_t i = 0; i < kNUM_SIGNERS; ++i)
+            for (size_t i = 0; i < kNumSigners; ++i)
             {
                 if (xfer_.attested[i])
                     st.receive(bridge_.signers[i].account, reward);
@@ -4254,9 +4254,9 @@ private:
             ChainStateTrack& st = destState();
 
             // check all signers, but start at a random one
-            for (size_t i = 0; i < kNUM_SIGNERS; ++i)
+            for (size_t i = 0; i < kNumSigners; ++i)
             {
-                size_t const signerIdx = (rnd + i) % kNUM_SIGNERS;
+                size_t const signerIdx = (rnd + i) % kNumSigners;
                 if (!(xfer_.attested[signerIdx]))
                 {
                     // enqueue one attestation for this signer
@@ -4431,12 +4431,12 @@ public:
         Account doorXRPLocking("doorXRPLocking"), doorUSDLocking("doorUSDLocking"),
             doorUSDIssuing("doorUSDIssuing");
 
-        constexpr size_t kNUM_ACCT = 10;
+        static constexpr size_t kNumAcct = 10;
         auto a = [&doorXRPLocking, &doorUSDLocking, &doorUSDIssuing]() {
             using namespace std::literals;
             std::vector<Account> result;
-            result.reserve(kNUM_ACCT);
-            for (int i = 0; i < kNUM_ACCT; ++i)
+            result.reserve(kNumAcct);
+            for (int i = 0; i < kNumAcct; ++i)
             {
                 result.emplace_back(
                     "a"s + std::to_string(i), (i % 2) ? KeyType::Ed25519 : KeyType::Secp256k1);
@@ -4470,7 +4470,7 @@ public:
         for (int i = 0; i < a.size(); ++i)
         {
             auto& acct{a[i]};
-            if (i < kNUM_ACCT)
+            if (i < kNumAcct)
             {
                 mcEnv.tx(trust(acct, usdLocking(100000)));
                 scEnv.tx(trust(acct, usdIssuing(100000)));
@@ -4480,15 +4480,15 @@ public:
         for (auto& s : signers)
             st->init(s.account);
 
-        st->b.init(Account::kMASTER);
+        st->b.init(Account::kMaster);
 
         // also create some unfunded accounts
-        constexpr size_t kNUM_UA = 20;
+        static constexpr size_t kNumUa = 20;
         auto ua = []() {
             using namespace std::literals;
             std::vector<Account> result;
-            result.reserve(kNUM_UA);
-            for (int i = 0; i < kNUM_UA; ++i)
+            result.reserve(kNumUa);
+            for (int i = 0; i < kNumUa; ++i)
             {
                 result.emplace_back(
                     "ua"s + std::to_string(i), (i % 2) ? KeyType::Ed25519 : KeyType::Secp256k1);
@@ -4508,7 +4508,7 @@ public:
         BridgeDef xrpB{
             .doorA = doorXRPLocking,
             .issueA = xrpIssue(),
-            .doorB = Account::kMASTER,
+            .doorB = Account::kMaster,
             .issueB = xrpIssue(),
             .reward = XRP(1),
             .minAccountCreate = XRP(20),
diff --git a/src/test/basics/FileUtilities_test.cpp b/src/test/basics/FileUtilities_test.cpp
index 959d3ca695..0e050b5168 100644
--- a/src/test/basics/FileUtilities_test.cpp
+++ b/src/test/basics/FileUtilities_test.cpp
@@ -18,7 +18,8 @@ public:
         using namespace xrpl::detail;
         using namespace boost::system;
 
-        constexpr char const* kEXPECTED_CONTENTS = "This file is very short. That's all we need.";
+        static constexpr char const* kExpectedContents =
+            "This file is very short. That's all we need.";
 
         FileDirGuard const file(
             *this, "test_file", "test.txt", "This is temporary text that should get overwritten");
@@ -26,21 +27,21 @@ public:
         error_code ec;
         auto const path = file.file();
 
-        writeFileContents(ec, path, kEXPECTED_CONTENTS);
+        writeFileContents(ec, path, kExpectedContents);
         BEAST_EXPECT(!ec);
 
         {
             // Test with no max
             auto const good = getFileContents(ec, path);
             BEAST_EXPECT(!ec);
-            BEAST_EXPECT(good == kEXPECTED_CONTENTS);
+            BEAST_EXPECT(good == kExpectedContents);
         }
 
         {
             // Test with large max
             auto const good = getFileContents(ec, path, kilobytes(1));
             BEAST_EXPECT(!ec);
-            BEAST_EXPECT(good == kEXPECTED_CONTENTS);
+            BEAST_EXPECT(good == kExpectedContents);
         }
 
         {
diff --git a/src/test/basics/IOUAmount_test.cpp b/src/test/basics/IOUAmount_test.cpp
index f789e2dfe1..ef053449a5 100644
--- a/src/test/basics/IOUAmount_test.cpp
+++ b/src/test/basics/IOUAmount_test.cpp
@@ -23,18 +23,18 @@ public:
         BEAST_EXPECT(z.exponent() == -100);
         BEAST_EXPECT(!z);
         BEAST_EXPECT(z.signum() == 0);
-        BEAST_EXPECT(z == beast::kZERO);
+        BEAST_EXPECT(z == beast::kZero);
 
         BEAST_EXPECT((z + z) == z);
         BEAST_EXPECT((z - z) == z);
         BEAST_EXPECT(z == -z);
 
-        IOUAmount const zz(beast::kZERO);
+        IOUAmount const zz(beast::kZero);
         BEAST_EXPECT(z == zz);
 
         // https://github.com/XRPLF/rippled/issues/5170
         IOUAmount const zzz{};
-        BEAST_EXPECT(zzz == beast::kZERO);
+        BEAST_EXPECT(zzz == beast::kZero);
         // BEAST_EXPECT(zzz == zz);
     }
 
@@ -58,32 +58,32 @@ public:
     {
         testcase("beast::Zero Comparisons");
 
-        using beast::kZERO;
+        using beast::kZero;
 
         {
-            IOUAmount const z(kZERO);
-            BEAST_EXPECT(z == kZERO);
-            BEAST_EXPECT(z >= kZERO);
-            BEAST_EXPECT(z <= kZERO);
-            unexpected(z != kZERO);
-            unexpected(z > kZERO);
-            unexpected(z < kZERO);
+            IOUAmount const z(kZero);
+            BEAST_EXPECT(z == kZero);
+            BEAST_EXPECT(z >= kZero);
+            BEAST_EXPECT(z <= kZero);
+            unexpected(z != kZero);
+            unexpected(z > kZero);
+            unexpected(z < kZero);
         }
 
         {
             IOUAmount const neg(-2, 0);
-            BEAST_EXPECT(neg < kZERO);
-            BEAST_EXPECT(neg <= kZERO);
-            BEAST_EXPECT(neg != kZERO);
-            unexpected(neg == kZERO);
+            BEAST_EXPECT(neg < kZero);
+            BEAST_EXPECT(neg <= kZero);
+            BEAST_EXPECT(neg != kZero);
+            unexpected(neg == kZero);
         }
 
         {
             IOUAmount const pos(2, 0);
-            BEAST_EXPECT(pos > kZERO);
-            BEAST_EXPECT(pos >= kZERO);
-            BEAST_EXPECT(pos != kZERO);
-            unexpected(pos == kZERO);
+            BEAST_EXPECT(pos > kZero);
+            BEAST_EXPECT(pos >= kZero);
+            BEAST_EXPECT(pos != kZero);
+            unexpected(pos == kZero);
         }
     }
 
@@ -179,68 +179,68 @@ public:
         testcase("mulRatio");
 
         /* The range for the mantissa when normalized */
-        constexpr std::int64_t kMIN_MANTISSA = 1000000000000000ull;
-        constexpr std::int64_t kMAX_MANTISSA = 9999999999999999ull;
+        static constexpr std::int64_t kMinMantissa = 1000000000000000ull;
+        static constexpr std::int64_t kMaxMantissa = 9999999999999999ull;
         // log(2,maxMantissa) ~ 53.15
         /* The range for the exponent when normalized */
-        constexpr int kMIN_EXPONENT = -96;
-        constexpr int kMAX_EXPONENT = 80;
-        constexpr auto kMAX_UINT = std::numeric_limits<std::uint32_t>::max();
+        static constexpr int kMinExponent = -96;
+        static constexpr int kMaxExponent = 80;
+        constexpr auto kMaxUInt = std::numeric_limits<std::uint32_t>::max();
 
         {
             // multiply by a number that would overflow the mantissa, then
             // divide by the same number, and check we didn't lose any value
-            IOUAmount const bigMan(kMAX_MANTISSA, 0);
-            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMAX_UINT, kMAX_UINT, true));
+            IOUAmount const bigMan(kMaxMantissa, 0);
+            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMaxUInt, kMaxUInt, true));
             // rounding mode shouldn't matter as the result is exact
-            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMAX_UINT, kMAX_UINT, false));
+            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMaxUInt, kMaxUInt, false));
         }
         {
             // Similar test as above, but for negative values
-            IOUAmount const bigMan(-kMAX_MANTISSA, 0);
-            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMAX_UINT, kMAX_UINT, true));
+            IOUAmount const bigMan(-kMaxMantissa, 0);
+            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMaxUInt, kMaxUInt, true));
             // rounding mode shouldn't matter as the result is exact
-            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMAX_UINT, kMAX_UINT, false));
+            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMaxUInt, kMaxUInt, false));
         }
 
         {
             // small amounts
-            IOUAmount const tiny(kMIN_MANTISSA, kMIN_EXPONENT);
+            IOUAmount const tiny(kMinMantissa, kMinExponent);
             // Round up should give the smallest allowable number
-            BEAST_EXPECT(tiny == mulRatio(tiny, 1, kMAX_UINT, true));
-            BEAST_EXPECT(tiny == mulRatio(tiny, kMAX_UINT - 1, kMAX_UINT, true));
+            BEAST_EXPECT(tiny == mulRatio(tiny, 1, kMaxUInt, true));
+            BEAST_EXPECT(tiny == mulRatio(tiny, kMaxUInt - 1, kMaxUInt, true));
             // rounding down should be zero
-            BEAST_EXPECT(beast::kZERO == mulRatio(tiny, 1, kMAX_UINT, false));
-            BEAST_EXPECT(beast::kZERO == mulRatio(tiny, kMAX_UINT - 1, kMAX_UINT, false));
+            BEAST_EXPECT(beast::kZero == mulRatio(tiny, 1, kMaxUInt, false));
+            BEAST_EXPECT(beast::kZero == mulRatio(tiny, kMaxUInt - 1, kMaxUInt, false));
 
             // tiny negative numbers
-            IOUAmount const tinyNeg(-kMIN_MANTISSA, kMIN_EXPONENT);
+            IOUAmount const tinyNeg(-kMinMantissa, kMinExponent);
             // Round up should give zero
-            BEAST_EXPECT(beast::kZERO == mulRatio(tinyNeg, 1, kMAX_UINT, true));
-            BEAST_EXPECT(beast::kZERO == mulRatio(tinyNeg, kMAX_UINT - 1, kMAX_UINT, true));
+            BEAST_EXPECT(beast::kZero == mulRatio(tinyNeg, 1, kMaxUInt, true));
+            BEAST_EXPECT(beast::kZero == mulRatio(tinyNeg, kMaxUInt - 1, kMaxUInt, true));
             // rounding down should be tiny
-            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, 1, kMAX_UINT, false));
-            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, kMAX_UINT - 1, kMAX_UINT, false));
+            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, 1, kMaxUInt, false));
+            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, kMaxUInt - 1, kMaxUInt, false));
         }
 
         {  // rounding
             {
                 IOUAmount const one(1, 0);
-                auto const rup = mulRatio(one, kMAX_UINT - 1, kMAX_UINT, true);
-                auto const rdown = mulRatio(one, kMAX_UINT - 1, kMAX_UINT, false);
+                auto const rup = mulRatio(one, kMaxUInt - 1, kMaxUInt, true);
+                auto const rdown = mulRatio(one, kMaxUInt - 1, kMaxUInt, false);
                 BEAST_EXPECT(rup.mantissa() - rdown.mantissa() == 1);
             }
             {
-                IOUAmount const big(kMAX_MANTISSA, kMAX_EXPONENT);
-                auto const rup = mulRatio(big, kMAX_UINT - 1, kMAX_UINT, true);
-                auto const rdown = mulRatio(big, kMAX_UINT - 1, kMAX_UINT, false);
+                IOUAmount const big(kMaxMantissa, kMaxExponent);
+                auto const rup = mulRatio(big, kMaxUInt - 1, kMaxUInt, true);
+                auto const rdown = mulRatio(big, kMaxUInt - 1, kMaxUInt, false);
                 BEAST_EXPECT(rup.mantissa() - rdown.mantissa() == 1);
             }
 
             {
                 IOUAmount const negOne(-1, 0);
-                auto const rup = mulRatio(negOne, kMAX_UINT - 1, kMAX_UINT, true);
-                auto const rdown = mulRatio(negOne, kMAX_UINT - 1, kMAX_UINT, false);
+                auto const rup = mulRatio(negOne, kMaxUInt - 1, kMaxUInt, true);
+                auto const rdown = mulRatio(negOne, kMaxUInt - 1, kMaxUInt, false);
                 BEAST_EXPECT(rup.mantissa() - rdown.mantissa() == 1);
             }
         }
@@ -253,7 +253,7 @@ public:
 
         {
             // overflow
-            IOUAmount big(kMAX_MANTISSA, kMAX_EXPONENT);
+            IOUAmount big(kMaxMantissa, kMaxExponent);
             except([&] { mulRatio(big, 2, 0, true); });
         }
     }  // namespace xrpl
diff --git a/src/test/basics/IntrusiveShared_test.cpp b/src/test/basics/IntrusiveShared_test.cpp
index 50d3fab7a2..185b877f23 100644
--- a/src/test/basics/IntrusiveShared_test.cpp
+++ b/src/test/basics/IntrusiveShared_test.cpp
@@ -87,8 +87,8 @@ enum class TrackedState : std::uint8_t {
 class TIBase : public IntrusiveRefCounts
 {
 public:
-    static constexpr std::size_t kMAX_STATES = 128;
-    static std::array<std::atomic<TrackedState>, kMAX_STATES> state;
+    static constexpr std::size_t kMaxStates = 128;
+    static std::array<std::atomic<TrackedState>, kMaxStates> state;
     static std::atomic<int> nextId;
     static TrackedState
     getState(int id)
@@ -99,7 +99,7 @@ public:
     static void
     resetStates(bool resetCallback)
     {
-        for (int i = 0; i < kMAX_STATES; ++i)
+        for (int i = 0; i < kMaxStates; ++i)
         {
             state[i].store(TrackedState::Uninitialized, std::memory_order_release);
         }
@@ -179,7 +179,7 @@ private:
     }
 };
 
-std::array<std::atomic<TrackedState>, TIBase::kMAX_STATES> TIBase::state;
+std::array<std::atomic<TrackedState>, TIBase::kMaxStates> TIBase::state;
 std::atomic<int> TIBase::nextId{0};
 
 std::function<void(TrackedState, std::optional<TrackedState>)> TIBase::tracingCallback =
@@ -539,17 +539,17 @@ public:
             }
             return result;
         };
-        constexpr int kLOOP_ITERS = 2 * 1024;
-        constexpr int kNUM_THREADS = 16;
+        static constexpr int kLoopIters = 2 * 1024;
+        static constexpr int kNumThreads = 16;
         std::vector<SharedIntrusive<TIBase>> toClone;
-        Barrier loopStartSyncPoint{kNUM_THREADS};
-        Barrier postCreateToCloneSyncPoint{kNUM_THREADS};
-        Barrier postCreateVecOfPointersSyncPoint{kNUM_THREADS};
+        Barrier loopStartSyncPoint{kNumThreads};
+        Barrier postCreateToCloneSyncPoint{kNumThreads};
+        Barrier postCreateVecOfPointersSyncPoint{kNumThreads};
         auto engines = [&]() -> std::vector<std::default_random_engine> {
             std::random_device rd;
             std::vector<std::default_random_engine> result;
-            result.reserve(kNUM_THREADS);
-            for (int i = 0; i < kNUM_THREADS; ++i)
+            result.reserve(kNumThreads);
+            for (int i = 0; i < kNumThreads; ++i)
                 result.emplace_back(rd());
             return result;
         }();
@@ -558,7 +558,7 @@ public:
         // strong and weak pointers and destroys them all at once.
         // threadId==0 is special.
         auto cloneAndDestroy = [&](int threadId) {
-            for (int i = 0; i < kLOOP_ITERS; ++i)
+            for (int i = 0; i < kLoopIters; ++i)
             {
                 // ------ Sync Point ------
                 loopStartSyncPoint.arriveAndWait();
@@ -578,7 +578,7 @@ public:
                     destructionState.store(0, std::memory_order_release);
 
                     toClone.clear();
-                    toClone.resize(kNUM_THREADS);
+                    toClone.resize(kNumThreads);
                     auto strong = makeSharedIntrusive<TIBase>();
                     strong->tracingCallback = tracingCallback;
                     std::ranges::fill(toClone, strong);
@@ -597,12 +597,12 @@ public:
             }
         };
         std::vector<std::thread> threads;
-        threads.reserve(kNUM_THREADS);
-        for (int i = 0; i < kNUM_THREADS; ++i)
+        threads.reserve(kNumThreads);
+        for (int i = 0; i < kNumThreads; ++i)
         {
             threads.emplace_back(cloneAndDestroy, i);
         }
-        for (int i = 0; i < kNUM_THREADS; ++i)
+        for (int i = 0; i < kNumThreads; ++i)
         {
             threads[i].join();
         }
@@ -664,19 +664,19 @@ public:
                 result.emplace_back(SharedIntrusive<TIBase>(toClone));
             return result;
         };
-        constexpr int kLOOP_ITERS = 2 * 1024;
-        constexpr int kFLIP_POINTERS_LOOP_ITERS = 256;
-        constexpr int kNUM_THREADS = 16;
+        static constexpr int kLoopIters = 2 * 1024;
+        static constexpr int kFlipPointersLoopIters = 256;
+        static constexpr int kNumThreads = 16;
         std::vector<SharedIntrusive<TIBase>> toClone;
-        Barrier loopStartSyncPoint{kNUM_THREADS};
-        Barrier postCreateToCloneSyncPoint{kNUM_THREADS};
-        Barrier postCreateVecOfPointersSyncPoint{kNUM_THREADS};
-        Barrier postFlipPointersLoopSyncPoint{kNUM_THREADS};
+        Barrier loopStartSyncPoint{kNumThreads};
+        Barrier postCreateToCloneSyncPoint{kNumThreads};
+        Barrier postCreateVecOfPointersSyncPoint{kNumThreads};
+        Barrier postFlipPointersLoopSyncPoint{kNumThreads};
         auto engines = [&]() -> std::vector<std::default_random_engine> {
             std::random_device rd;
             std::vector<std::default_random_engine> result;
-            result.reserve(kNUM_THREADS);
-            for (int i = 0; i < kNUM_THREADS; ++i)
+            result.reserve(kNumThreads);
+            for (int i = 0; i < kNumThreads; ++i)
                 result.emplace_back(rd());
             return result;
         }();
@@ -686,7 +686,7 @@ public:
         // changes strong pointers to weak pointers,  and destroys them
         // all at once.
         auto cloneAndDestroy = [&](int threadId) {
-            for (int i = 0; i < kLOOP_ITERS; ++i)
+            for (int i = 0; i < kLoopIters; ++i)
             {
                 // ------ Sync Point ------
                 loopStartSyncPoint.arriveAndWait();
@@ -705,7 +705,7 @@ public:
                     destructionState.store(0, std::memory_order_release);
 
                     toClone.clear();
-                    toClone.resize(kNUM_THREADS);
+                    toClone.resize(kNumThreads);
                     auto strong = makeSharedIntrusive<TIBase>();
                     strong->tracingCallback = tracingCallback;
                     std::ranges::fill(toClone, strong);
@@ -721,7 +721,7 @@ public:
                 postCreateVecOfPointersSyncPoint.arriveAndWait();
 
                 std::uniform_int_distribution<> isStrongDist(0, 1);
-                for (int f = 0; f < kFLIP_POINTERS_LOOP_ITERS; ++f)
+                for (int f = 0; f < kFlipPointersLoopIters; ++f)
                 {
                     for (auto& p : v)
                     {
@@ -743,12 +743,12 @@ public:
             }
         };
         std::vector<std::thread> threads;
-        threads.reserve(kNUM_THREADS);
-        for (int i = 0; i < kNUM_THREADS; ++i)
+        threads.reserve(kNumThreads);
+        for (int i = 0; i < kNumThreads; ++i)
         {
             threads.emplace_back(cloneAndDestroy, i);
         }
-        for (int i = 0; i < kNUM_THREADS; ++i)
+        for (int i = 0; i < kNumThreads; ++i)
         {
             threads[i].join();
         }
@@ -795,19 +795,19 @@ public:
             }
         };
 
-        constexpr int kLOOP_ITERS = 2 * 1024;
-        constexpr int kLOCK_WEAK_LOOP_ITERS = 256;
-        constexpr int kNUM_THREADS = 16;
+        static constexpr int kLoopIters = 2 * 1024;
+        static constexpr int kLockWeakLoopIters = 256;
+        static constexpr int kNumThreads = 16;
         std::vector<SharedIntrusive<TIBase>> toLock;
-        Barrier loopStartSyncPoint{kNUM_THREADS};
-        Barrier postCreateToLockSyncPoint{kNUM_THREADS};
-        Barrier postLockWeakLoopSyncPoint{kNUM_THREADS};
+        Barrier loopStartSyncPoint{kNumThreads};
+        Barrier postCreateToLockSyncPoint{kNumThreads};
+        Barrier postLockWeakLoopSyncPoint{kNumThreads};
 
         // lockAndDestroy creates weak pointers from the strong pointer
         // and runs a loop that locks the weak pointer. At the end of the loop
         // all the pointers are destroyed all at once.
         auto lockAndDestroy = [&](int threadId) {
-            for (int i = 0; i < kLOOP_ITERS; ++i)
+            for (int i = 0; i < kLoopIters; ++i)
             {
                 // ------ Sync Point ------
                 loopStartSyncPoint.arriveAndWait();
@@ -826,7 +826,7 @@ public:
                     destructionState.store(0, std::memory_order_release);
 
                     toLock.clear();
-                    toLock.resize(kNUM_THREADS);
+                    toLock.resize(kNumThreads);
                     auto strong = makeSharedIntrusive<TIBase>();
                     strong->tracingCallback = tracingCallback;
                     std::ranges::fill(toLock, strong);
@@ -838,7 +838,7 @@ public:
                 // Multiple threads all create a weak pointer from the same
                 // strong pointer
                 WeakIntrusive const weak{toLock[threadId]};
-                for (int wi = 0; wi < kLOCK_WEAK_LOOP_ITERS; ++wi)
+                for (int wi = 0; wi < kLockWeakLoopIters; ++wi)
                 {
                     BEAST_EXPECT(!weak.expired());
                     auto strong = weak.lock();
@@ -852,12 +852,12 @@ public:
             }
         };
         std::vector<std::thread> threads;
-        threads.reserve(kNUM_THREADS);
-        for (int i = 0; i < kNUM_THREADS; ++i)
+        threads.reserve(kNumThreads);
+        for (int i = 0; i < kNumThreads; ++i)
         {
             threads.emplace_back(lockAndDestroy, i);
         }
-        for (int i = 0; i < kNUM_THREADS; ++i)
+        for (int i = 0; i < kNumThreads; ++i)
         {
             threads[i].join();
         }
diff --git a/src/test/basics/Number_test.cpp b/src/test/basics/Number_test.cpp
index 9e06d6de53..2a4e176ae5 100644
--- a/src/test/basics/Number_test.cpp
+++ b/src/test/basics/Number_test.cpp
@@ -178,8 +178,8 @@ public:
                 {Number{true, 9'999'999'999'999'999'999ULL, -37, Number::Normalized{}},
                  Number{1'000'000'000'000'000'000, -18},
                  Number{false, 9'999'999'999'999'999'990ULL, -19, Number::Normalized{}}},
-                {Number{Number::kMAX_REP}, Number{6, -1}, Number{Number::kMAX_REP / 10, 1}},
-                {Number{Number::kMAX_REP - 1}, Number{1, 0}, Number{Number::kMAX_REP}},
+                {Number{Number::kMaxRep}, Number{6, -1}, Number{Number::kMaxRep / 10, 1}},
+                {Number{Number::kMaxRep - 1}, Number{1, 0}, Number{Number::kMaxRep}},
                 // Test extremes
                 {
                     // Each Number operand rounds up, so the actual mantissa is
@@ -286,14 +286,14 @@ public:
                 {Number{1'000'000'000'000'000'001, -18},
                  Number{1'000'000'000'000'000'000, -18},
                  Number{1'000'000'000'000'000'000, -36}},
-                {Number{Number::kMAX_REP}, Number{6, -1}, Number{Number::kMAX_REP - 1}},
-                {Number{false, Number::kMAX_REP + 1, 0, Number::Normalized{}},
+                {Number{Number::kMaxRep}, Number{6, -1}, Number{Number::kMaxRep - 1}},
+                {Number{false, Number::kMaxRep + 1, 0, Number::Normalized{}},
                  Number{1, 0},
-                 Number{(Number::kMAX_REP / 10) + 1, 1}},
-                {Number{false, Number::kMAX_REP + 1, 0, Number::Normalized{}},
+                 Number{(Number::kMaxRep / 10) + 1, 1}},
+                {Number{false, Number::kMaxRep + 1, 0, Number::Normalized{}},
                  Number{3, 0},
-                 Number{Number::kMAX_REP}},
-                {power(2, 63), Number{3, 0}, Number{Number::kMAX_REP}},
+                 Number{Number::kMaxRep}},
+                {power(2, 63), Number{3, 0}, Number{Number::kMaxRep}},
             });
         auto test = [this](auto const& c) {
             for (auto const& [x, y, z] : c)
@@ -402,8 +402,8 @@ public:
                  Number{false, maxMantissa, 0, Number::Normalized{}},
                  Number{1, 38}},
                 // Maximum int64 range
-                {Number{Number::kMAX_REP, 0},
-                 Number{Number::kMAX_REP, 0},
+                {Number{Number::kMaxRep, 0},
+                 Number{Number::kMaxRep, 0},
                  Number{85'070'591'730'234'615'85, 19}},
             });
             tests(cSmall, cLarge);
@@ -469,8 +469,8 @@ public:
                      Number{false, (maxMantissa / 10) - 1, 20, Number::Normalized{}}},
                     // Maximum int64 range
                     // 85'070'591'730'234'615'847'396'907'784'232'501'249
-                    {Number{Number::kMAX_REP, 0},
-                     Number{Number::kMAX_REP, 0},
+                    {Number{Number::kMaxRep, 0},
+                     Number{Number::kMaxRep, 0},
                      Number{85'070'591'730'234'615'84, 19}},
                 });
             tests(cSmall, cLarge);
@@ -536,8 +536,8 @@ public:
                      Number{false, (maxMantissa / 10) - 1, 20, Number::Normalized{}}},
                     // Maximum int64 range
                     // 85'070'591'730'234'615'847'396'907'784'232'501'249
-                    {Number{Number::kMAX_REP, 0},
-                     Number{Number::kMAX_REP, 0},
+                    {Number{Number::kMaxRep, 0},
+                     Number{Number::kMaxRep, 0},
                      Number{85'070'591'730'234'615'84, 19}},
                 });
             tests(cSmall, cLarge);
@@ -603,8 +603,8 @@ public:
                      Number{1, 38}},
                     // Maximum int64 range
                     // 85'070'591'730'234'615'847'396'907'784'232'501'249
-                    {Number{Number::kMAX_REP, 0},
-                     Number{Number::kMAX_REP, 0},
+                    {Number{Number::kMaxRep, 0},
+                     Number{Number::kMaxRep, 0},
                      Number{85'070'591'730'234'615'85, 19}},
                 });
             tests(cSmall, cLarge);
@@ -857,10 +857,10 @@ public:
             {Number{false, Number::maxMantissa() - 9, 0, Number::Normalized{}},
              2,
              Number{false, 3'162'277'660'168'379'330, -9, Number::Normalized{}}},
-            {Number{Number::kMAX_REP},
+            {Number{Number::kMaxRep},
              2,
              Number{false, 3'037'000'499'976049692, -9, Number::Normalized{}}},
-            {Number{Number::kMAX_REP},
+            {Number{Number::kMaxRep},
              4,
              Number{false, 55'108'98747006743627, -14, Number::Normalized{}}},
         });
@@ -918,7 +918,7 @@ public:
             Number{5, -1},
             Number{0},
             Number{5625, -4},
-            Number{Number::kMAX_REP},
+            Number{Number::kMaxRep},
         });
         test(cSmall);
         bool caught = false;
@@ -1511,12 +1511,12 @@ public:
 
         if (scale == MantissaRange::MantissaScale::Small)
         {
-            BEAST_EXPECT(std::numeric_limits<std::int64_t>::max() > kINITIAL_XRP.drops());
-            BEAST_EXPECT(Number::maxMantissa() < kINITIAL_XRP.drops());
-            Number const initalXrp{kINITIAL_XRP};
+            BEAST_EXPECT(std::numeric_limits<std::int64_t>::max() > kInitialXrp.drops());
+            BEAST_EXPECT(Number::maxMantissa() < kInitialXrp.drops());
+            Number const initalXrp{kInitialXrp};
             BEAST_EXPECT(initalXrp.exponent() > 0);
 
-            Number const maxInt64{Number::kMAX_REP};
+            Number const maxInt64{Number::kMaxRep};
             BEAST_EXPECT(maxInt64.exponent() > 0);
             // 85'070'591'730'234'615'865'843'651'857'942'052'864 - 38 digits
             BEAST_EXPECT((power(maxInt64, 2) == Number{85'070'591'730'234'62, 22}));
@@ -1528,12 +1528,12 @@ public:
         }
         else
         {
-            BEAST_EXPECT(std::numeric_limits<std::int64_t>::max() > kINITIAL_XRP.drops());
-            BEAST_EXPECT(Number::maxMantissa() > kINITIAL_XRP.drops());
-            Number const initalXrp{kINITIAL_XRP};
+            BEAST_EXPECT(std::numeric_limits<std::int64_t>::max() > kInitialXrp.drops());
+            BEAST_EXPECT(Number::maxMantissa() > kInitialXrp.drops());
+            Number const initalXrp{kInitialXrp};
             BEAST_EXPECT(initalXrp.exponent() <= 0);
 
-            Number const maxInt64{Number::kMAX_REP};
+            Number const maxInt64{Number::kMaxRep};
             BEAST_EXPECT(maxInt64.exponent() <= 0);
             // 85'070'591'730'234'615'847'396'907'784'232'501'249 - 38 digits
             BEAST_EXPECT((power(maxInt64, 2) == Number{85'070'591'730'234'615'85, 19}));
diff --git a/src/test/basics/Units_test.cpp b/src/test/basics/Units_test.cpp
index 6e04a6e8e0..dc780166c6 100644
--- a/src/test/basics/Units_test.cpp
+++ b/src/test/basics/Units_test.cpp
@@ -166,10 +166,10 @@ private:
             FeeLevel64 test{0};
             BEAST_EXPECT(test.fee() == 0);
 
-            test = explicitmake(beast::kZERO);
+            test = explicitmake(beast::kZero);
             BEAST_EXPECT(test.fee() == 0);
 
-            test = beast::kZERO;
+            test = beast::kZero;
             BEAST_EXPECT(test.fee() == 0);
 
             test = explicitmake(100u);
@@ -251,10 +251,10 @@ private:
             FeeLevelDouble test{0};
             BEAST_EXPECT(test.fee() == 0);
 
-            test = explicitmake(beast::kZERO);
+            test = explicitmake(beast::kZero);
             BEAST_EXPECT(test.fee() == 0);
 
-            test = beast::kZERO;
+            test = beast::kZero;
             BEAST_EXPECT(test.fee() == 0);
 
             test = explicitmake(100.0);
@@ -330,8 +330,8 @@ public:
     void
     run() override
     {
-        BEAST_EXPECT(kINITIAL_XRP.drops() == 100'000'000'000'000'000);
-        BEAST_EXPECT(kINITIAL_XRP == XRPAmount{100'000'000'000'000'000});
+        BEAST_EXPECT(kInitialXrp.drops() == 100'000'000'000'000'000);
+        BEAST_EXPECT(kInitialXrp == XRPAmount{100'000'000'000'000'000});
 
         testTypes();
         testJson();
diff --git a/src/test/basics/XRPAmount_test.cpp b/src/test/basics/XRPAmount_test.cpp
index 4a28ac586e..f393003365 100644
--- a/src/test/basics/XRPAmount_test.cpp
+++ b/src/test/basics/XRPAmount_test.cpp
@@ -39,25 +39,25 @@ public:
     {
         testcase("beast::Zero Comparisons");
 
-        using beast::kZERO;
+        using beast::kZero;
 
         for (auto i : {-1, 0, 1})
         {
             XRPAmount const x(i);
 
-            BEAST_EXPECT((i == 0) == (x == kZERO));
-            BEAST_EXPECT((i != 0) == (x != kZERO));
-            BEAST_EXPECT((i < 0) == (x < kZERO));
-            BEAST_EXPECT((i > 0) == (x > kZERO));
-            BEAST_EXPECT((i <= 0) == (x <= kZERO));
-            BEAST_EXPECT((i >= 0) == (x >= kZERO));
+            BEAST_EXPECT((i == 0) == (x == kZero));
+            BEAST_EXPECT((i != 0) == (x != kZero));
+            BEAST_EXPECT((i < 0) == (x < kZero));
+            BEAST_EXPECT((i > 0) == (x > kZero));
+            BEAST_EXPECT((i <= 0) == (x <= kZero));
+            BEAST_EXPECT((i >= 0) == (x >= kZero));
 
-            BEAST_EXPECT((0 == i) == (kZERO == x));
-            BEAST_EXPECT((0 != i) == (kZERO != x));
-            BEAST_EXPECT((0 < i) == (kZERO < x));
-            BEAST_EXPECT((0 > i) == (kZERO > x));
-            BEAST_EXPECT((0 <= i) == (kZERO <= x));
-            BEAST_EXPECT((0 >= i) == (kZERO >= x));
+            BEAST_EXPECT((0 == i) == (kZero == x));
+            BEAST_EXPECT((0 != i) == (kZero != x));
+            BEAST_EXPECT((0 < i) == (kZero < x));
+            BEAST_EXPECT((0 > i) == (kZero > x));
+            BEAST_EXPECT((0 <= i) == (kZero <= x));
+            BEAST_EXPECT((0 >= i) == (kZero >= x));
         }
     }
 
@@ -109,7 +109,7 @@ public:
     testDecimal()
     {
         // Tautology
-        BEAST_EXPECT(kDROPS_PER_XRP.decimalXRP() == 1);
+        BEAST_EXPECT(kDropsPerXrp.decimalXRP() == 1);
 
         XRPAmount test{1};
         BEAST_EXPECT(test.decimalXRP() == 0.000001);
@@ -136,10 +136,10 @@ public:
         XRPAmount test{0};
         BEAST_EXPECT(test.drops() == 0);
 
-        test = make(beast::kZERO);
+        test = make(beast::kZero);
         BEAST_EXPECT(test.drops() == 0);
 
-        test = beast::kZERO;
+        test = beast::kZero;
         BEAST_EXPECT(test.drops() == 0);
 
         test = make(100);
@@ -212,17 +212,17 @@ public:
     {
         testcase("mulRatio");
 
-        constexpr auto kMAX_UINT32 = std::numeric_limits<std::uint32_t>::max();
-        constexpr auto kMAX_XRP = std::numeric_limits<XRPAmount::value_type>::max();
-        constexpr auto kMIN_XRP = std::numeric_limits<XRPAmount::value_type>::min();
+        constexpr auto kMaxUInt32 = std::numeric_limits<std::uint32_t>::max();
+        constexpr auto kMaxXrp = std::numeric_limits<XRPAmount::value_type>::max();
+        constexpr auto kMinXrp = std::numeric_limits<XRPAmount::value_type>::min();
 
         {
             // multiply by a number that would overflow then divide by the same
             // number, and check we didn't lose any value
-            XRPAmount big(kMAX_XRP);
-            BEAST_EXPECT(big == mulRatio(big, kMAX_UINT32, kMAX_UINT32, true));
+            XRPAmount big(kMaxXrp);
+            BEAST_EXPECT(big == mulRatio(big, kMaxUInt32, kMaxUInt32, true));
             // rounding mode shouldn't matter as the result is exact
-            BEAST_EXPECT(big == mulRatio(big, kMAX_UINT32, kMAX_UINT32, false));
+            BEAST_EXPECT(big == mulRatio(big, kMaxUInt32, kMaxUInt32, false));
 
             // multiply and divide by values that would overflow if done
             // naively, and check that it gives the correct answer
@@ -234,10 +234,10 @@ public:
 
         {
             // Similar test as above, but for negative values
-            XRPAmount big(kMIN_XRP);  // NOLINT TODO
-            BEAST_EXPECT(big == mulRatio(big, kMAX_UINT32, kMAX_UINT32, true));
+            XRPAmount big(kMinXrp);  // NOLINT TODO
+            BEAST_EXPECT(big == mulRatio(big, kMaxUInt32, kMaxUInt32, true));
             // rounding mode shouldn't matter as the result is exact
-            BEAST_EXPECT(big == mulRatio(big, kMAX_UINT32, kMAX_UINT32, false));
+            BEAST_EXPECT(big == mulRatio(big, kMaxUInt32, kMaxUInt32, false));
 
             // multiply and divide by values that would overflow if done
             // naively, and check that it gives the correct answer
@@ -250,39 +250,39 @@ public:
             // small amounts
             XRPAmount const tiny(1);
             // Round up should give the smallest allowable number
-            BEAST_EXPECT(tiny == mulRatio(tiny, 1, kMAX_UINT32, true));
+            BEAST_EXPECT(tiny == mulRatio(tiny, 1, kMaxUInt32, true));
             // rounding down should be zero
-            BEAST_EXPECT(beast::kZERO == mulRatio(tiny, 1, kMAX_UINT32, false));
-            BEAST_EXPECT(beast::kZERO == mulRatio(tiny, kMAX_UINT32 - 1, kMAX_UINT32, false));
+            BEAST_EXPECT(beast::kZero == mulRatio(tiny, 1, kMaxUInt32, false));
+            BEAST_EXPECT(beast::kZero == mulRatio(tiny, kMaxUInt32 - 1, kMaxUInt32, false));
 
             // tiny negative numbers
             XRPAmount const tinyNeg(-1);
             // Round up should give zero
-            BEAST_EXPECT(beast::kZERO == mulRatio(tinyNeg, 1, kMAX_UINT32, true));
-            BEAST_EXPECT(beast::kZERO == mulRatio(tinyNeg, kMAX_UINT32 - 1, kMAX_UINT32, true));
+            BEAST_EXPECT(beast::kZero == mulRatio(tinyNeg, 1, kMaxUInt32, true));
+            BEAST_EXPECT(beast::kZero == mulRatio(tinyNeg, kMaxUInt32 - 1, kMaxUInt32, true));
             // rounding down should be tiny
-            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, kMAX_UINT32 - 1, kMAX_UINT32, false));
+            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, kMaxUInt32 - 1, kMaxUInt32, false));
         }
 
         {  // rounding
             {
                 XRPAmount const one(1);
-                auto const rup = mulRatio(one, kMAX_UINT32 - 1, kMAX_UINT32, true);
-                auto const rdown = mulRatio(one, kMAX_UINT32 - 1, kMAX_UINT32, false);
+                auto const rup = mulRatio(one, kMaxUInt32 - 1, kMaxUInt32, true);
+                auto const rdown = mulRatio(one, kMaxUInt32 - 1, kMaxUInt32, false);
                 BEAST_EXPECT(rup.drops() - rdown.drops() == 1);
             }
 
             {
-                XRPAmount const big(kMAX_XRP);
-                auto const rup = mulRatio(big, kMAX_UINT32 - 1, kMAX_UINT32, true);
-                auto const rdown = mulRatio(big, kMAX_UINT32 - 1, kMAX_UINT32, false);
+                XRPAmount const big(kMaxXrp);
+                auto const rup = mulRatio(big, kMaxUInt32 - 1, kMaxUInt32, true);
+                auto const rdown = mulRatio(big, kMaxUInt32 - 1, kMaxUInt32, false);
                 BEAST_EXPECT(rup.drops() - rdown.drops() == 1);
             }
 
             {
                 XRPAmount const negOne(-1);
-                auto const rup = mulRatio(negOne, kMAX_UINT32 - 1, kMAX_UINT32, true);
-                auto const rdown = mulRatio(negOne, kMAX_UINT32 - 1, kMAX_UINT32, false);
+                auto const rup = mulRatio(negOne, kMaxUInt32 - 1, kMaxUInt32, true);
+                auto const rdown = mulRatio(negOne, kMaxUInt32 - 1, kMaxUInt32, false);
                 BEAST_EXPECT(rup.drops() - rdown.drops() == 1);
             }
         }
@@ -295,14 +295,14 @@ public:
 
         {
             // overflow
-            XRPAmount big(kMAX_XRP);
+            XRPAmount big(kMaxXrp);
             except([&] { mulRatio(big, 2, 1, true); });
         }
 
         {
             // underflow
-            XRPAmount const bigNegative(kMIN_XRP + 10);
-            BEAST_EXPECT(mulRatio(bigNegative, 2, 1, true) == kMIN_XRP);
+            XRPAmount const bigNegative(kMinXrp + 10);
+            BEAST_EXPECT(mulRatio(bigNegative, 2, 1, true) == kMinXrp);
         }
     }  // namespace xrpl
 
diff --git a/src/test/basics/base58_test.cpp b/src/test/basics/base58_test.cpp
index e0a9433f4e..3c76308813 100644
--- a/src/test/basics/base58_test.cpp
+++ b/src/test/basics/base58_test.cpp
@@ -38,12 +38,12 @@ randEngine() -> std::mt19937&
     return kR;
 }
 
-constexpr int kNUM_TOKEN_TYPE_INDEXES = 9;
+constexpr int kNumTokenTypeIndexes = 9;
 
 [[nodiscard]] inline auto
 tokenTypeAndSize(int i) -> std::tuple<xrpl::TokenType, std::size_t>
 {
-    assert(i < kNUM_TOKEN_TYPE_INDEXES);
+    assert(i < kNumTokenTypeIndexes);
 
     switch (i)
     {
@@ -166,11 +166,11 @@ class base58_test : public beast::unit_test::Suite
 
         using namespace boost::multiprecision;
 
-        constexpr std::size_t kITERS = 100000;
+        static constexpr std::size_t kIters = 100000;
         auto eng = randEngine();
         std::uniform_int_distribution<std::uint64_t> dist;
         std::uniform_int_distribution<std::uint64_t> dist1(1);
-        for (int i = 0; i < kITERS; ++i)
+        for (int i = 0; i < kIters; ++i)
         {
             std::uint64_t const d = dist(eng);
             if (d == 0u)
@@ -188,7 +188,7 @@ class base58_test : public beast::unit_test::Suite
             BEAST_EXPECT(refMod.convert_to<std::uint64_t>() == mod);
             BEAST_EXPECT(foundDiv == refDiv);
         }
-        for (int i = 0; i < kITERS; ++i)
+        for (int i = 0; i < kIters; ++i)
         {
             std::uint64_t const d = dist(eng);
             auto bigInt = multiprecision_utils::randomBigInt(/*minSize*/ 2);
@@ -207,7 +207,7 @@ class base58_test : public beast::unit_test::Suite
             auto const foundAdd = multiprecision_utils::toBoostMP(bigInt);
             BEAST_EXPECT(refAdd == foundAdd);
         }
-        for (int i = 0; i < kITERS; ++i)
+        for (int i = 0; i < kIters; ++i)
         {
             std::uint64_t const d = dist1(eng);
             // Force overflow
@@ -224,7 +224,7 @@ class base58_test : public beast::unit_test::Suite
             auto const foundAdd = multiprecision_utils::toBoostMP(bigInt);
             BEAST_EXPECT(refAdd != foundAdd);
         }
-        for (int i = 0; i < kITERS; ++i)
+        for (int i = 0; i < kIters; ++i)
         {
             std::uint64_t const d = dist(eng);
             auto bigInt = multiprecision_utils::randomBigInt(/* minSize */ 2);
@@ -242,7 +242,7 @@ class base58_test : public beast::unit_test::Suite
             auto const foundMul = multiprecision_utils::toBoostMP(bigInt);
             BEAST_EXPECT(refMul == foundMul);
         }
-        for (int i = 0; i < kITERS; ++i)
+        for (int i = 0; i < kIters; ++i)
         {
             std::uint64_t const d = dist1(eng);
             // Force overflow
@@ -403,7 +403,7 @@ class base58_test : public beast::unit_test::Suite
 
         // test every token type with data where every byte is the same and the
         // bytes range from 0-255
-        for (int i = 0; i < kNUM_TOKEN_TYPE_INDEXES; ++i)
+        for (int i = 0; i < kNumTokenTypeIndexes; ++i)
         {
             std::array<std::uint8_t, 128> b256DataBuf{};
             auto const [tokType, tokSize] = tokenTypeAndSize(i);
@@ -415,8 +415,8 @@ class base58_test : public beast::unit_test::Suite
         }
 
         // test with random data
-        constexpr std::size_t kITERS = 100000;
-        for (int i = 0; i < kITERS; ++i)
+        static constexpr std::size_t kIters = 100000;
+        for (int i = 0; i < kIters; ++i)
         {
             std::array<std::uint8_t, 128> b256DataBuf{};
             auto const [tokType, b256Data] = randomB256TestData(b256DataBuf);
diff --git a/src/test/basics/base_uint_test.cpp b/src/test/basics/base_uint_test.cpp
index 603536bbe0..5816b4eb59 100644
--- a/src/test/basics/base_uint_test.cpp
+++ b/src/test/basics/base_uint_test.cpp
@@ -26,24 +26,24 @@ namespace xrpl::test {
 template <std::size_t Bits>
 struct Nonhash
 {
-    static constexpr auto const kENDIAN = boost::endian::order::big;
-    static constexpr std::size_t kWIDTH = Bits / 8;
+    static constexpr auto kEndian = boost::endian::order::big;
+    static constexpr std::size_t kWidth = Bits / 8;
 
-    std::array<std::uint8_t, kWIDTH> data;
+    std::array<std::uint8_t, kWidth> data;
 
     Nonhash() = default;
 
     void
     operator()(void const* key, std::size_t len) noexcept
     {
-        assert(len == kWIDTH);
+        assert(len == kWidth);
         memcpy(data.data(), key, len);
     }
 
     explicit
     operator std::size_t() noexcept
     {
-        return kWIDTH;
+        return kWidth;
     }
 };
 
@@ -57,16 +57,15 @@ struct base_uint_test : beast::unit_test::Suite
     testComparisons()
     {
         {
-            static constexpr std::array<std::pair<std::string_view, std::string_view>, 6>
-                kTEST_ARGS{
-                    {{"0000000000000000", "0000000000000001"},
-                     {"0000000000000000", "ffffffffffffffff"},
-                     {"1234567812345678", "2345678923456789"},
-                     {"8000000000000000", "8000000000000001"},
-                     {"aaaaaaaaaaaaaaa9", "aaaaaaaaaaaaaaaa"},
-                     {"fffffffffffffffe", "ffffffffffffffff"}}};
+            static constexpr std::array<std::pair<std::string_view, std::string_view>, 6> kTestArgs{
+                {{"0000000000000000", "0000000000000001"},
+                 {"0000000000000000", "ffffffffffffffff"},
+                 {"1234567812345678", "2345678923456789"},
+                 {"8000000000000000", "8000000000000001"},
+                 {"aaaaaaaaaaaaaaa9", "aaaaaaaaaaaaaaaa"},
+                 {"fffffffffffffffe", "ffffffffffffffff"}}};
 
-            for (auto const& arg : kTEST_ARGS)
+            for (auto const& arg : kTestArgs)
             {
                 xrpl::BaseUInt<64> const u{arg.first}, v{arg.second};
                 BEAST_EXPECT(u < v);
@@ -87,8 +86,8 @@ struct base_uint_test : beast::unit_test::Suite
         }
 
         {
-            static constexpr std::array<std::pair<std::string_view, std::string_view>, 6>
-                kTEST_ARGS{{
+            static constexpr std::array<std::pair<std::string_view, std::string_view>, 6> kTestArgs{
+                {
                     {"000000000000000000000000", "000000000000000000000001"},
                     {"000000000000000000000000", "ffffffffffffffffffffffff"},
                     {"0123456789ab0123456789ab", "123456789abc123456789abc"},
@@ -97,7 +96,7 @@ struct base_uint_test : beast::unit_test::Suite
                     {"fffffffffffffffffffffffe", "ffffffffffffffffffffffff"},
                 }};
 
-            for (auto const& arg : kTEST_ARGS)
+            for (auto const& arg : kTestArgs)
             {
                 xrpl::BaseUInt<96> const u{arg.first}, v{arg.second};
                 BEAST_EXPECT(u < v);
@@ -132,7 +131,7 @@ struct base_uint_test : beast::unit_test::Suite
         std::unordered_set<test96, HardenedHash<>> uset;
 
         Blob const raw{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
-        BEAST_EXPECT(test96::kBYTES == raw.size());
+        BEAST_EXPECT(test96::kBytes == raw.size());
 
         test96 u = test96::fromRaw(raw);
         uset.insert(u);
@@ -179,7 +178,7 @@ struct base_uint_test : beast::unit_test::Suite
         v = u;
         BEAST_EXPECT(v == u);
 
-        test96 z{beast::kZERO};
+        test96 z{beast::kZero};
         uset.insert(z);
         BEAST_EXPECT(to_string(z) == "000000000000000000000000");
         BEAST_EXPECT(toShortString(z) == "00000000...");
@@ -199,12 +198,12 @@ struct base_uint_test : beast::unit_test::Suite
         n++;
         BEAST_EXPECT(n == test96(1));
         n--;
-        BEAST_EXPECT(n == beast::kZERO);
+        BEAST_EXPECT(n == beast::kZero);
         BEAST_EXPECT(n == z);
         n--;
         BEAST_EXPECT(to_string(n) == "FFFFFFFFFFFFFFFFFFFFFFFF");
         BEAST_EXPECT(toShortString(n) == "FFFFFFFF...");
-        n = beast::kZERO;
+        n = beast::kZero;
         BEAST_EXPECT(n == z);
 
         test96 zp1{z};
@@ -336,7 +335,7 @@ struct base_uint_test : beast::unit_test::Suite
                 {
                 }
             };
-            constexpr StrBaseUInt kTEST_CASES[] = {
+            static constexpr StrBaseUInt kTestCases[] = {
                 "000000000000000000000000",
                 "000000000000000000000001",
                 "fedcba9876543210ABCDEF91",
@@ -344,7 +343,7 @@ struct base_uint_test : beast::unit_test::Suite
                 "800000000000000000000000",
                 "fFfFfFfFfFfFfFfFfFfFfFfF"};
 
-            for (StrBaseUInt const& t : kTEST_CASES)
+            for (StrBaseUInt const& t : kTestCases)
             {
                 test96 t96;
                 BEAST_EXPECT(t96.parseHex(t.str));
diff --git a/src/test/basics/hardened_hash_test.cpp b/src/test/basics/hardened_hash_test.cpp
index a4ecdf7081..885ba9d60b 100644
--- a/src/test/basics/hardened_hash_test.cpp
+++ b/src/test/basics/hardened_hash_test.cpp
@@ -90,22 +90,22 @@ private:
 
     static_assert(Bits >= (8 * sizeof(UInt)), "Bits must be at least 8*sizeof(UInt)");
 
-    static std::size_t const kSIZE = Bits / (8 * sizeof(UInt));
+    static std::size_t const kSize = Bits / (8 * sizeof(UInt));
 
-    std::array<UInt, kSIZE> vec_;
+    std::array<UInt, kSize> vec_;
 
 public:
     using value_type = UInt;
 
-    static std::size_t const kBITS = Bits;
-    static std::size_t const kBYTES = kBITS / 8;
+    static std::size_t const kBits = Bits;
+    static std::size_t const kBytes = kBits / 8;
 
     template <class Int>
     static UnsignedInteger
     fronumber(Int v)
     {
         UnsignedInteger result;
-        for (std::size_t i(1); i < kSIZE; ++i)
+        for (std::size_t i(1); i < kSize; ++i)
             result.vec_[i] = 0;
         result.vec_[0] = v;
         return result;
@@ -134,7 +134,7 @@ public:
     friend std::ostream&
     operator<<(std::ostream& s, UnsignedInteger const& v)
     {
-        for (std::size_t i(0); i < kSIZE; ++i)
+        for (std::size_t i(0); i < kSize; ++i)
             s << std::hex << std::setfill('0') << std::setw(2 * sizeof(UInt)) << v.vec_[i];
         return s;
     }
@@ -143,7 +143,7 @@ public:
 using sha256_t = UnsignedInteger<256, std::size_t>;
 
 #ifndef __INTELLISENSE__
-static_assert(sha256_t::kBITS == 256, "sha256_t must have 256 bits");
+static_assert(sha256_t::kBits == 256, "sha256_t must have 256 bits");
 #endif
 
 }  // namespace xrpl
diff --git a/src/test/basics/join_test.cpp b/src/test/basics/join_test.cpp
index cce8e19a92..1ee81f786a 100644
--- a/src/test/basics/join_test.cpp
+++ b/src/test/basics/join_test.cpp
@@ -58,8 +58,8 @@ struct join_test : beast::unit_test::Suite
             // vector with one item edge case
             using namespace jtx;
             test(
-                CollectionAndDelimiter(std::vector<Account>{Account::kMASTER}, "xxx"),
-                Account::kMASTER.human());
+                CollectionAndDelimiter(std::vector<Account>{Account::kMaster}, "xxx"),
+                Account::kMaster.human());
         }
         // empty vector edge case
         test(CollectionAndDelimiter(std::vector<uint256>{}, ","), "");
diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp
index 0cf5e9794a..b1cd4709b4 100644
--- a/src/test/beast/IPEndpoint_test.cpp
+++ b/src/test/beast/IPEndpoint_test.cpp
@@ -375,14 +375,14 @@ public:
 
         // test with hashed container
         std::unordered_set<Endpoint> eps;
-        constexpr auto kITEMS{100};
+        static constexpr auto kItems{100};
         float maxLf{0};
-        for (auto i = 0; i < kITEMS; ++i)
+        for (auto i = 0; i < kItems; ++i)
         {
             eps.insert(randomEP(xrpl::randInt(0, 1) == 1));
             maxLf = std::max(maxLf, eps.load_factor());
         }
-        BEAST_EXPECT(eps.bucket_count() >= kITEMS);
+        BEAST_EXPECT(eps.bucket_count() >= kItems);
         BEAST_EXPECT(maxLf > 0.90);
     }
 
diff --git a/src/test/beast/beast_CurrentThreadName_test.cpp b/src/test/beast/beast_CurrentThreadName_test.cpp
index 570dcae0ba..1aed0fb426 100644
--- a/src/test/beast/beast_CurrentThreadName_test.cpp
+++ b/src/test/beast/beast_CurrentThreadName_test.cpp
@@ -52,7 +52,7 @@ private:
             beast::setCurrentThreadName(nameToSet);
 
             // Initialize buffer to be safe.
-            char actualName[beast::kMAX_THREAD_NAME_LENGTH + 1] = {};
+            char actualName[beast::kMaxThreadNameLength + 1] = {};
             pthread_getname_np(pthread_self(), actualName, sizeof(actualName));
 
             BEAST_EXPECT(std::string(actualName) == expectedName);
diff --git a/src/test/beast/beast_Zero_test.cpp b/src/test/beast/beast_Zero_test.cpp
index ca5f45ce6b..bb61844caa 100644
--- a/src/test/beast/beast_Zero_test.cpp
+++ b/src/test/beast/beast_Zero_test.cpp
@@ -55,12 +55,12 @@ public:
     void
     testLhsZero(IntegerWrapper x)
     {
-        expectSame(x >= kZERO, x.signum() >= 0, "lhs greater-than-or-equal-to");
-        expectSame(x > kZERO, x.signum() > 0, "lhs greater than");
-        expectSame(x == kZERO, x.signum() == 0, "lhs equal to");
-        expectSame(x != kZERO, x.signum() != 0, "lhs not equal to");
-        expectSame(x < kZERO, x.signum() < 0, "lhs less than");
-        expectSame(x <= kZERO, x.signum() <= 0, "lhs less-than-or-equal-to");
+        expectSame(x >= kZero, x.signum() >= 0, "lhs greater-than-or-equal-to");
+        expectSame(x > kZero, x.signum() > 0, "lhs greater than");
+        expectSame(x == kZero, x.signum() == 0, "lhs equal to");
+        expectSame(x != kZero, x.signum() != 0, "lhs not equal to");
+        expectSame(x < kZero, x.signum() < 0, "lhs less than");
+        expectSame(x <= kZero, x.signum() <= 0, "lhs less-than-or-equal-to");
     }
 
     void
@@ -76,12 +76,12 @@ public:
     void
     testRhsZero(IntegerWrapper x)
     {
-        expectSame(kZERO >= x, 0 >= x.signum(), "rhs greater-than-or-equal-to");
-        expectSame(kZERO > x, 0 > x.signum(), "rhs greater than");
-        expectSame(kZERO == x, 0 == x.signum(), "rhs equal to");
-        expectSame(kZERO != x, 0 != x.signum(), "rhs not equal to");
-        expectSame(kZERO < x, 0 < x.signum(), "rhs less than");
-        expectSame(kZERO <= x, 0 <= x.signum(), "rhs less-than-or-equal-to");
+        expectSame(kZero >= x, 0 >= x.signum(), "rhs greater-than-or-equal-to");
+        expectSame(kZero > x, 0 > x.signum(), "rhs greater than");
+        expectSame(kZero == x, 0 == x.signum(), "rhs equal to");
+        expectSame(kZero != x, 0 != x.signum(), "rhs not equal to");
+        expectSame(kZero < x, 0 < x.signum(), "rhs less than");
+        expectSame(kZero <= x, 0 <= x.signum(), "rhs less-than-or-equal-to");
     }
 
     void
@@ -97,8 +97,8 @@ public:
     void
     testAdl()
     {
-        expect(AdlTester{} == kZERO, "ADL failure!");
-        expect(inner_adl_test::AdlTester2{} == kZERO, "ADL failure!");
+        expect(AdlTester{} == kZero, "ADL failure!");
+        expect(inner_adl_test::AdlTester2{} == kZero, "ADL failure!");
     }
 
     void
diff --git a/src/test/conditions/PreimageSha256_test.cpp b/src/test/conditions/PreimageSha256_test.cpp
index 055ba4b12e..e9c1de30b3 100644
--- a/src/test/conditions/PreimageSha256_test.cpp
+++ b/src/test/conditions/PreimageSha256_test.cpp
@@ -73,7 +73,7 @@ class PreimageSha256_test : public beast::unit_test::Suite
         BEAST_EXPECT(validate(*f2, *c2, makeSlice(known[0].first)));
         BEAST_EXPECT(validate(*f2, *c2, makeSlice(known[0].second)));
 
-        // Shouldn't validate if the kFULFILLMENT & condition don't match
+        // Shouldn't validate if the kFulfillment & condition don't match
         // regardless of the message.
         BEAST_EXPECT(!validate(*f2, *c1));
         BEAST_EXPECT(!validate(*f2, *c1, makeSlice(known[0].first)));
diff --git a/src/test/consensus/Consensus_test.cpp b/src/test/consensus/Consensus_test.cpp
index b284e3dd38..b8fed1d981 100644
--- a/src/test/consensus/Consensus_test.cpp
+++ b/src/test/consensus/Consensus_test.cpp
@@ -637,7 +637,7 @@ public:
         slow.connect(network, round<milliseconds>(1.1 * parms.ledgerGRANULARITY));
 
         // Run to the ledger *prior* to decreasing the resolution
-        sim.run(kINCREASE_LEDGER_TIME_RESOLUTION_EVERY - 2);
+        sim.run(kIncreaseLedgerTimeResolutionEvery - 2);
 
         // In order to create the discrepancy, we want a case where if
         //   X = effCloseTime(closeTime, resolution, parentCloseTime)
diff --git a/src/test/consensus/LedgerTiming_test.cpp b/src/test/consensus/LedgerTiming_test.cpp
index e56785a46a..632361c799 100644
--- a/src/test/consensus/LedgerTiming_test.cpp
+++ b/src/test/consensus/LedgerTiming_test.cpp
@@ -24,7 +24,7 @@ class LedgerTiming_test : public beast::unit_test::Suite
             run(bool previousAgree, std::uint32_t rounds)
             {
                 TestRes res;
-                auto closeResolution = kLEDGER_DEFAULT_TIME_RESOLUTION;
+                auto closeResolution = kLedgerDefaultTimeResolution;
                 auto nextCloseResolution = closeResolution;
                 std::uint32_t round = 0;
                 do
diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp
index b4c98eadef..05dc3f0e2f 100644
--- a/src/test/consensus/NegativeUNL_test.cpp
+++ b/src/test/consensus/NegativeUNL_test.cpp
@@ -237,7 +237,7 @@ class NegativeUNL_test : public beast::unit_test::Suite
         std::vector<PublicKey> publicKeys = createPublicKeys(3);
         // genesis ledger
         auto l = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -570,12 +570,12 @@ struct NetworkHistory
     bool
     createLedgerHistory()
     {
-        static uint256 kFAKE_AMENDMENT;  // So we have different genesis ledgers
+        static uint256 kFakeAmendment;  // So we have different genesis ledgers
         auto l = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
-            std::vector<uint256>{kFAKE_AMENDMENT++},
+            std::vector<uint256>{kFakeAmendment++},
             env.app().getNodeFamily());
         history.push_back(l);
 
@@ -630,16 +630,16 @@ struct NetworkHistory
     std::shared_ptr<STValidation>
     createSTVal(std::shared_ptr<Ledger const> const& ledger, NodeID const& v)
     {
-        static auto kEY_PAIR = randomKeyPair(KeyType::Secp256k1);
+        static auto kEyPair = randomKeyPair(KeyType::Secp256k1);
         return std::make_shared<STValidation>(
             env.app().getTimeKeeper().now(),
-            kEY_PAIR.first,
-            kEY_PAIR.second,
+            kEyPair.first,
+            kEyPair.second,
             v,
             [&](STValidation& v) {
                 v.setFieldH256(sfLedgerHash, ledger->header().hash);
                 v.setFieldU32(sfLedgerSequence, ledger->seq());
-                v.setFlag(kVF_FULL_VALIDATION);
+                v.setFlag(kVfFullValidation);
             });
     };
 
@@ -1006,7 +1006,7 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
         // build a good scoreTable to use, or copy and modify
         hash_map<NodeID, std::uint32_t> goodScoreTable;
         for (auto const& n : history.UNLNodeIDs)
-            goodScoreTable[n] = NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK + 1;
+            goodScoreTable[n] = NegativeUNLVote::kNegativeUnlHighWaterMark + 1;
 
         NegativeUNLVote vote(history.UNLNodeIDs[0], history.env.journal);
 
@@ -1019,7 +1019,7 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
             // all bad scores
             hash_map<NodeID, std::uint32_t> scoreTable;
             for (auto& n : history.UNLNodeIDs)
-                scoreTable[n] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK - 1;
+                scoreTable[n] = NegativeUNLVote::kNegativeUnlLowWaterMark - 1;
             BEAST_EXPECT(
                 checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, scoreTable, 35 - 3, 0));
         }
@@ -1027,7 +1027,7 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
             // all between watermarks
             hash_map<NodeID, std::uint32_t> scoreTable;
             for (auto& n : history.UNLNodeIDs)
-                scoreTable[n] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK + 1;
+                scoreTable[n] = NegativeUNLVote::kNegativeUnlLowWaterMark + 1;
             BEAST_EXPECT(
                 checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, scoreTable, 0, 0));
         }
@@ -1035,7 +1035,7 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
         {
             // 2 good scorers in negUnl
             auto scoreTable = goodScoreTable;
-            scoreTable[*negUnl012.begin()] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK + 1;
+            scoreTable[*negUnl012.begin()] = NegativeUNLVote::kNegativeUnlLowWaterMark + 1;
             BEAST_EXPECT(
                 checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, scoreTable, 0, 2));
         }
@@ -1043,8 +1043,8 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
         {
             // 2 bad scorers not in negUnl
             auto scoreTable = goodScoreTable;
-            scoreTable[history.UNLNodeIDs[11]] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK - 1;
-            scoreTable[history.UNLNodeIDs[12]] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK - 1;
+            scoreTable[history.UNLNodeIDs[11]] = NegativeUNLVote::kNegativeUnlLowWaterMark - 1;
+            scoreTable[history.UNLNodeIDs[12]] = NegativeUNLVote::kNegativeUnlLowWaterMark - 1;
             BEAST_EXPECT(
                 checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, scoreTable, 2, 3));
         }
@@ -1063,7 +1063,7 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
             auto scoreTable = goodScoreTable;
             scoreTable.erase(history.UNLNodeIDs[0]);
             scoreTable.erase(history.UNLNodeIDs[1]);
-            scoreTable[history.UNLNodeIDs[2]] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK + 1;
+            scoreTable[history.UNLNodeIDs[2]] = NegativeUNLVote::kNegativeUnlLowWaterMark + 1;
             hash_set<NodeID> unlTemp = history.UNLNodeIDSet;
             unlTemp.erase(history.UNLNodeIDs[0]);
             unlTemp.erase(history.UNLNodeIDs[1]);
@@ -1082,8 +1082,8 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
             {
                 // 2 new validators have good scores, already in negUnl
                 auto scoreTable = goodScoreTable;
-                scoreTable[new1] = NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK + 1;
-                scoreTable[new2] = NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK + 1;
+                scoreTable[new1] = NegativeUNLVote::kNegativeUnlHighWaterMark + 1;
+                scoreTable[new2] = NegativeUNLVote::kNegativeUnlHighWaterMark + 1;
                 hash_set<NodeID> negUnlTemp = negUnl012;
                 negUnlTemp.insert(new1);
                 negUnlTemp.insert(new2);
@@ -1098,7 +1098,7 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
             }
             {
                 // expired the new validators have bad scores, not in negUnl
-                vote.purgeNewValidators(256 + NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP + 1);
+                vote.purgeNewValidators(256 + NegativeUNLVote::kNewValidatorDisableSkip + 1);
                 auto scoreTable = goodScoreTable;
                 scoreTable[new1] = 0;
                 scoreTable[new2] = 0;
@@ -1136,13 +1136,13 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
         std::array<std::uint32_t, 3> const nUnlPercent = {0, 50, 100};
         std::array<std::uint32_t, 8> scores = {
             0,
-            NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK - 1,
-            NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK,
-            NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK + 1,
-            NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK - 1,
-            NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK,
-            NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK + 1,
-            NegativeUNLVote::kNEGATIVE_UNL_MIN_LOCAL_VALS_TO_VOTE};
+            NegativeUNLVote::kNegativeUnlLowWaterMark - 1,
+            NegativeUNLVote::kNegativeUnlLowWaterMark,
+            NegativeUNLVote::kNegativeUnlLowWaterMark + 1,
+            NegativeUNLVote::kNegativeUnlHighWaterMark - 1,
+            NegativeUNLVote::kNegativeUnlHighWaterMark,
+            NegativeUNLVote::kNegativeUnlHighWaterMark + 1,
+            NegativeUNLVote::kNegativeUnlMinLocalValsToVote};
 
         //== combination 1:
         {
@@ -1182,21 +1182,21 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
                         std::size_t toReEnableExpect = 0;
                         if (np == 0)
                         {
-                            if (score < NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK)
+                            if (score < NegativeUNLVote::kNegativeUnlLowWaterMark)
                             {
                                 toDisableExpect = us;
                             }
                         }
                         else if (np == 50)
                         {
-                            if (score > NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK)
+                            if (score > NegativeUNLVote::kNegativeUnlHighWaterMark)
                             {
                                 toReEnableExpect = us * np / 100;
                             }
                         }
                         else
                         {
-                            if (score > NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK)
+                            if (score > NegativeUNLVote::kNegativeUnlHighWaterMark)
                             {
                                 toReEnableExpect = us;
                             }
@@ -1314,24 +1314,24 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
             BEAST_EXPECT(vote.newValidators_[n2] == 3);
         }
 
-        vote.newValidators(NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP, {n1, n2, n3});
+        vote.newValidators(NegativeUNLVote::kNewValidatorDisableSkip, {n1, n2, n3});
         BEAST_EXPECT(vote.newValidators_.size() == 3);
         if (vote.newValidators_.size() == 3)
         {
             BEAST_EXPECT(vote.newValidators_[n1] == 2);
             BEAST_EXPECT(vote.newValidators_[n2] == 3);
-            BEAST_EXPECT(vote.newValidators_[n3] == NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP);
+            BEAST_EXPECT(vote.newValidators_[n3] == NegativeUNLVote::kNewValidatorDisableSkip);
         }
 
-        vote.purgeNewValidators(NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP + 2);
+        vote.purgeNewValidators(NegativeUNLVote::kNewValidatorDisableSkip + 2);
         BEAST_EXPECT(vote.newValidators_.size() == 3);
-        vote.purgeNewValidators(NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP + 3);
+        vote.purgeNewValidators(NegativeUNLVote::kNewValidatorDisableSkip + 3);
         BEAST_EXPECT(vote.newValidators_.size() == 2);
-        vote.purgeNewValidators(NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP + 4);
+        vote.purgeNewValidators(NegativeUNLVote::kNewValidatorDisableSkip + 4);
         BEAST_EXPECT(vote.newValidators_.size() == 1);
         BEAST_EXPECT(vote.newValidators_.begin()->first == n3);
         BEAST_EXPECT(
-            vote.newValidators_.begin()->second == NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP);
+            vote.newValidators_.begin()->second == NegativeUNLVote::kNewValidatorDisableSkip);
     }
 
     void
@@ -1767,7 +1767,7 @@ class NegativeUNLVoteNewValidator_test : public beast::unit_test::Suite
                  .negUNLSize = 0,
                  .hasToDisable = false,
                  .hasToReEnable = false,
-                 .numLedgers = NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP * 2}};
+                 .numLedgers = NegativeUNLVote::kNewValidatorDisableSkip * 2}};
             BEAST_EXPECT(history.goodHistory);
             if (history.goodHistory)
             {
@@ -1805,7 +1805,7 @@ class NegativeUNLVoteFilterValidations_test : public beast::unit_test::Suite
         testcase("Filter Validations");
         jtx::Env env(*this);
         auto l = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -1820,7 +1820,7 @@ class NegativeUNLVoteFilterValidations_test : public beast::unit_test::Suite
                 [&](STValidation& v) {
                     v.setFieldH256(sfLedgerHash, l->header().hash);
                     v.setFieldU32(sfLedgerSequence, l->seq());
-                    v.setFlag(kVF_FULL_VALIDATION);
+                    v.setFlag(kVfFullValidation);
                 });
         };
 
diff --git a/src/test/consensus/Validations_test.cpp b/src/test/consensus/Validations_test.cpp
index 323f8fcb77..fb453b0791 100644
--- a/src/test/consensus/Validations_test.cpp
+++ b/src/test/consensus/Validations_test.cpp
@@ -648,8 +648,8 @@ class Validations_test : public beast::unit_test::Suite
         LedgerHistoryHelper h;
         TestHarness harness(h.oracle);
         Node const a = harness.makeNode();
-        constexpr Ledger::Seq kONE(1);
-        constexpr Ledger::Seq kTWO(2);
+        constexpr Ledger::Seq kOne(1);
+        constexpr Ledger::Seq kTwo(2);
 
         // simple cases
         Ledger const ledgerA = h["a"];
@@ -665,12 +665,12 @@ class Validations_test : public beast::unit_test::Suite
         Ledger const ledgerB = h["ab"];
         BEAST_EXPECT(ValStatus::Current == harness.add(a.validate(ledgerB)));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerB.id()) == 1);
-        harness.vals().setSeqToKeep(ledgerB.seq(), ledgerB.seq() + kONE);
+        harness.vals().setSeqToKeep(ledgerB.seq(), ledgerB.seq() + kOne);
         harness.clock().advance(harness.parms().validationSET_EXPIRES);
         harness.vals().expire(j);
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerB.id()) == 1);
         // change toKeep
-        harness.vals().setSeqToKeep(ledgerB.seq() + kONE, ledgerB.seq() + kTWO);
+        harness.vals().setSeqToKeep(ledgerB.seq() + kOne, ledgerB.seq() + kTwo);
         // advance clock slowly
         int const loops =
             harness.parms().validationSET_EXPIRES / harness.parms().validationFRESHNESS + 1;
@@ -685,7 +685,7 @@ class Validations_test : public beast::unit_test::Suite
         Ledger const ledgerC = h["abc"];
         BEAST_EXPECT(ValStatus::Current == harness.add(a.validate(ledgerC)));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerC.id()) == 1);
-        harness.vals().setSeqToKeep(ledgerC.seq() - kONE, ledgerC.seq());
+        harness.vals().setSeqToKeep(ledgerC.seq() - kOne, ledgerC.seq());
         harness.clock().advance(harness.parms().validationSET_EXPIRES);
         harness.vals().expire(j);
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerC.id()) == 0);
diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp
index d5d98cf440..18729a7322 100644
--- a/src/test/core/ClosureCounter_test.cpp
+++ b/src/test/core/ClosureCounter_test.cpp
@@ -205,7 +205,7 @@ class ClosureCounter_test : public beast::unit_test::Suite
             BEAST_EXPECT(strCounter.count() == 0);
 
             auto wrapped = strCounter.wrap([](TrackedString&& in) {
-                // Note that kNONE of the compilers noticed that in was
+                // Note that kNone of the compilers noticed that in was
                 // leaving scope.  So, without intervention, they would
                 // do a copy for the return (June 2017).  An explicit
                 // std::move() was required.
diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp
index 95f277212d..3e6495bc2f 100644
--- a/src/test/core/Config_test.cpp
+++ b/src/test/core/Config_test.cpp
@@ -36,7 +36,7 @@ namespace detail {
 std::string
 configContents(std::string const& dbPath, std::string const& validatorsFile)
 {
-    static boost::format kCONFIG_CONTENTS_TEMPLATE(R"xrpldConfig(
+    static boost::format kConfigContentsTemplate(R"xrpldConfig(
 [server]
 port_rpc
 port_peer
@@ -120,7 +120,7 @@ backend=sqlite
     std::string dbPathSection = dbPath.empty() ? "" : "[database_path]\n" + dbPath;
     std::string valFileSection =
         validatorsFile.empty() ? "" : "[validators_file]\n" + validatorsFile;
-    return boost::str(kCONFIG_CONTENTS_TEMPLATE % dbPathSection % valFileSection);
+    return boost::str(kConfigContentsTemplate % dbPathSection % valFileSection);
 }
 
 /**
@@ -154,7 +154,7 @@ public:
         , dataDir_(dbPath)
     {
         if (dbPath.empty())
-            dataDir_ = subdir() / path(Config::kDATABASE_DIR_NAME);
+            dataDir_ = subdir() / path(Config::kDatabaseDirName);
 
         rmDataDir_ = !exists(dataDir_);
         config_.setup(
@@ -248,7 +248,7 @@ public:
         : FileDirGuard(
               test,
               std::move(subDir),
-              path(validatorsFileName.empty() ? Config::kVALIDATORS_FILE_NAME : validatorsFileName),
+              path(validatorsFileName.empty() ? Config::kValidatorsFileName : validatorsFileName),
               valFileContents(),
               useCounter)
     {
@@ -313,8 +313,7 @@ port_wss_admin
         auto const cwd = current_path();
 
         // Test both config file names.
-        std::string_view const configFiles[] = {
-            Config::kCONFIG_FILE_NAME, Config::kCONFIG_LEGACY_NAME};
+        std::string_view const configFiles[] = {Config::kConfigFileName, Config::kConfigLegacyName};
 
         // Config file in current directory.
         for (auto const& configFile : configFiles)
@@ -461,7 +460,7 @@ port_wss_admin
             path const dataDirRel("test_data_dir");
             path const dataDirAbs(cwd / g0.subdir() / dataDirRel);
             detail::FileCfgGuard const g(
-                *this, g0.subdir(), dataDirAbs, Config::kCONFIG_FILE_NAME, "", false);
+                *this, g0.subdir(), dataDirAbs, Config::kConfigFileName, "", false);
             auto const& c(g.config());
             BEAST_EXPECT(g.dataDirExists());
             BEAST_EXPECT(g.configFileExists());
@@ -470,7 +469,7 @@ port_wss_admin
         {
             // read from file relative path
             std::string const dbPath("my_db");
-            detail::FileCfgGuard const g(*this, "test_db", dbPath, Config::kCONFIG_FILE_NAME, "");
+            detail::FileCfgGuard const g(*this, "test_db", dbPath, Config::kConfigFileName, "");
             auto const& c(g.config());
             std::string const nativeDbPath = absolute(path(dbPath)).string();
             BEAST_EXPECT(g.dataDirExists());
@@ -479,10 +478,10 @@ port_wss_admin
         }
         {
             // read from file no path
-            detail::FileCfgGuard const g(*this, "test_db", "", Config::kCONFIG_FILE_NAME, "");
+            detail::FileCfgGuard const g(*this, "test_db", "", Config::kConfigFileName, "");
             auto const& c(g.config());
             std::string const nativeDbPath =
-                absolute(g.subdir() / path(Config::kDATABASE_DIR_NAME)).string();
+                absolute(g.subdir() / path(Config::kDatabaseDirName)).string();
             BEAST_EXPECT(g.dataDirExists());
             BEAST_EXPECT(g.configFileExists());
             BEAST_EXPECT(c.legacy("database_path") == nativeDbPath);
@@ -509,7 +508,7 @@ port_wss_admin
 
         {
             Config c;
-            static boost::format kCONFIG_TEMPLATE(R"xrpldConfig(
+            static boost::format kConfigTemplate(R"xrpldConfig(
 [validation_seed]
 %1%
 
@@ -522,7 +521,7 @@ port_wss_admin
                 "and [validator_token] config sections";
             try
             {
-                c.loadFromString(boost::str(kCONFIG_TEMPLATE % validationSeed % token));
+                c.loadFromString(boost::str(kConfigTemplate % validationSeed % token));
             }
             catch (std::runtime_error const& e)
             {
@@ -845,7 +844,7 @@ trust-these-validators.gov
             std::string const valFileName = "validators.txt";
             detail::ValidatorsTxtGuard const vtg(*this, "test_cfg", valFileName);
             detail::FileCfgGuard const rcg(
-                *this, vtg.subdir(), "", Config::kCONFIG_FILE_NAME, valFileName, false);
+                *this, vtg.subdir(), "", Config::kConfigFileName, valFileName, false);
             BEAST_EXPECT(vtg.validatorsFileExists());
             BEAST_EXPECT(rcg.configFileExists());
             auto const& c(rcg.config());
@@ -862,7 +861,7 @@ trust-these-validators.gov
             detail::ValidatorsTxtGuard const vtg(*this, "test_cfg", "validators.txt");
             auto const valFilePath = ".." / vtg.subdir() / "validators.txt";
             detail::FileCfgGuard const rcg(
-                *this, vtg.subdir(), "", Config::kCONFIG_FILE_NAME, valFilePath, false);
+                *this, vtg.subdir(), "", Config::kConfigFileName, valFilePath, false);
             BEAST_EXPECT(vtg.validatorsFileExists());
             BEAST_EXPECT(rcg.configFileExists());
             auto const& c(rcg.config());
@@ -877,7 +876,7 @@ trust-these-validators.gov
             // load from validators file in default location
             detail::ValidatorsTxtGuard const vtg(*this, "test_cfg", "validators.txt");
             detail::FileCfgGuard const rcg(
-                *this, vtg.subdir(), "", Config::kCONFIG_FILE_NAME, "", false);
+                *this, vtg.subdir(), "", Config::kConfigFileName, "", false);
             BEAST_EXPECT(vtg.validatorsFileExists());
             BEAST_EXPECT(rcg.configFileExists());
             auto const& c(rcg.config());
@@ -897,7 +896,7 @@ trust-these-validators.gov
                 *this, vtg.subdir(), "validators.txt", false);
             BEAST_EXPECT(vtgDefault.validatorsFileExists());
             detail::FileCfgGuard const rcg(
-                *this, vtg.subdir(), "", Config::kCONFIG_FILE_NAME, vtg.validatorsFile(), false);
+                *this, vtg.subdir(), "", Config::kConfigFileName, vtg.validatorsFile(), false);
             BEAST_EXPECT(rcg.configFileExists());
             auto const& c(rcg.config());
             BEAST_EXPECT(c.legacy("validators_file") == vtg.validatorsFile());
@@ -1003,7 +1002,7 @@ trust-these-validators.gov
     testSetup(bool explicitPath)
     {
         detail::FileCfgGuard const cfg(
-            *this, "testSetup", explicitPath ? "test_db" : "", Config::kCONFIG_FILE_NAME, "");
+            *this, "testSetup", explicitPath ? "test_db" : "", Config::kConfigFileName, "");
         /* FileCfgGuard has a Config object that gets loaded on
             construction, but Config::setup is not reentrant, so we
             need a fresh config for every test case, so ignore it.
@@ -1117,7 +1116,7 @@ trust-these-validators.gov
     void
     testPort()
     {
-        detail::FileCfgGuard const cfg(*this, "testPort", "", Config::kCONFIG_FILE_NAME, "");
+        detail::FileCfgGuard const cfg(*this, "testPort", "", Config::kConfigFileName, "");
         auto const& conf = cfg.config();
         if (!BEAST_EXPECT(conf.exists("port_rpc")))
             return;
@@ -1142,7 +1141,7 @@ trust-these-validators.gov
         try
         {
             detail::FileCfgGuard const cfg(
-                *this, "testPort", "", Config::kCONFIG_FILE_NAME, "", true, contents);
+                *this, "testPort", "", Config::kConfigFileName, "", true, contents);
             BEAST_EXPECT(false);
         }
         catch (std::exception const& ex)
diff --git a/src/test/csf/Peer.h b/src/test/csf/Peer.h
index d3b35c19a1..3e9eed1c52 100644
--- a/src/test/csf/Peer.h
+++ b/src/test/csf/Peer.h
@@ -496,12 +496,7 @@ struct Peer
         return Result(
             TxSet{openTxs},
             Proposal(
-                prevLedger.id(),
-                Proposal::kSEQ_JOIN,
-                TxSet::calcID(openTxs),
-                closeTime,
-                now(),
-                id));
+                prevLedger.id(), Proposal::kSeqJoin, TxSet::calcID(openTxs), closeTime, now(), id));
     }
 
     void
diff --git a/src/test/csf/impl/ledgers.cpp b/src/test/csf/impl/ledgers.cpp
index fd7ea35faa..46a3600307 100644
--- a/src/test/csf/impl/ledgers.cpp
+++ b/src/test/csf/impl/ledgers.cpp
@@ -15,7 +15,7 @@
 
 namespace xrpl::test::csf {
 
-Ledger::Instance const Ledger::kGENESIS;
+Ledger::Instance const Ledger::kGenesis;
 
 json::Value
 Ledger::getJson() const
@@ -76,7 +76,7 @@ mismatch(Ledger const& a, Ledger const& b)
 
 LedgerOracle::LedgerOracle()
 {
-    instances_.insert(InstanceEntry{Ledger::kGENESIS, nextID()});
+    instances_.insert(InstanceEntry{Ledger::kGenesis, nextID()});
 }
 
 Ledger::ID
diff --git a/src/test/csf/ledgers.h b/src/test/csf/ledgers.h
index 96082bc987..25672de133 100644
--- a/src/test/csf/ledgers.h
+++ b/src/test/csf/ledgers.h
@@ -66,7 +66,7 @@ private:
         TxSetType txs;
 
         // Resolution used to determine close time
-        NetClock::duration closeTimeResolution = kLEDGER_DEFAULT_TIME_RESOLUTION;
+        NetClock::duration closeTimeResolution = kLedgerDefaultTimeResolution;
 
         //! When the ledger closed (up to closeTimeResolution)
         NetClock::time_point closeTime;
@@ -128,14 +128,14 @@ private:
     };
 
     // Single common genesis instance
-    static Instance const kGENESIS;
+    static Instance const kGenesis;
 
     Ledger(ID id, Instance const* i) : id_{id}, instance_{i}
     {
     }
 
 public:
-    Ledger(MakeGenesis) : instance_(&kGENESIS)
+    Ledger(MakeGenesis) : instance_(&kGenesis)
     {
     }
 
diff --git a/src/test/jtx/AMM.h b/src/test/jtx/AMM.h
index 2876522218..deadd80290 100644
--- a/src/test/jtx/AMM.h
+++ b/src/test/jtx/AMM.h
@@ -178,7 +178,7 @@ public:
         std::optional<Asset> asset2 = std::nullopt,
         std::optional<AccountID> const& ammAccount = std::nullopt,
         bool ignoreParams = false,
-        unsigned apiVersion = RPC::kAPI_INVALID_VERSION) const;
+        unsigned apiVersion = RPC::kApiInvalidVersion) const;
 
     /** Verify the AMM balances.
      */
diff --git a/src/test/jtx/Account.h b/src/test/jtx/Account.h
index 2a11c5540e..b20b4a359a 100644
--- a/src/test/jtx/Account.h
+++ b/src/test/jtx/Account.h
@@ -23,7 +23,7 @@ private:
 
 public:
     /** The master account. */
-    static Account const kMASTER;
+    static Account const kMaster;
 
     Account() = delete;
     Account(Account&&) = default;
diff --git a/src/test/jtx/Env.h b/src/test/jtx/Env.h
index 1ed9feb906..4618b36fde 100644
--- a/src/test/jtx/Env.h
+++ b/src/test/jtx/Env.h
@@ -75,7 +75,7 @@ noripple(Account const& account, Args const&... args)
 inline FeatureBitset
 testableAmendments()
 {
-    static FeatureBitset const kIDS = [] {
+    static FeatureBitset const kIds = [] {
         auto const& sa = allAmendments();
         std::vector<uint256> feats;
         feats.reserve(sa.size());
@@ -93,7 +93,7 @@ testableAmendments()
         }
         return FeatureBitset(feats);
     }();
-    return kIDS;
+    return kIds;
 }
 
 //------------------------------------------------------------------------------
@@ -124,7 +124,7 @@ class Env
 public:
     beast::unit_test::Suite& test;
 
-    Account const& master = Account::kMASTER;
+    Account const& master = Account::kMaster;
 
     /// Used by parseResult() and postConditions()
     struct ParsedResult
@@ -192,7 +192,7 @@ public:
         , bundle_(suite, std::move(config), std::move(logs), thresh)
         , journal{bundle_.app->getJournal("Env")}
     {
-        memoize(Account::kMASTER);
+        memoize(Account::kMaster);
         Pathfinder::initPathTable();
         foreachFeature(features, [&appFeats = app().config().features](uint256 const& f) {
             appFeats.insert(f);
@@ -869,7 +869,7 @@ Env::rpc(
     Args&&... args)
 {
     return doRpc(
-        RPC::kAPI_COMMAND_LINE_VERSION,
+        RPC::kApiCommandLineVersion,
         std::vector<std::string>{cmd, std::forward<Args>(args)...},
         headers);
 }
diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp
index bdc9497235..0c9e5ffe24 100644
--- a/src/test/jtx/Env_test.cpp
+++ b/src/test/jtx/Env_test.cpp
@@ -163,7 +163,7 @@ public:
 
         auto const get = [](AnyAmount a) { return a; };
         BEAST_EXPECT(!get(usd(10)).isAny);
-        BEAST_EXPECT(get(kANY(usd(10))).isAny);
+        BEAST_EXPECT(get(kAny(usd(10))).isAny);
     }
 
     // Test Env
@@ -240,13 +240,13 @@ public:
             env.fund(n, "alice");
             env.require(Balance("alice", n));
             env(noop("alice"), Fee(1), Ter(telINSUF_FEE_P));
-            env(noop("alice"), Seq(kNONE), Ter(temMALFORMED));
-            env(noop("alice"), Seq(kNONE), Fee(10), Ter(temMALFORMED));
-            env(noop("alice"), Fee(kNONE), Ter(temMALFORMED));
-            env(noop("alice"), Sig(kNONE), Ter(temMALFORMED));
-            env(noop("alice"), Fee(kAUTOFILL));
-            env(noop("alice"), Fee(kAUTOFILL), Seq(kAUTOFILL));
-            env(noop("alice"), Fee(kAUTOFILL), Seq(kAUTOFILL), Sig(kAUTOFILL));
+            env(noop("alice"), Seq(kNone), Ter(temMALFORMED));
+            env(noop("alice"), Seq(kNone), Fee(10), Ter(temMALFORMED));
+            env(noop("alice"), Fee(kNone), Ter(temMALFORMED));
+            env(noop("alice"), Sig(kNone), Ter(temMALFORMED));
+            env(noop("alice"), Fee(kAutofill));
+            env(noop("alice"), Fee(kAutofill), Seq(kAutofill));
+            env(noop("alice"), Fee(kAutofill), Seq(kAutofill), Sig(kAutofill));
         }
     }
 
@@ -258,11 +258,11 @@ public:
         Env env(*this);
         auto const gw = Account("gw");
         auto const usd = gw["USD"];
-        env.require(Balance("alice", kNONE));
-        env.require(Balance("alice", XRP(kNONE)));
+        env.require(Balance("alice", kNone));
+        env.require(Balance("alice", XRP(kNone)));
         env.fund(XRP(10000), "alice", gw);
         env.close();
-        env.require(Balance("alice", usd(kNONE)));
+        env.require(Balance("alice", usd(kNone)));
         env.trust(usd(100), "alice");
         env.require(Balance("alice", XRP(10000)));  // fee refunded
         env.require(Balance("alice", usd(0)));
@@ -324,11 +324,11 @@ public:
         env.require(Balance("carol", XRP(10000)));
         env.require(Balance(gw, XRP(10000)));
 
-        env(pay(env.master, "alice", XRP(1000)), Fee(kNONE), Ter(temMALFORMED));
+        env(pay(env.master, "alice", XRP(1000)), Fee(kNone), Ter(temMALFORMED));
         env(pay(env.master, "alice", XRP(1000)), Fee(1), Ter(telINSUF_FEE_P));
-        env(pay(env.master, "alice", XRP(1000)), Seq(kNONE), Ter(temMALFORMED));
+        env(pay(env.master, "alice", XRP(1000)), Seq(kNone), Ter(temMALFORMED));
         env(pay(env.master, "alice", XRP(1000)), Seq(20), Ter(terPRE_SEQ));
-        env(pay(env.master, "alice", XRP(1000)), Sig(kNONE), Ter(temMALFORMED));
+        env(pay(env.master, "alice", XRP(1000)), Sig(kNone), Ter(temMALFORMED));
         env(pay(env.master, "alice", XRP(1000)), Sig("bob"), Ter(tefBAD_AUTH));
 
         env(pay(env.master, "dilbert", XRP(1000)), Sig(env.master));
@@ -342,9 +342,9 @@ public:
         env.require(Balance(gw, Account("carol")["USD"](-50)));
 
         env(offer("carol", XRP(50), usd(50)), Require(Owners("carol", 2)));
-        env(pay("alice", "bob", kANY(usd(10))), Ter(tecPATH_DRY));
-        env(pay("alice", "bob", kANY(usd(10))), Paths(XRP), Sendmax(XRP(10)), Ter(tecPATH_PARTIAL));
-        env(pay("alice", "bob", kANY(usd(10))), Paths(XRP), Sendmax(XRP(20)));
+        env(pay("alice", "bob", kAny(usd(10))), Ter(tecPATH_DRY));
+        env(pay("alice", "bob", kAny(usd(10))), Paths(XRP), Sendmax(XRP(10)), Ter(tecPATH_PARTIAL));
+        env(pay("alice", "bob", kAny(usd(10))), Paths(XRP), Sendmax(XRP(20)));
         env.require(Balance("bob", usd(10)));
         env.require(Balance("carol", usd(39.5)));
 
@@ -359,7 +359,7 @@ public:
         env.require(Nflags("alice", asfDisableMaster));
         env(fset("alice", asfDisableMaster), Sig("alice"));
         env.require(Flags("alice", asfDisableMaster));
-        env(regkey("alice", kDISABLED), Ter(tecNO_ALTERNATIVE_KEY));
+        env(regkey("alice", kDisabled), Ter(tecNO_ALTERNATIVE_KEY));
         env(noop("alice"));
         env(noop("alice"), Sig("alice"), Ter(tefMASTER_DISABLED));
         env(noop("alice"), Sig("eric"));
@@ -368,7 +368,7 @@ public:
         env(fclear("alice", asfDisableMaster), Sig("alice"), Ter(tefMASTER_DISABLED));
         env(fclear("alice", asfDisableMaster));
         env.require(Nflags("alice", asfDisableMaster));
-        env(regkey("alice", kDISABLED));
+        env(regkey("alice", kDisabled));
         env(noop("alice"), Sig("eric"), Ter(tefBAD_AUTH));
         env(noop("alice"));
     }
@@ -468,7 +468,7 @@ public:
             Fee(4 * baseFee),
             Ter(tefBAD_SIGNATURE));
 
-        env(signers("alice", kNONE));
+        env(signers("alice", kNone));
     }
 
     void
@@ -703,7 +703,7 @@ public:
         env.fund(XRP(10000), alice);
 
         {
-            envs(noop(alice), Fee(kNONE), Seq(kNONE))();
+            envs(noop(alice), Fee(kNone), Seq(kNone))();
 
             // Make sure we get the right account back.
             auto tx = env.tx();
@@ -716,7 +716,7 @@ public:
 
         {
             auto params = json::Value(json::ValueType::Null);
-            envs(noop(alice), Fee(kNONE), Seq(kNONE))(params);
+            envs(noop(alice), Fee(kNone), Seq(kNone))(params);
 
             // Make sure we get the right account back.
             auto tx = env.tx();
@@ -735,7 +735,7 @@ public:
 
             auto const expectedErrorString = "Fee of " + std::to_string(baseFee.drops()) +
                 " exceeds the requested tx limit of " + std::to_string(baseFee.drops() / 2);
-            envs(noop(alice), Fee(kNONE), Seq(kNONE), Rpc(RpcHighFee, expectedErrorString))(params);
+            envs(noop(alice), Fee(kNone), Seq(kNone), Rpc(RpcHighFee, expectedErrorString))(params);
 
             auto tx = env.tx();
             BEAST_EXPECT(!tx);
diff --git a/src/test/jtx/Oracle.h b/src/test/jtx/Oracle.h
index becc572e4a..cf091c6d13 100644
--- a/src/test/jtx/Oracle.h
+++ b/src/test/jtx/Oracle.h
@@ -11,9 +11,9 @@ using OraclesData = std::vector<std::pair<std::optional<Account>, std::optional<
 
 // Special string value, which is converted to unquoted string in the string
 // passed to rpc.
-constexpr char const* kNONE_TAG = "%None%";
-constexpr char const* kUNQUOTED_NONE = "None";
-constexpr char const* kNONE_PATTERN = "\"%None%\"";
+constexpr char const* kNoneTag = "%None%";
+constexpr char const* kUnquotedNone = "None";
+constexpr char const* kNonePattern = "\"%None%\"";
 
 std::uint32_t
 asUInt(AnyValue const& v);
@@ -83,8 +83,7 @@ struct RemoveArg
 // The value doesn't matter much, it has to be greater
 // than maxLastUpdateTimeDelta in order to pass LastUpdateTime
 // validation {close-maxLastUpdateTimeDelta,close+maxLastUpdateTimeDelta}.
-constexpr static std::chrono::seconds kTEST_START_TIME =
-    kEPOCH_OFFSET + std::chrono::seconds(10'000);
+static constexpr std::chrono::seconds kTestStartTime = kEpochOffset + std::chrono::seconds(10'000);
 
 /** Oracle class facilitates unit-testing of the Price Oracle feature.
  * It defines functions to create, update, and delete the Oracle object,
diff --git a/src/test/jtx/PathSet.h b/src/test/jtx/PathSet.h
index 26da4eb215..cab31ea540 100644
--- a/src/test/jtx/PathSet.h
+++ b/src/test/jtx/PathSet.h
@@ -109,7 +109,7 @@ TestPath::pushBack(Issue const& iss)
 {
     path.emplaceBack(
         STPathElement::TypeCurrency | STPathElement::TypeIssuer,
-        beast::kZERO,
+        beast::kZero,
         iss.currency,
         iss.account);
     return *this;
@@ -120,7 +120,7 @@ TestPath::pushBack(MPTIssue const& iss)
 {
     path.emplaceBack(
         STPathElement::TypeMpt | STPathElement::TypeIssuer,
-        beast::kZERO,
+        beast::kZero,
         iss.getMptID(),
         iss.getIssuer());
     return *this;
@@ -129,7 +129,7 @@ TestPath::pushBack(MPTIssue const& iss)
 inline TestPath&
 TestPath::pushBack(jtx::Account const& account)
 {
-    path.emplaceBack(account.id(), Currency{beast::kZERO}, beast::kZERO);
+    path.emplaceBack(account.id(), Currency{beast::kZero}, beast::kZero);
     return *this;
 }
 
diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h
index 3362d08645..011ac2e58d 100644
--- a/src/test/jtx/TestHelpers.h
+++ b/src/test/jtx/TestHelpers.h
@@ -274,9 +274,9 @@ using simpleField = JTxFieldWrapper<JTxField<SField, StoredValue>>;
 
 /** General field definitions, or fields used in multiple transaction namespaces
  */
-auto const kDATA = JTxFieldWrapper<BlobField>(sfData);
+auto const kData = JTxFieldWrapper<BlobField>(sfData);
 
-auto const kAMOUNT = JTxFieldWrapper<StAmountField>(sfAmount);
+auto const kAmount = JTxFieldWrapper<StAmountField>(sfAmount);
 
 // TODO We only need this long "requires" clause as polyfill, for C++20
 // implementations which are missing <ranges> header. Replace with
@@ -728,8 +728,8 @@ create(jtx::Account const& account, jtx::Account const& dest, STAmount const& se
 
 }  // namespace check
 
-static constexpr FeeLevel64 kBASE_FEE_LEVEL{TxQ::kBASE_LEVEL};
-static constexpr FeeLevel64 kMIN_ESCALATION_FEE_LEVEL = kBASE_FEE_LEVEL * 500;
+static constexpr FeeLevel64 kBaseFeeLevel{TxQ::kBaseLevel};
+static constexpr FeeLevel64 kMinEscalationFeeLevel = kBaseFeeLevel * 500;
 
 inline uint256
 getCheckIndex(AccountID const& account, std::uint32_t uSequence)
@@ -746,8 +746,8 @@ checkMetrics(
     std::optional<std::size_t> expectedMaxCount,
     std::size_t expectedInLedger,
     std::size_t expectedPerLedger,
-    std::uint64_t expectedMinFeeLevel = kBASE_FEE_LEVEL.fee(),
-    std::uint64_t expectedMedFeeLevel = kMIN_ESCALATION_FEE_LEVEL.fee(),
+    std::uint64_t expectedMinFeeLevel = kBaseFeeLevel.fee(),
+    std::uint64_t expectedMedFeeLevel = kMinEscalationFeeLevel.fee(),
     std::source_location const location = std::source_location::current())
 {
     int const line = location.line();
@@ -757,11 +757,11 @@ checkMetrics(
     auto const metrics = env.app().getTxQ().getMetrics(*env.current());
     using namespace std::string_literals;
 
-    metrics.referenceFeeLevel == kBASE_FEE_LEVEL
+    metrics.referenceFeeLevel == kBaseFeeLevel
         ? test.pass()
         : test.fail(
               "reference: "s + std::to_string(metrics.referenceFeeLevel.value()) + "/" +
-                  std::to_string(kBASE_FEE_LEVEL.value()),
+                  std::to_string(kBaseFeeLevel.value()),
               file,
               line);
 
@@ -856,20 +856,19 @@ coverWithdraw(
 json::Value
 coverClawback(AccountID const& account, std::uint32_t flags = 0);
 
-auto const kLOAN_BROKER_ID = JTxFieldWrapper<UInt256Field>(sfLoanBrokerID);
+auto const kLoanBrokerId = JTxFieldWrapper<UInt256Field>(sfLoanBrokerID);
 
-auto const kMANAGEMENT_FEE_RATE =
+auto const kManagementFeeRate =
     valueUnitWrapper<SF_UINT16, unit::TenthBipsTag>(sfManagementFeeRate);
 
-auto const kDEBT_MAXIMUM = simpleField<SF_NUMBER>(sfDebtMaximum);
+auto const kDebtMaximum = simpleField<SF_NUMBER>(sfDebtMaximum);
 
-auto const kCOVER_RATE_MINIMUM =
-    valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCoverRateMinimum);
+auto const kCoverRateMinimum = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCoverRateMinimum);
 
-auto const kCOVER_RATE_LIQUIDATION =
+auto const kCoverRateLiquidation =
     valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCoverRateLiquidation);
 
-auto const kDESTINATION = JTxFieldWrapper<AccountIdField>(sfDestination);
+auto const kDestination = JTxFieldWrapper<AccountIdField>(sfDestination);
 
 }  // namespace loanBroker
 
@@ -883,36 +882,35 @@ set(AccountID const& account,
     Number principalRequested,
     std::uint32_t flags = 0);
 
-auto const kCOUNTERPARTY = JTxFieldWrapper<AccountIdField>(sfCounterparty);
+auto const kCounterparty = JTxFieldWrapper<AccountIdField>(sfCounterparty);
 
 // For `CounterPartySignature`, use `Sig(sfCounterpartySignature, ...)`
 
-auto const kLOAN_ORIGINATION_FEE = simpleField<SF_NUMBER>(sfLoanOriginationFee);
+auto const kLoanOriginationFee = simpleField<SF_NUMBER>(sfLoanOriginationFee);
 
-auto const kLOAN_SERVICE_FEE = simpleField<SF_NUMBER>(sfLoanServiceFee);
+auto const kLoanServiceFee = simpleField<SF_NUMBER>(sfLoanServiceFee);
 
-auto const kLATE_PAYMENT_FEE = simpleField<SF_NUMBER>(sfLatePaymentFee);
+auto const kLatePaymentFee = simpleField<SF_NUMBER>(sfLatePaymentFee);
 
-auto const kCLOSE_PAYMENT_FEE = simpleField<SF_NUMBER>(sfClosePaymentFee);
+auto const kClosePaymentFee = simpleField<SF_NUMBER>(sfClosePaymentFee);
 
-auto const kOVERPAYMENT_FEE = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfOverpaymentFee);
+auto const kOverpaymentFee = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfOverpaymentFee);
 
-auto const kINTEREST_RATE = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfInterestRate);
+auto const kInterestRate = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfInterestRate);
 
-auto const kLATE_INTEREST_RATE =
-    valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfLateInterestRate);
+auto const kLateInterestRate = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfLateInterestRate);
 
-auto const kCLOSE_INTEREST_RATE =
+auto const kCloseInterestRate =
     valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCloseInterestRate);
 
-auto const kOVERPAYMENT_INTEREST_RATE =
+auto const kOverpaymentInterestRate =
     valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfOverpaymentInterestRate);
 
-auto const kPAYMENT_TOTAL = simpleField<SF_UINT32>(sfPaymentTotal);
+auto const kPaymentTotal = simpleField<SF_UINT32>(sfPaymentTotal);
 
-auto const kPAYMENT_INTERVAL = simpleField<SF_UINT32>(sfPaymentInterval);
+auto const kPaymentInterval = simpleField<SF_UINT32>(sfPaymentInterval);
 
-auto const kGRACE_PERIOD = simpleField<SF_UINT32>(sfGracePeriod);
+auto const kGracePeriod = simpleField<SF_UINT32>(sfGracePeriod);
 
 json::Value
 manage(AccountID const& account, uint256 const& loanID, std::uint32_t flags);
diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h
index 05efc9eea2..4c7528ccc3 100644
--- a/src/test/jtx/TrustedPublisherServer.h
+++ b/src/test/jtx/TrustedPublisherServer.h
@@ -101,7 +101,7 @@ public:
         SecretKey const& ssk,
         int seq)
     {
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = seq;
         st[sfPublicKey] = pk;
         st[sfSigningPubKey] = spk;
@@ -339,7 +339,7 @@ public:
     static std::string const&
     cert()
     {
-        static std::string const kCERT{R"cert(
+        static std::string const kCert{R"cert(
 -----BEGIN CERTIFICATE-----
 MIIDczCCAlugAwIBAgIBATANBgkqhkiG9w0BAQsFADBjMQswCQYDVQQGEwJVUzEL
 MAkGA1UECAwCQ0ExFDASBgNVBAcMC0xvcyBBbmdlbGVzMRswGQYDVQQKDBJyaXBw
@@ -362,13 +362,13 @@ GSGO8NEEq8BTVmp69zD1JyfvQcXzsi7WtkAX+/EOFZ7LesnZ6VsyjZ74wECCaQuD
 X1yu/XxHqchM+DOzzVw6wRKaM7Zsk80=
 -----END CERTIFICATE-----
 )cert"};
-        return kCERT;
+        return kCert;
     }
 
     static std::string const&
     key()
     {
-        static std::string const kEY{R"pkey(
+        static std::string const kKey{R"pkey(
 -----BEGIN RSA PRIVATE KEY-----
 MIIEpAIBAAKCAQEAueZ1hgRxwPgfeVx2AdngUYx7zYcaxcGYXyqi7izJqTuBUcVc
 TRC/9Ip67RAEhfcgGudRS/a4Sv1ljwiRknSCcD/ZjzOFDLgbqYGSZNEs+T/qkwmc
@@ -397,13 +397,13 @@ cK55dMILcbHqeIBq/wR6sIhw6IJcaDBfFfrJiKKDilfij2lHxR2FQrEngtTCCRV+
 ZzARzaWhQPvbDqEtLJDWuXZNXfL8/PTIs5NmuKuQ8F4+gQJpkQgwaw==
 -----END RSA PRIVATE KEY-----
 )pkey"};
-        return kEY;
+        return kKey;
     }
 
     static std::string const&
     caCert()
     {
-        static std::string const kCERT{R"cert(
+        static std::string const kCert{R"cert(
 -----BEGIN CERTIFICATE-----
 MIIDpzCCAo+gAwIBAgIUWc45WqaaNuaSLoFYTMC/Mjfqw/gwDQYJKoZIhvcNAQEL
 BQAwYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRQwEgYDVQQHDAtMb3MgQW5n
@@ -427,7 +427,7 @@ mRMyNekaRw+Npy4Hjou5sx272cXHHmPCSF5TjwdaibSaGjx1k0Q50mOf7S9KG5b5
 7X1e3FekJlaD02EBEhtkXURIxogOQALdFncj
 -----END CERTIFICATE-----
 )cert"};
-        return kCERT;
+        return kCert;
     }
 
     static std::string const&
@@ -545,11 +545,11 @@ private:
                     else
                     {
                         int refresh = 5;
-                        constexpr char const* kREFRESH_PREFIX = "/validators2/refresh/";
-                        if (boost::starts_with(path, kREFRESH_PREFIX))
+                        static constexpr char const* kRefreshPrefix = "/validators2/refresh/";
+                        if (boost::starts_with(path, kRefreshPrefix))
                         {
                             refresh = boost::lexical_cast<unsigned int>(
-                                path.substr(strlen(kREFRESH_PREFIX)));
+                                path.substr(strlen(kRefreshPrefix)));
                         }
                         res.body() = getList2_(refresh);
                     }
@@ -569,11 +569,11 @@ private:
                     else
                     {
                         int refresh = 5;
-                        constexpr char const* kREFRESH_PREFIX = "/validators/refresh/";
-                        if (boost::starts_with(path, kREFRESH_PREFIX))
+                        static constexpr char const* kRefreshPrefix = "/validators/refresh/";
+                        if (boost::starts_with(path, kRefreshPrefix))
                         {
                             refresh = boost::lexical_cast<unsigned int>(
-                                path.substr(strlen(kREFRESH_PREFIX)));
+                                path.substr(strlen(kRefreshPrefix)));
                         }
                         res.body() = getList_(refresh);
                     }
diff --git a/src/test/jtx/amount.h b/src/test/jtx/amount.h
index 4bf5bffd6b..db281419ef 100644
--- a/src/test/jtx/amount.h
+++ b/src/test/jtx/amount.h
@@ -55,8 +55,7 @@ struct None
 // This value is also defined in SystemParameters.h. It's
 // duplicated here to catch any possible future errors that
 // could change that value (however unlikely).
-// TODO: rename — clashes with xrpl::kDROPS_PER_XRP
-constexpr XRPAmount kJTX_DROPS_PER_XRP{1'000'000};
+constexpr XRPAmount kJtxDropsPerXrp{1'000'000};
 
 /** Represents an XRP, IOU, or MPT quantity
     This customizes the string conversion and supports
@@ -276,7 +275,7 @@ struct XrpT
     operator()(T v) const
     {
         using TOut = std::conditional_t<std::is_signed_v<T>, std::int64_t, std::uint64_t>;
-        return {TOut{v} * kJTX_DROPS_PER_XRP};
+        return {TOut{v} * kJtxDropsPerXrp};
     }
 
     /** Returns an amount of XRP as PrettyAmount,
@@ -287,7 +286,7 @@ struct XrpT
     PrettyAmount
     operator()(Number v) const
     {
-        auto const c = kJTX_DROPS_PER_XRP.drops();
+        auto const c = kJtxDropsPerXrp.drops();
         auto const d = std::int64_t(v * c);
         if (Number(d) / c != v)
             Throw<std::domain_error>("unrepresentable");
@@ -297,7 +296,7 @@ struct XrpT
     PrettyAmount
     operator()(double v) const
     {
-        auto const c = kJTX_DROPS_PER_XRP.drops();
+        auto const c = kJtxDropsPerXrp.drops();
         if (v >= 0)
         {
             auto const d = std::uint64_t(std::round(v * c));
@@ -371,7 +370,7 @@ struct EpsilonT
     }
 };
 
-static EpsilonT const kEPSILON;
+static EpsilonT const kEpsilon;
 
 /** Converts to IOU Issue or STAmount.
 
@@ -612,7 +611,7 @@ AnyT::operator()(STAmount const& sta) const
 /** Returns an amount representing "any issuer"
     @note With respect to what the recipient will accept
 */
-extern AnyT const kANY;
+extern AnyT const kAny;
 
 }  // namespace test::jtx
 
diff --git a/src/test/jtx/directory.h b/src/test/jtx/directory.h
index 5f277d6c91..9a87266802 100644
--- a/src/test/jtx/directory.h
+++ b/src/test/jtx/directory.h
@@ -48,7 +48,7 @@ maximumPageIndex(Env const& env) -> std::uint64_t
 {
     if (env.enabled(fixDirectoryLimit))
         return std::numeric_limits<std::uint64_t>::max();
-    return kDIR_NODE_MAX_PAGES - 1;
+    return kDirNodeMaxPages - 1;
 }
 
 }  // namespace xrpl::test::jtx::directory
diff --git a/src/test/jtx/escrow.h b/src/test/jtx/escrow.h
index 5cb6f65395..58be9b701a 100644
--- a/src/test/jtx/escrow.h
+++ b/src/test/jtx/escrow.h
@@ -41,38 +41,38 @@ cancel(Account const& account, Account const& from, std::uint32_t seq)
 Rate
 rate(Env& env, Account const& account, std::uint32_t const& seq);
 
-// A PreimageSha256 fulfillments and its associated kCONDITION.
-std::array<std::uint8_t, 4> const kFB1 = {{0xA0, 0x02, 0x80, 0x00}};
+// A PreimageSha256 fulfillments and its associated kCondition.
+std::array<std::uint8_t, 4> const kFb1 = {{0xA0, 0x02, 0x80, 0x00}};
 
-std::array<std::uint8_t, 39> const kCB1 = {
+std::array<std::uint8_t, 39> const kCb1 = {
     {0xA0, 0x25, 0x80, 0x20, 0xE3, 0xB0, 0xC4, 0x42, 0x98, 0xFC, 0x1C, 0x14, 0x9A,
      0xFB, 0xF4, 0xC8, 0x99, 0x6F, 0xB9, 0x24, 0x27, 0xAE, 0x41, 0xE4, 0x64, 0x9B,
      0x93, 0x4C, 0xA4, 0x95, 0x99, 0x1B, 0x78, 0x52, 0xB8, 0x55, 0x81, 0x01, 0x00}};
 
-// Another PreimageSha256 fulfillments and its associated kCONDITION.
-std::array<std::uint8_t, 7> const kFB2 = {{0xA0, 0x05, 0x80, 0x03, 0x61, 0x61, 0x61}};
+// Another PreimageSha256 fulfillments and its associated kCondition.
+std::array<std::uint8_t, 7> const kFb2 = {{0xA0, 0x05, 0x80, 0x03, 0x61, 0x61, 0x61}};
 
-std::array<std::uint8_t, 39> const kCB2 = {
+std::array<std::uint8_t, 39> const kCb2 = {
     {0xA0, 0x25, 0x80, 0x20, 0x98, 0x34, 0x87, 0x6D, 0xCF, 0xB0, 0x5C, 0xB1, 0x67,
      0xA5, 0xC2, 0x49, 0x53, 0xEB, 0xA5, 0x8C, 0x4A, 0xC8, 0x9B, 0x1A, 0xDF, 0x57,
      0xF2, 0x8F, 0x2F, 0x9D, 0x09, 0xAF, 0x10, 0x7E, 0xE8, 0xF0, 0x81, 0x01, 0x03}};
 
-// Another PreimageSha256 kFULFILLMENT and its associated kCONDITION.
-std::array<std::uint8_t, 8> const kFB3 = {{0xA0, 0x06, 0x80, 0x04, 0x6E, 0x69, 0x6B, 0x62}};
+// Another PreimageSha256 kFulfillment and its associated kCondition.
+std::array<std::uint8_t, 8> const kFb3 = {{0xA0, 0x06, 0x80, 0x04, 0x6E, 0x69, 0x6B, 0x62}};
 
-std::array<std::uint8_t, 39> const kCB3 = {
+std::array<std::uint8_t, 39> const kCb3 = {
     {0xA0, 0x25, 0x80, 0x20, 0x6E, 0x4C, 0x71, 0x45, 0x30, 0xC0, 0xA4, 0x26, 0x8B,
      0x3F, 0xA6, 0x3B, 0x1B, 0x60, 0x6F, 0x2D, 0x26, 0x4A, 0x2D, 0x85, 0x7B, 0xE8,
      0xA0, 0x9C, 0x1D, 0xFD, 0x57, 0x0D, 0x15, 0x85, 0x8B, 0xD4, 0x81, 0x01, 0x04}};
 
 /** Set the "FinishAfter" time tag on a JTx */
-auto const kFINISH_TIME = JTxFieldWrapper<TimePointField>(sfFinishAfter);
+auto const kFinishTime = JTxFieldWrapper<TimePointField>(sfFinishAfter);
 
 /** Set the "CancelAfter" time tag on a JTx */
-auto const kCANCEL_TIME = JTxFieldWrapper<TimePointField>(sfCancelAfter);
+auto const kCancelTime = JTxFieldWrapper<TimePointField>(sfCancelAfter);
 
-auto const kCONDITION = JTxFieldWrapper<BlobField>(sfCondition);
+auto const kCondition = JTxFieldWrapper<BlobField>(sfCondition);
 
-auto const kFULFILLMENT = JTxFieldWrapper<BlobField>(sfFulfillment);
+auto const kFulfillment = JTxFieldWrapper<BlobField>(sfFulfillment);
 
 }  // namespace xrpl::test::jtx::escrow
diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp
index 145a342e97..c6dc14081a 100644
--- a/src/test/jtx/impl/AMM.cpp
+++ b/src/test/jtx/impl/AMM.cpp
@@ -212,7 +212,7 @@ AMM::ammRpcInfo(
             jv[jss::amm_account] = to_string(*ammAccount);
     }
     auto jr =
-        (apiVersion == RPC::kAPI_INVALID_VERSION
+        (apiVersion == RPC::kApiInvalidVersion
              ? env_.rpc("json", "amm_info", to_string(jv))
              : env_.rpc(apiVersion, "json", "amm_info", to_string(jv)));
     if (jr.isObject() && jr.isMember(jss::result) && jr[jss::result].isMember(jss::status))
diff --git a/src/test/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp
index 50e6c701f1..f82b997c3d 100644
--- a/src/test/jtx/impl/Account.cpp
+++ b/src/test/jtx/impl/Account.cpp
@@ -23,7 +23,7 @@ namespace xrpl::test::jtx {
 
 std::unordered_map<std::pair<std::string, KeyType>, Account, beast::Uhash<>> Account::cache;
 
-Account const Account::kMASTER(
+Account const Account::kMaster(
     "master",
     generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase")),
     Account::PrivateCtorTag{});
diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp
index 7e723dd123..1cd4dd1029 100644
--- a/src/test/jtx/impl/Env.cpp
+++ b/src/test/jtx/impl/Env.cpp
@@ -301,23 +301,23 @@ Env::fund(bool setDefaultRipple, STAmount const& amount, Account const& account)
         // VFALCO NOTE Is the fee formula correct?
         apply(
             pay(master, account, amount + drops(current()->fees().base)),
-            jtx::Seq(jtx::kAUTOFILL),
-            Fee(jtx::kAUTOFILL),
-            Sig(jtx::kAUTOFILL));
+            jtx::Seq(jtx::kAutofill),
+            Fee(jtx::kAutofill),
+            Sig(jtx::kAutofill));
         apply(
             fset(account, asfDefaultRipple),
-            jtx::Seq(jtx::kAUTOFILL),
-            Fee(jtx::kAUTOFILL),
-            Sig(jtx::kAUTOFILL));
+            jtx::Seq(jtx::kAutofill),
+            Fee(jtx::kAutofill),
+            Sig(jtx::kAutofill));
         require(Flags(account, asfDefaultRipple));
     }
     else
     {
         apply(
             pay(master, account, amount),
-            jtx::Seq(jtx::kAUTOFILL),
-            Fee(jtx::kAUTOFILL),
-            Sig(jtx::kAUTOFILL));
+            jtx::Seq(jtx::kAutofill),
+            Fee(jtx::kAutofill),
+            Sig(jtx::kAutofill));
         require(Nflags(account, asfDefaultRipple));
     }
     require(jtx::Balance(account, amount));
@@ -331,14 +331,14 @@ Env::trust(STAmount const& amount, Account const& account)
     auto const start = balance(account);
     apply(
         jtx::trust(account, amount),
-        jtx::Seq(jtx::kAUTOFILL),
-        Fee(jtx::kAUTOFILL),
-        Sig(jtx::kAUTOFILL));
+        jtx::Seq(jtx::kAutofill),
+        Fee(jtx::kAutofill),
+        Sig(jtx::kAutofill));
     apply(
         pay(master, account, drops(current()->fees().base)),
-        jtx::Seq(jtx::kAUTOFILL),
-        Fee(jtx::kAUTOFILL),
-        Sig(jtx::kAUTOFILL));
+        jtx::Seq(jtx::kAutofill),
+        Fee(jtx::kAutofill),
+        Sig(jtx::kAutofill));
     test.expect(balance(account) == start);
 }
 
diff --git a/src/test/jtx/impl/Oracle.cpp b/src/test/jtx/impl/Oracle.cpp
index c59b4da8f8..991c84fc18 100644
--- a/src/test/jtx/impl/Oracle.cpp
+++ b/src/test/jtx/impl/Oracle.cpp
@@ -39,7 +39,7 @@ Oracle::Oracle(Env& env, CreateArg const& arg, bool submit) : env_(env)
     // on testStartTime since XRPL epoch.
     auto const now = env_.timeKeeper().now();
     if (now.time_since_epoch().count() == 0 || arg.close)
-        env_.close(now + kTEST_START_TIME - kEPOCH_OFFSET);
+        env_.close(now + kTestStartTime - kEpochOffset);
     if (arg.owner)
         owner_ = *arg.owner;
     if (arg.documentID && validDocumentID(*arg.documentID))
@@ -191,7 +191,7 @@ Oracle::aggregatePrice(
         toJson(jv[jss::time_threshold], *timeThreshold);
     // Convert "%None%" to None
     auto str = to_string(jv);
-    str = boost::regex_replace(str, boost::regex(kNONE_PATTERN), kUNQUOTED_NONE);
+    str = boost::regex_replace(str, boost::regex(kNonePattern), kUnquotedNone);
     auto jr = env.rpc("json", "get_aggregate_price", str);
 
     if (jr.isObject())
@@ -256,7 +256,7 @@ Oracle::set(UpdateArg const& arg)
         if (std::holds_alternative<std::uint32_t>(*arg.lastUpdateTime))
         {
             jv[jss::LastUpdateTime] =
-                to_string(kTEST_START_TIME.count() + std::get<std::uint32_t>(*arg.lastUpdateTime));
+                to_string(kTestStartTime.count() + std::get<std::uint32_t>(*arg.lastUpdateTime));
         }
         else
         {
@@ -267,7 +267,7 @@ Oracle::set(UpdateArg const& arg)
     {
         jv[jss::LastUpdateTime] = to_string(
             duration_cast<seconds>(env_.current()->header().closeTime.time_since_epoch()).count() +
-            kEPOCH_OFFSET.count());
+            kEpochOffset.count());
     }
     json::Value dataSeries(json::ValueType::Array);
     auto assetToStr = [](std::string const& s) {
@@ -351,7 +351,7 @@ Oracle::ledgerEntry(
     }
     // Convert "%None%" to None
     auto str = to_string(jvParams);
-    str = boost::regex_replace(str, boost::regex(kNONE_PATTERN), kUNQUOTED_NONE);
+    str = boost::regex_replace(str, boost::regex(kNonePattern), kUnquotedNone);
     auto jr = env.rpc("json", "ledger_entry", str);
 
     if (jr.isObject())
diff --git a/src/test/jtx/impl/TestHelpers.cpp b/src/test/jtx/impl/TestHelpers.cpp
index 0e465d1732..3e65410825 100644
--- a/src/test/jtx/impl/TestHelpers.cpp
+++ b/src/test/jtx/impl/TestHelpers.cpp
@@ -193,7 +193,7 @@ findPathsRequest(
     using namespace jtx;
 
     auto& app = env.app();
-    Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
+    Resource::Charge loadType = Resource::kFeeReferenceRpc;
     Resource::Consumer c;
 
     RPC::JsonContext context{
@@ -206,7 +206,7 @@ findPathsRequest(
          .role = Role::USER,
          .coro = {},
          .infoSub = {},
-         .apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED},
+         .apiVersion = RPC::kApiVersionIfUnspecified},
         {},
         {}};
 
@@ -262,7 +262,7 @@ findPaths(
 
     STAmount da;
     if (result.isMember(jss::destination_amount))
-        da = amountFromJson(kSF_GENERIC, result[jss::destination_amount]);
+        da = amountFromJson(kSfGeneric, result[jss::destination_amount]);
 
     STAmount sa;
     STPathSet paths;
@@ -274,10 +274,10 @@ findPaths(
             auto const& path = alts[0u];
 
             if (path.isMember(jss::source_amount))
-                sa = amountFromJson(kSF_GENERIC, path[jss::source_amount]);
+                sa = amountFromJson(kSfGeneric, path[jss::source_amount]);
 
             if (path.isMember(jss::destination_amount))
-                da = amountFromJson(kSF_GENERIC, path[jss::destination_amount]);
+                da = amountFromJson(kSfGeneric, path[jss::destination_amount]);
 
             if (path.isMember(jss::paths_computed))
             {
@@ -332,7 +332,7 @@ PrettyAmount
 xrpMinusFee(Env const& env, std::int64_t xrpAmount)
 {
     auto feeDrops = env.current()->fees().base;
-    return drops(kJTX_DROPS_PER_XRP * xrpAmount - feeDrops);
+    return drops(kJtxDropsPerXrp * xrpAmount - feeDrops);
 };
 
 [[nodiscard]] bool
diff --git a/src/test/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp
index 873eab1a6a..b07703dace 100644
--- a/src/test/jtx/impl/amount.cpp
+++ b/src/test/jtx/impl/amount.cpp
@@ -50,7 +50,7 @@ operator<<(std::ostream& os, PrettyAmount const& amount)
             if (issue.native())
             {
                 // measure in hundredths
-                auto const c = kJTX_DROPS_PER_XRP.drops() / 100;
+                auto const c = kJtxDropsPerXrp.drops() / 100;
                 auto const n = amount.value().mantissa();
                 if (n < c)
                 {
@@ -65,7 +65,7 @@ operator<<(std::ostream& os, PrettyAmount const& amount)
                 }
                 else
                 {
-                    auto const d = double(n) / kJTX_DROPS_PER_XRP.drops();
+                    auto const d = double(n) / kJtxDropsPerXrp.drops();
                     if (amount.value().negative())
                     {
                         os << "-";
@@ -117,6 +117,6 @@ operator<<(std::ostream& os, MPT const& mpt)
     return os;
 }
 
-AnyT const kANY{};
+AnyT const kAny{};
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/impl/balance.cpp b/src/test/jtx/impl/balance.cpp
index 1290888ab6..ddb45a8a97 100644
--- a/src/test/jtx/impl/balance.cpp
+++ b/src/test/jtx/impl/balance.cpp
@@ -18,12 +18,12 @@ namespace xrpl::test::jtx {
     ((cond) ? (env.test.pass(), true) : (env.test.fail((reason), __FILE__, __LINE__), false))
 
 void
-doBalance(Env& env, AccountID const& account, bool kNONE, STAmount const& value, Issue const& issue)
+doBalance(Env& env, AccountID const& account, bool kNone, STAmount const& value, Issue const& issue)
 {
     if (isXRP(issue))
     {
         auto const sle = env.le(keylet::account(account));
-        if (kNONE)
+        if (kNone)
         {
             TEST_EXPECT(!sle);
         }
@@ -37,7 +37,7 @@ doBalance(Env& env, AccountID const& account, bool kNONE, STAmount const& value,
     else
     {
         auto const sle = env.le(keylet::line(account, issue));
-        if (kNONE)
+        if (kNone)
         {
             TEST_EXPECT(!sle);
         }
@@ -56,12 +56,12 @@ void
 doBalance(
     Env& env,
     AccountID const& account,
-    bool kNONE,
+    bool kNone,
     STAmount const& value,
     MPTIssue const& mptIssue)
 {
     auto const sle = env.le(keylet::mptoken(mptIssue.getMptID(), account));
-    if (kNONE)
+    if (kNone)
     {
         TEST_EXPECT(!sle);
     }
diff --git a/src/test/jtx/impl/envconfig.cpp b/src/test/jtx/impl/envconfig.cpp
index 474a16165a..648f8e4460 100644
--- a/src/test/jtx/impl/envconfig.cpp
+++ b/src/test/jtx/impl/envconfig.cpp
@@ -100,14 +100,14 @@ singleThreadIo(std::unique_ptr<Config> cfg)
     return cfg;
 }
 
-auto constexpr kDEFAULTSEED = "shUwVw52ofnCUX5m7kPTKzJdr4HEH";
+constexpr auto kDefaultSeed = "shUwVw52ofnCUX5m7kPTKzJdr4HEH";
 
 std::unique_ptr<Config>
 validator(std::unique_ptr<Config> cfg, std::string const& seed)
 {
     // If the config has valid validation keys then we run as a validator.
     cfg->section(SECTION_VALIDATION_SEED)
-        .append(std::vector<std::string>{seed.empty() ? kDEFAULTSEED : seed});
+        .append(std::vector<std::string>{seed.empty() ? kDefaultSeed : seed});
     return cfg;
 }
 
diff --git a/src/test/jtx/impl/xchain_bridge.cpp b/src/test/jtx/impl/xchain_bridge.cpp
index dbd5e7de81..a88535a51e 100644
--- a/src/test/jtx/impl/xchain_bridge.cpp
+++ b/src/test/jtx/impl/xchain_bridge.cpp
@@ -379,15 +379,15 @@ XChainBridgeObjects::XChainBridgeObjects()
     , scuGw("scuGw")
     , mcUSD(mcGw["USD"])
     , scUSD(scGw["USD"])
-    , jvXRPBridgeRPC(bridgeRpc(mcDoor, xrpIssue(), Account::kMASTER, xrpIssue()))
-    , jvb(bridge(mcDoor, xrpIssue(), Account::kMASTER, xrpIssue()))
-    , jvub(bridge(mcuDoor, xrpIssue(), Account::kMASTER, xrpIssue()))
+    , jvXRPBridgeRPC(bridgeRpc(mcDoor, xrpIssue(), Account::kMaster, xrpIssue()))
+    , jvb(bridge(mcDoor, xrpIssue(), Account::kMaster, xrpIssue()))
+    , jvub(bridge(mcuDoor, xrpIssue(), Account::kMaster, xrpIssue()))
     , features(testableAmendments() | FeatureBitset{featureXChainBridge})
     , signers([] {
-        constexpr int kNUM_SIGNERS = kUT_XCHAIN_DEFAULT_NUM_SIGNERS;
+        static constexpr int kNumSigners = kUtXchainDefaultNumSigners;
         std::vector<Signer> result;
-        result.reserve(kNUM_SIGNERS);
-        for (int i = 0; i < kNUM_SIGNERS; ++i)
+        result.reserve(kNumSigners);
+        for (int i = 0; i < kNumSigners; ++i)
         {
             using namespace std::literals;
             auto const a = Account(
@@ -397,10 +397,10 @@ XChainBridgeObjects::XChainBridgeObjects()
         return result;
     }())
     , alt_signers([] {
-        constexpr int kNUM_SIGNERS = kUT_XCHAIN_DEFAULT_NUM_SIGNERS;
+        static constexpr int kNumSigners = kUtXchainDefaultNumSigners;
         std::vector<Signer> result;
-        result.reserve(kNUM_SIGNERS);
-        for (int i = 0; i < kNUM_SIGNERS; ++i)
+        result.reserve(kNumSigners);
+        for (int i = 0; i < kNumSigners; ++i)
         {
             using namespace std::literals;
             auto const a = Account(
@@ -431,18 +431,15 @@ XChainBridgeObjects::XChainBridgeObjects()
         return r;
     }())
     , reward(XRP(1))
-    , split_reward_quorum(divide(reward, STAmount(kUT_XCHAIN_DEFAULT_QUORUM), reward.get<Issue>()))
+    , split_reward_quorum(divide(reward, STAmount(kUtXchainDefaultQuorum), reward.get<Issue>()))
     , split_reward_everyone(
-          divide(reward, STAmount(kUT_XCHAIN_DEFAULT_NUM_SIGNERS), reward.get<Issue>()))
+          divide(reward, STAmount(kUtXchainDefaultNumSigners), reward.get<Issue>()))
     , tiny_reward(drops(37))
     , tiny_reward_split(
-          (divide(tiny_reward, STAmount(kUT_XCHAIN_DEFAULT_QUORUM), tiny_reward.get<Issue>())))
+          (divide(tiny_reward, STAmount(kUtXchainDefaultQuorum), tiny_reward.get<Issue>())))
     , tiny_reward_remainder(
           tiny_reward -
-          multiply(
-              tiny_reward_split,
-              STAmount(kUT_XCHAIN_DEFAULT_QUORUM),
-              tiny_reward.get<Issue>()))
+          multiply(tiny_reward_split, STAmount(kUtXchainDefaultQuorum), tiny_reward.get<Issue>()))
     , one_xrp(XRP(1))
     , xrp_dust(divide(one_xrp, STAmount(10000), one_xrp.get<Issue>()))
 {
@@ -472,13 +469,13 @@ XChainBridgeObjects::createScBridgeObjects(Env& scEnv)
     scEnv.fund(xrpFunds, scDoor, scAlice, scBob, scCarol, scGw, scAttester, scReward);
 
     // Signer's list must match the attestation signers
-    scEnv(jtx::signers(Account::kMASTER, signers.size(), signers));
+    scEnv(jtx::signers(Account::kMaster, signers.size(), signers));
 
     // create XRP bridges in both direction
     auto const reward = XRP(1);
     STAmount const minCreate = XRP(20);
 
-    scEnv(bridgeCreate(Account::kMASTER, jvb, reward, minCreate));
+    scEnv(bridgeCreate(Account::kMaster, jvb, reward, minCreate));
     scEnv.close();
 }
 
diff --git a/src/test/jtx/mpt.h b/src/test/jtx/mpt.h
index 9dec95a2a2..c8a65d7541 100644
--- a/src/test/jtx/mpt.h
+++ b/src/test/jtx/mpt.h
@@ -13,7 +13,7 @@ namespace xrpl::test::jtx {
 
 class MPTTester;
 
-auto const kMPT_DEX_FLAGS = tfMPTCanTrade | tfMPTCanTransfer;
+auto const kMptDexFlags = tfMPTCanTrade | tfMPTCanTransfer;
 
 // Check flags settings on MPT create
 class MptFlags
@@ -103,7 +103,7 @@ struct MPTInit
     // create MPTIssuanceID if seated and follow rules for MPTCreate args
     std::optional<MPTCreate> create = std::nullopt;
 };
-static MPTInit const kMPT_INIT_NO_FUND{.fund = false};
+static MPTInit const kMptInitNoFund{.fund = false};
 
 struct MPTInitDef
 {
@@ -112,7 +112,7 @@ struct MPTInitDef
     Holders holders = {};  // NOLINT(readability-redundant-member-init)
     std::uint16_t transferFee = 0;
     std::optional<std::uint64_t> pay = std::nullopt;
-    std::uint32_t flags = kMPT_DEX_FLAGS;
+    std::uint32_t flags = kMptDexFlags;
     std::optional<std::uint32_t> mutableFlags = std::nullopt;
     bool authHolder = false;
     bool fund = false;
diff --git a/src/test/jtx/multisign.h b/src/test/jtx/multisign.h
index 62da7f65bc..3fef2ab446 100644
--- a/src/test/jtx/multisign.h
+++ b/src/test/jtx/multisign.h
@@ -46,7 +46,7 @@ public:
     SField const* const subField = nullptr;
     /// Used solely as a convenience placeholder for ctors that do _not_ specify
     /// a subfield.
-    static constexpr SField* const kTOP_LEVEL = nullptr;
+    static constexpr SField const* kTopLevel = nullptr;
 
     Msig(SField const* subField, std::vector<Reg> signers)
         : signers(std::move(signers)), subField(subField)
@@ -58,7 +58,7 @@ public:
     {
     }
 
-    Msig(std::vector<Reg> signers) : Msig(kTOP_LEVEL, signers)
+    Msig(std::vector<Reg> signers) : Msig(kTopLevel, signers)
     {
     }
 
@@ -84,7 +84,7 @@ public:
         requires(std::convertible_to<AccountType, Reg> && !std::is_same_v<AccountType, SField*>)
     explicit Msig(AccountType&& a0, Accounts&&... aN)
         : Msig{
-              kTOP_LEVEL,
+              kTopLevel,
               std::vector<Reg>{std::forward<AccountType>(a0), std::forward<Accounts>(aN)...}}
     {
     }
diff --git a/src/test/jtx/sig.h b/src/test/jtx/sig.h
index 374f106684..e88785ef15 100644
--- a/src/test/jtx/sig.h
+++ b/src/test/jtx/sig.h
@@ -26,7 +26,7 @@ private:
     std::optional<Account> account_;
     /// Used solely as a convenience placeholder for ctors that do _not_ specify
     /// a subfield.
-    static constexpr SField* const kTOP_LEVEL = nullptr;
+    static constexpr SField const* kTopLevel = nullptr;
 
 public:
     explicit Sig(AutofillT) : manual_(false)
@@ -46,7 +46,7 @@ public:
     {
     }
 
-    explicit Sig(Account const& account) : Sig(kTOP_LEVEL, account)
+    explicit Sig(Account const& account) : Sig(kTopLevel, account)
     {
     }
 
diff --git a/src/test/jtx/tags.h b/src/test/jtx/tags.h
index 66cf3b6ef7..4f4afbd1fa 100644
--- a/src/test/jtx/tags.h
+++ b/src/test/jtx/tags.h
@@ -6,19 +6,19 @@ struct NoneT
 {
     NoneT() = default;
 };
-static NoneT const kNONE;
+static NoneT const kNone;
 
 struct AutofillT
 {
     AutofillT() = default;
 };
-static AutofillT const kAUTOFILL;
+static AutofillT const kAutofill;
 
 struct DisabledT
 {
     DisabledT() = default;
 };
-static DisabledT const kDISABLED;
+static DisabledT const kDisabled;
 
 /** Used for Fee() calls that use an owner reserve increment */
 struct IncrementT
@@ -26,6 +26,6 @@ struct IncrementT
     IncrementT() = default;
 };
 
-static IncrementT const kINCREMENT;
+static IncrementT const kIncrement;
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/xchain_bridge.h b/src/test/jtx/xchain_bridge.h
index fc2665672f..c20b6f2fc5 100644
--- a/src/test/jtx/xchain_bridge.h
+++ b/src/test/jtx/xchain_bridge.h
@@ -12,8 +12,8 @@ namespace xrpl::test::jtx {
 
 using JValueVec = std::vector<json::Value>;
 
-constexpr std::size_t kUT_XCHAIN_DEFAULT_NUM_SIGNERS = 5;
-constexpr std::size_t kUT_XCHAIN_DEFAULT_QUORUM = 4;
+constexpr std::size_t kUtXchainDefaultNumSigners = 5;
+constexpr std::size_t kUtXchainDefaultQuorum = 4;
 
 json::Value
 bridge(
@@ -110,7 +110,7 @@ claimAttestations(
     std::uint64_t claimID,
     std::optional<jtx::Account> const& dst,
     std::vector<jtx::Signer> const& signers,
-    std::size_t const numAtts = kUT_XCHAIN_DEFAULT_QUORUM,
+    std::size_t const numAtts = kUtXchainDefaultQuorum,
     std::size_t const fromIdx = 0);
 
 JValueVec
@@ -125,7 +125,7 @@ createAccountAttestations(
     std::uint64_t createCount,
     jtx::Account const& dst,
     std::vector<jtx::Signer> const& signers,
-    std::size_t const numAtts = kUT_XCHAIN_DEFAULT_QUORUM,
+    std::size_t const numAtts = kUtXchainDefaultQuorum,
     std::size_t const fromIdx = 0);
 
 struct XChainBridgeObjects
@@ -168,7 +168,7 @@ struct XChainBridgeObjects
     std::vector<Signer> const alt_signers;
     std::vector<Account> const payee;
     std::vector<Account> const payees;
-    std::uint32_t const quorum{kUT_XCHAIN_DEFAULT_QUORUM};
+    std::uint32_t const quorum{kUtXchainDefaultQuorum};
 
     STAmount const reward;                 // 1 xrp
     STAmount const split_reward_quorum;    // 250,000 drops
@@ -181,7 +181,7 @@ struct XChainBridgeObjects
     STAmount const one_xrp;
     STAmount const xrp_dust;
 
-    static constexpr int kDROP_PER_XRP = 1000000;
+    static constexpr int kDropPerXrp = 1000000;
 
     XChainBridgeObjects();
 
diff --git a/src/test/ledger/Directory_test.cpp b/src/test/ledger/Directory_test.cpp
index 4f3c94f695..a207b83f30 100644
--- a/src/test/ledger/Directory_test.cpp
+++ b/src/test/ledger/Directory_test.cpp
@@ -137,8 +137,8 @@ struct Directory_test : public beast::unit_test::Suite
 
                 // Ensure that the page contains the correct orders by
                 // calculating which sequence numbers belong here.
-                std::uint32_t const minSeq = firstOfferSeq + (page * kDIR_NODE_MAX_ENTRIES);
-                std::uint32_t const maxSeq = minSeq + kDIR_NODE_MAX_ENTRIES;
+                std::uint32_t const minSeq = firstOfferSeq + (page * kDirNodeMaxEntries);
+                std::uint32_t const maxSeq = minSeq + kDirNodeMaxEntries;
 
                 for (auto const& e : v)
                 {
@@ -189,14 +189,14 @@ struct Directory_test : public beast::unit_test::Suite
         env.close();
         BEAST_EXPECT(!dirIsEmpty(*env.closed(), keylet::ownerDir(alice)));
 
-        env(signers(alice, jtx::kNONE));
+        env(signers(alice, jtx::kNone));
         env.close();
         BEAST_EXPECT(dirIsEmpty(*env.closed(), keylet::ownerDir(alice)));
 
         std::vector<IOU> const currencies = [this, &gw]() {
             std::vector<IOU> c;
 
-            c.reserve((2 * kDIR_NODE_MAX_ENTRIES) + 3);
+            c.reserve((2 * kDirNodeMaxEntries) + 3);
 
             while (c.size() != c.capacity())
                 c.push_back(gw[currcode(c.size())]);
@@ -295,7 +295,7 @@ struct Directory_test : public beast::unit_test::Suite
         // Fill up three pages of offers
         for (int i = 0; i < 3; ++i)
         {
-            for (int j = 0; j < kDIR_NODE_MAX_ENTRIES; ++j)
+            for (int j = 0; j < kDirNodeMaxEntries; ++j)
                 env(offer(alice, XRP(1), usd(1)));
         }
         env.close();
@@ -303,9 +303,9 @@ struct Directory_test : public beast::unit_test::Suite
         // remove all the offers. Remove the middle page last
         for (auto page : {0, 2, 1})
         {
-            for (int i = 0; i < kDIR_NODE_MAX_ENTRIES; ++i)
+            for (int i = 0; i < kDirNodeMaxEntries; ++i)
             {
-                env(offerCancel(alice, firstOfferSeq + (page * kDIR_NODE_MAX_ENTRIES) + i));
+                env(offerCancel(alice, firstOfferSeq + (page * kDirNodeMaxEntries) + i));
                 env.close();
             }
         }
@@ -346,54 +346,54 @@ struct Directory_test : public beast::unit_test::Suite
         env.fund(XRP(10000), alice);
         env.close();
 
-        constexpr uint256 kBASE("fb71c9aa3310141da4b01d6c744a98286af2d72ab5448d5adc0910ca0c910880");
+        constexpr uint256 kBase("fb71c9aa3310141da4b01d6c744a98286af2d72ab5448d5adc0910ca0c910880");
 
-        constexpr uint256 kITEM("bad0f021aa3b2f6754a8fe82a5779730aa0bbbab82f17201ef24900efc2c7312");
+        constexpr uint256 kItem("bad0f021aa3b2f6754a8fe82a5779730aa0bbbab82f17201ef24900efc2c7312");
 
         {
             // Create a chain of three pages:
             Sandbox sb(env.closed().get(), TapNone);
-            makePages(sb, kBASE, 3);
+            makePages(sb, kBase, 3);
 
             // Insert an item in the middle page:
             {
-                auto p = sb.peek(keylet::page(kBASE, 1));
+                auto p = sb.peek(keylet::page(kBase, 1));
                 BEAST_EXPECT(p);
 
                 STVector256 v;
-                v.pushBack(kITEM);
+                v.pushBack(kItem);
                 p->setFieldV256(sfIndexes, v);
                 sb.update(p);
             }
 
             // Now, try to delete the item from the middle
             // page. This should cause all pages to be deleted:
-            BEAST_EXPECT(sb.dirRemove(keylet::page(kBASE, 0), 1, keylet::unchecked(kITEM), false));
-            BEAST_EXPECT(!sb.peek(keylet::page(kBASE, 2)));
-            BEAST_EXPECT(!sb.peek(keylet::page(kBASE, 1)));
-            BEAST_EXPECT(!sb.peek(keylet::page(kBASE, 0)));
+            BEAST_EXPECT(sb.dirRemove(keylet::page(kBase, 0), 1, keylet::unchecked(kItem), false));
+            BEAST_EXPECT(!sb.peek(keylet::page(kBase, 2)));
+            BEAST_EXPECT(!sb.peek(keylet::page(kBase, 1)));
+            BEAST_EXPECT(!sb.peek(keylet::page(kBase, 0)));
         }
 
         {
             // Create a chain of four pages:
             Sandbox sb(env.closed().get(), TapNone);
-            makePages(sb, kBASE, 4);
+            makePages(sb, kBase, 4);
 
             // Now add items on pages 1 and 2:
             {
-                auto p1 = sb.peek(keylet::page(kBASE, 1));
+                auto p1 = sb.peek(keylet::page(kBase, 1));
                 BEAST_EXPECT(p1);
 
                 STVector256 v1;
-                v1.pushBack(~kITEM);
+                v1.pushBack(~kItem);
                 p1->setFieldV256(sfIndexes, v1);
                 sb.update(p1);
 
-                auto p2 = sb.peek(keylet::page(kBASE, 2));
+                auto p2 = sb.peek(keylet::page(kBase, 2));
                 BEAST_EXPECT(p2);
 
                 STVector256 v2;
-                v2.pushBack(kITEM);
+                v2.pushBack(kItem);
                 p2->setFieldV256(sfIndexes, v2);
                 sb.update(p2);
             }
@@ -401,16 +401,16 @@ struct Directory_test : public beast::unit_test::Suite
             // Now, try to delete the item from page 2.
             // This should cause pages 2 and 3 to be
             // deleted:
-            BEAST_EXPECT(sb.dirRemove(keylet::page(kBASE, 0), 2, keylet::unchecked(kITEM), false));
-            BEAST_EXPECT(!sb.peek(keylet::page(kBASE, 3)));
-            BEAST_EXPECT(!sb.peek(keylet::page(kBASE, 2)));
+            BEAST_EXPECT(sb.dirRemove(keylet::page(kBase, 0), 2, keylet::unchecked(kItem), false));
+            BEAST_EXPECT(!sb.peek(keylet::page(kBase, 3)));
+            BEAST_EXPECT(!sb.peek(keylet::page(kBase, 2)));
 
-            auto p1 = sb.peek(keylet::page(kBASE, 1));
+            auto p1 = sb.peek(keylet::page(kBase, 1));
             BEAST_EXPECT(p1);
             BEAST_EXPECT(p1->getFieldU64(sfIndexNext) == 0);
             BEAST_EXPECT(p1->getFieldU64(sfIndexPrevious) == 0);
 
-            auto p0 = sb.peek(keylet::page(kBASE, 0));
+            auto p0 = sb.peek(keylet::page(kBase, 0));
             BEAST_EXPECT(p0);
             BEAST_EXPECT(p0->getFieldU64(sfIndexNext) == 1);
             BEAST_EXPECT(p0->getFieldU64(sfIndexPrevious) == 1);
@@ -569,13 +569,13 @@ struct Directory_test : public beast::unit_test::Suite
             testableAmendments() - fixDirectoryLimit,
             [this](Env&) -> std::tuple<std::uint64_t, bool> {
                 testcase("directory full without fixDirectoryLimit");
-                return {kDIR_NODE_MAX_PAGES - 1, true};
+                return {kDirNodeMaxPages - 1, true};
             });
         testCase(
             testableAmendments(),  //
             [this](Env&) -> std::tuple<std::uint64_t, bool> {
                 testcase("directory not full with fixDirectoryLimit");
-                return {kDIR_NODE_MAX_PAGES - 1, false};
+                return {kDirNodeMaxPages - 1, false};
             });
         testCase(
             testableAmendments(),  //
diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp
index a100b4a51d..f59b75091a 100644
--- a/src/test/ledger/PaymentSandbox_test.cpp
+++ b/src/test/ledger/PaymentSandbox_test.cpp
@@ -87,7 +87,7 @@ class PaymentSandbox_test : public beast::unit_test::Suite
 
         PathSet const paths(TestPath(gw1, usdGw2, gw2), TestPath(gw2, usdGw1, gw1));
 
-        env(pay(snd, rcv, kANY(usdGw1(4))),
+        env(pay(snd, rcv, kAny(usdGw1(4))),
             Json(paths.json()),
             Txflags(tfNoRippleDirect | tfPartialPayment));
 
@@ -307,9 +307,9 @@ class PaymentSandbox_test : public beast::unit_test::Suite
 
         auto const issue = usd;
         STAmount const tinyAmt(
-            issue, STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET + 1, false, STAmount::Unchecked{});
+            issue, STAmount::kMinValue, STAmount::kMinOffset + 1, false, STAmount::Unchecked{});
         STAmount const hugeAmt(
-            issue, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET - 1, false, STAmount::Unchecked{});
+            issue, STAmount::kMaxValue, STAmount::kMaxOffset - 1, false, STAmount::Unchecked{});
 
         ApplyViewImpl av(&*env.current(), TapNone);
         PaymentSandbox pv(&av);
@@ -354,7 +354,7 @@ class PaymentSandbox_test : public beast::unit_test::Suite
                 auto r = accountSend(sb, alice, xrpAccount(), XRP(100), env.journal);
                 BEAST_EXPECT(isTesSuccess(r));
             }
-            BEAST_EXPECT(accountFundsXRP(sb, alice, env.journal) == beast::kZERO);
+            BEAST_EXPECT(accountFundsXRP(sb, alice, env.journal) == beast::kZero);
         }
     }
 
diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp
index dd4ebd27fd..fe671ed128 100644
--- a/src/test/ledger/SkipList_test.cpp
+++ b/src/test/ledger/SkipList_test.cpp
@@ -23,7 +23,7 @@ class SkipList_test : public beast::unit_test::Suite
         {
             Config const config;
             auto prev = std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{config.features},
                 config.FEES.toFees(),
                 std::vector<uint256>{},
diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp
index 4b65193f8e..1714702c18 100644
--- a/src/test/ledger/View_test.cpp
+++ b/src/test/ledger/View_test.cpp
@@ -151,7 +151,7 @@ class View_test : public beast::unit_test::Suite
         Env env(*this);
         Config const config;
         std::shared_ptr<Ledger const> const genesis = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
@@ -419,7 +419,7 @@ class View_test : public beast::unit_test::Suite
         Env env(*this);
         Config const config;
         std::shared_ptr<Ledger const> const genesis = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
@@ -628,7 +628,7 @@ class View_test : public beast::unit_test::Suite
         Env env(*this);
         Config const config;
         std::shared_ptr<Ledger const> const genesis = std::make_shared<Ledger>(
-            kCREATE_GENESIS,
+            kCreateGenesis,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
@@ -935,7 +935,7 @@ class View_test : public beast::unit_test::Suite
 
         auto rdView = env.closed();
         // Test with no rate set on gw1.
-        BEAST_EXPECT(transferRate(*rdView, gw1) == kPARITY_RATE);
+        BEAST_EXPECT(transferRate(*rdView, gw1) == kParityRate);
 
         env(rate(gw1, 1.02));
         env.close();
@@ -1018,7 +1018,7 @@ class View_test : public beast::unit_test::Suite
             Env env(*this);
             Config const config;
             std::shared_ptr<Ledger const> const genesis = std::make_shared<Ledger>(
-                kCREATE_GENESIS,
+                kCreateGenesis,
                 Rules{config.features},
                 config.FEES.toFees(),
                 std::vector<uint256>{},
diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp
index d0445cc1ab..5565399cc2 100644
--- a/src/test/nodestore/Basics_test.cpp
+++ b/src/test/nodestore/Basics_test.cpp
@@ -21,13 +21,13 @@ public:
     {
         testcase("batch");
 
-        auto batch1 = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue);
+        auto batch1 = createPredictableBatch(kNumObjectsToTest, seedValue);
 
-        auto batch2 = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue);
+        auto batch2 = createPredictableBatch(kNumObjectsToTest, seedValue);
 
         BEAST_EXPECT(areBatchesEqual(batch1, batch2));
 
-        auto batch3 = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue + 1);
+        auto batch3 = createPredictableBatch(kNumObjectsToTest, seedValue + 1);
 
         BEAST_EXPECT(!areBatchesEqual(batch1, batch3));
     }
@@ -38,7 +38,7 @@ public:
     {
         testcase("encoding");
 
-        auto batch = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue);
+        auto batch = createPredictableBatch(kNumObjectsToTest, seedValue);
 
         for (int i = 0; i < batch.size(); ++i)
         {
diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp
index f06e2e6c47..744717659a 100644
--- a/src/test/nodestore/Database_test.cpp
+++ b/src/test/nodestore/Database_test.cpp
@@ -536,7 +536,7 @@ public:
         srcParams.set("path", nodeDb.path());
 
         // Create a batch
-        auto batch = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue);
+        auto batch = createPredictableBatch(kNumObjectsToTest, seedValue);
 
         // Write to source db
         {
@@ -647,7 +647,7 @@ public:
             {
                 std::unique_ptr<Database> db = Manager::instance().makeDatabase(
                     megabytes(4), scheduler, 2, nodeParams, journal_);
-                BEAST_EXPECT(db->earliestLedgerSeq() == kXRP_LEDGER_EARLIEST_SEQ);
+                BEAST_EXPECT(db->earliestLedgerSeq() == kXrpLedgerEarliestSeq);
             }
 
             // Set an invalid earliest ledger sequence
@@ -676,7 +676,7 @@ public:
             try
             {
                 // Set to default earliest ledger sequence
-                nodeParams.set("earliest_seq", std::to_string(kXRP_LEDGER_EARLIEST_SEQ));
+                nodeParams.set("earliest_seq", std::to_string(kXrpLedgerEarliestSeq));
                 std::unique_ptr<Database> const db2 = Manager::instance().makeDatabase(
                     megabytes(4), scheduler, 2, nodeParams, journal_);
             }
diff --git a/src/test/nodestore/TestBase.h b/src/test/nodestore/TestBase.h
index 7cde0266ab..c35042bd4f 100644
--- a/src/test/nodestore/TestBase.h
+++ b/src/test/nodestore/TestBase.h
@@ -47,9 +47,9 @@ class TestBase : public beast::unit_test::Suite
 public:
     // Tunable parameters
     //
-    static std::size_t const kMIN_PAYLOAD_BYTES = 1;
-    static std::size_t const kMAX_PAYLOAD_BYTES = 2000;
-    static int const kNUM_OBJECTS_TO_TEST = 2000;
+    static std::size_t const kMinPayloadBytes = 1;
+    static std::size_t const kMaxPayloadBytes = 2000;
+    static int const kNumObjectsToTest = 2000;
 
 public:
     // Create a predictable batch of objects
@@ -83,7 +83,7 @@ public:
             uint256 hash;
             beast::rngfill(hash.begin(), hash.size(), rng);
 
-            Blob blob(randInt(rng, kMIN_PAYLOAD_BYTES, kMAX_PAYLOAD_BYTES));
+            Blob blob(randInt(rng, kMinPayloadBytes, kMaxPayloadBytes));
             beast::rngfill(blob.data(), blob.size(), rng);
 
             batch.push_back(NodeObject::createObject(type, std::move(blob), hash));
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index 6e4e6be37e..d7540f0b3a 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -77,10 +77,10 @@ rngcpy(void* buffer, std::size_t bytes, Generator& g)
 class Sequence
 {
 private:
-    static constexpr auto kMIN_LEDGER = 1;
-    static constexpr auto kMAX_LEDGER = 1000000;
-    static constexpr auto kMIN_SIZE = 250;
-    static constexpr auto kMAX_SIZE = 1250;
+    static constexpr auto kMinLedger = 1;
+    static constexpr auto kMaxLedger = 1000000;
+    static constexpr auto kMinSize = 250;
+    static constexpr auto kMaxSize = 1250;
 
     beast::xor_shift_engine gen_;
     std::uint8_t prefix_;
@@ -93,7 +93,7 @@ public:
         // uniform distribution over hotLEDGER - hotTRANSACTION_NODE
         // but exclude  hotTRANSACTION = 2 (removed)
         , d_type_({1, 1, 0, 1, 1})
-        , d_size_(kMIN_SIZE, kMAX_SIZE)
+        , d_size_(kMinSize, kMaxSize)
     {
     }
 
@@ -138,7 +138,7 @@ public:
 class Timing_test : public beast::unit_test::Suite
 {
 public:
-    static constexpr auto kMISSING_NODE_PERCENT = 20;  // percent of fetches for missing nodes
+    static constexpr auto kMissingNodePercent = 20;  // percent of fetches for missing nodes
 
     std::size_t const default_repeat = 3;
 #ifndef NDEBUG
@@ -462,7 +462,7 @@ public:
             {
                 try
                 {
-                    if (rand_(gen_) < kMISSING_NODE_PERCENT)
+                    if (rand_(gen_) < kMissingNodePercent)
                     {
                         auto const hash = seq2_.key(dist_(gen_));
                         std::shared_ptr<NodeObject> result;
diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp
index 0ef7b2314f..a80b5ccc93 100644
--- a/src/test/nodestore/import_test.cpp
+++ b/src/test/nodestore/import_test.cpp
@@ -253,7 +253,7 @@ std::map<std::string, std::string, boost::beast::iless>
 parseArgs(std::string const& s)
 {
     // <key> '=' <value>
-    static boost::regex const kRE1(
+    static boost::regex const kRe1(
         "^"                        // start of line
         "(?:\\s*)"                 // whitespace (optional)
         "([a-zA-Z][_a-zA-Z0-9]*)"  // <key>
@@ -269,7 +269,7 @@ parseArgs(std::string const& s)
     for (auto const& kv : v)
     {
         boost::smatch m;
-        if (!boost::regex_match(kv, m, kRE1))
+        if (!boost::regex_match(kv, m, kRe1))
             Throw<std::runtime_error>("invalid parameter " + kv);
         auto const result = map.emplace(m[1], m[2]);
         if (!result.second)
diff --git a/src/test/nodestore/varint_test.cpp b/src/test/nodestore/varint_test.cpp
index f45de568f3..68e88d831a 100644
--- a/src/test/nodestore/varint_test.cpp
+++ b/src/test/nodestore/varint_test.cpp
@@ -17,7 +17,7 @@ public:
         testcase("encode, decode");
         for (auto const v : vv)
         {
-            std::array<std::uint8_t, varint_traits<std::size_t>::kMAX> vi{};
+            std::array<std::uint8_t, varint_traits<std::size_t>::kMax> vi{};
             auto const n0 = writeVarint(vi.data(), v);
             expect(n0 > 0, "write error");
             expect(n0 == sizeVarint(v), "size error");
diff --git a/src/test/overlay/TMGetObjectByHash_test.cpp b/src/test/overlay/TMGetObjectByHash_test.cpp
index 83fc91ffbe..961e1b7eb4 100644
--- a/src/test/overlay/TMGetObjectByHash_test.cpp
+++ b/src/test/overlay/TMGetObjectByHash_test.cpp
@@ -213,7 +213,7 @@ class TMGetObjectByHash_test : public beast::unit_test::Suite
     void
     run() override
     {
-        int const limit = static_cast<int>(Tuning::kHARD_MAX_REPLY_NODES);
+        int const limit = static_cast<int>(Tuning::kHardMaxReplyNodes);
         testReplyLimit(limit + 1, limit);
         testReplyLimit(limit, limit);
         testReplyLimit(limit - 1, limit - 1);
diff --git a/src/test/overlay/compression_test.cpp b/src/test/overlay/compression_test.cpp
index 01ea14160e..adb3b1b27b 100644
--- a/src/test/overlay/compression_test.cpp
+++ b/src/test/overlay/compression_test.cpp
@@ -128,7 +128,7 @@ public:
         auto uncompressed = m.getBuffer(Compressed::Off);
         BEAST_EXPECT(
             std::equal(
-                uncompressed.begin() + xrpl::compression::kHEADER_BYTES,
+                uncompressed.begin() + xrpl::compression::kHeaderBytes,
                 uncompressed.end(),
                 decompressed.begin()));
     }
@@ -142,7 +142,7 @@ public:
         {
             auto master = randomKeyPair(KeyType::Ed25519);
             auto signing = randomKeyPair(KeyType::Ed25519);
-            STObject st(kSF_GENERIC);
+            STObject st(kSfGeneric);
             st[sfSequence] = i;
             st[sfPublicKey] = std::get<0>(master);
             st[sfSigningPubKey] = std::get<0>(signing);
@@ -299,7 +299,7 @@ public:
 
         auto master = randomKeyPair(KeyType::Ed25519);
         auto signing = randomKeyPair(KeyType::Ed25519);
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = 0;
         st[sfPublicKey] = std::get<0>(master);
         st[sfSigningPubKey] = std::get<0>(signing);
@@ -326,7 +326,7 @@ public:
 
         auto master = randomKeyPair(KeyType::Ed25519);
         auto signing = randomKeyPair(KeyType::Ed25519);
-        STObject st(kSF_GENERIC);
+        STObject st(kSfGeneric);
         st[sfSequence] = 0;
         st[sfPublicKey] = std::get<0>(master);
         st[sfSigningPubKey] = std::get<0>(signing);
@@ -432,7 +432,7 @@ public:
             // inbound is enabled if the request's header has the feature
             // enabled and the peer's configuration is enabled
             auto const inboundEnabled =
-                peerFeatureEnabled(httpRequest, kFEATURE_COMPR, "lz4", inboundEnable);
+                peerFeatureEnabled(httpRequest, kFeatureCompr, "lz4", inboundEnable);
             BEAST_EXPECT(!(peerEnabled ^ inboundEnabled));
 
             env.reset();
@@ -442,7 +442,7 @@ public:
             // outbound is enabled if the response's header has the feature
             // enabled and the peer's configuration is enabled
             auto const outboundEnabled =
-                peerFeatureEnabled(httpResp, kFEATURE_COMPR, "lz4", outboundEnable);
+                peerFeatureEnabled(httpResp, kFeatureCompr, "lz4", outboundEnable);
             BEAST_EXPECT(!(peerEnabled ^ outboundEnabled));
         };
         handshake(1, 1);
diff --git a/src/test/overlay/reduce_relay_test.cpp b/src/test/overlay/reduce_relay_test.cpp
index 842e739fa6..a0afd01d2a 100644
--- a/src/test/overlay/reduce_relay_test.cpp
+++ b/src/test/overlay/reduce_relay_test.cpp
@@ -60,9 +60,9 @@ using SquelchCB = std::function<void(PublicKey const&, PeerWPtr const&, std::uin
 using UnsquelchCB = std::function<void(PublicKey const&, PeerWPtr const&)>;
 using LinkIterCB = std::function<void(Link&, MessageSPtr)>;
 
-static constexpr std::uint32_t kMAX_PEERS = 10;
-static constexpr std::uint32_t kMAX_VALIDATORS = 10;
-static constexpr std::uint32_t kMAX_MESSAGES = 200000;
+static constexpr std::uint32_t kMaxPeers = 10;
+static constexpr std::uint32_t kMaxValidators = 10;
+static constexpr std::uint32_t kMaxMessages = 200000;
 
 /** Simulate two entities - peer directly connected to the server
  * (via squelch in PeerSim) and PeerImp (via Overlay)
@@ -142,8 +142,8 @@ public:
     [[nodiscard]] uint256 const&
     getClosedLedgerHash() const override
     {
-        static uint256 const kHASH{};
-        return kHASH;
+        static uint256 const kHash{};
+        return kHash;
     }
     [[nodiscard]] bool
     hasLedger(uint256 const& hash, std::uint32_t seq) const override
@@ -205,25 +205,25 @@ public:
     static void
     advance(duration d) noexcept
     {
-        kNOW += d;
+        kNow += d;
     }
 
     static void
     randAdvance(milliseconds min, milliseconds max)
     {
-        kNOW += randDuration(min, max);
+        kNow += randDuration(min, max);
     }
 
     static void
     reset() noexcept
     {
-        kNOW = time_point(seconds(0));
+        kNow = time_point(seconds(0));
     }
 
     static time_point
     now() noexcept
     {
-        return kNOW;
+        return kNow;
     }
 
     static duration
@@ -235,7 +235,7 @@ public:
     explicit ManualClock() = default;
 
 private:
-    inline static time_point kNOW = time_point(seconds(0));
+    inline static time_point kNow = time_point(seconds(0));
 };
 
 /** Simulate server's OverlayImpl */
@@ -704,8 +704,8 @@ public:
     void
     init()
     {
-        validators_.resize(kMAX_VALIDATORS);
-        for (int p = 0; p < kMAX_PEERS; p++)
+        validators_.resize(kMaxValidators);
+        for (int p = 0; p < kMaxPeers; p++)
         {
             auto peer = overlay_.addPeer();
             for (auto& v : validators_)
@@ -749,7 +749,7 @@ public:
     void
     purgePeers()
     {
-        while (overlay_.getNumPeers() > kMAX_PEERS)
+        while (overlay_.getNumPeers() > kMaxPeers)
             deleteLastPeer();
     }
 
@@ -817,8 +817,8 @@ public:
     void
     propagate(
         LinkIterCB link,
-        std::uint16_t nValidators = kMAX_VALIDATORS,
-        std::uint32_t nMessages = kMAX_MESSAGES,
+        std::uint16_t nValidators = kMaxValidators,
+        std::uint32_t nMessages = kMaxMessages,
         bool purge = true,
         bool resetClock = true)
     {
@@ -1051,7 +1051,7 @@ protected:
                     auto d = reduce_relay::epoch<milliseconds>(now).count() -
                         std::get<3>(peers[event.peer]);
                     mustHandle = event.isSelected &&
-                        d > milliseconds(reduce_relay::kIDLED).count() &&
+                        d > milliseconds(reduce_relay::kIdled).count() &&
                         network_.overlay().inState(*event.key, reduce_relay::PeerState::Squelched) >
                             0 &&
                         peers.contains(event.peer);
@@ -1070,7 +1070,7 @@ protected:
             }
             if (event.state == State::WaitReset ||
                 (event.state == State::On &&
-                 (now - event.time > (reduce_relay::kIDLED + seconds(2)))))
+                 (now - event.time > (reduce_relay::kIdled + seconds(2)))))
             {
                 bool const handled = event.state == State::WaitReset || !event.handled;
                 BEAST_EXPECT(handled);
@@ -1163,13 +1163,12 @@ protected:
                 {
                     BEAST_EXPECT(
                         squelched ==
-                        kMAX_PEERS -
-                            env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
+                        kMaxPeers - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
                     n++;
                 }
             },
             1,
-            reduce_relay::kMAX_MESSAGE_THRESHOLD + 2,
+            reduce_relay::kMaxMessageThreshold + 2,
             purge,
             resetClock);
         auto selected = network_.overlay().getSelected(network_.validator(0));
@@ -1235,7 +1234,7 @@ protected:
                 id, [&](PublicKey const& key, PeerWPtr const& peer) { unsquelched++; });
             BEAST_EXPECT(
                 unsquelched ==
-                kMAX_PEERS - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
+                kMaxPeers - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
             BEAST_EXPECT(checkCounting(network_.validator(0), true));
         });
     }
@@ -1248,14 +1247,14 @@ protected:
         doTest("Selected Peer Stops Relaying", log, [this](bool log) {
             ManualClock::advance(seconds(601));
             BEAST_EXPECT(propagateAndSquelch(log, true, false));
-            ManualClock::advance(reduce_relay::kIDLED + seconds(1));
+            ManualClock::advance(reduce_relay::kIdled + seconds(1));
             std::uint16_t unsquelched = 0;
             network_.overlay().deleteIdlePeers(
                 [&](PublicKey const& key, PeerWPtr const& peer) { unsquelched++; });
             auto peers = network_.overlay().getPeers(network_.validator(0));
             BEAST_EXPECT(
                 unsquelched ==
-                kMAX_PEERS - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
+                kMaxPeers - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
             BEAST_EXPECT(checkCounting(network_.validator(0), true));
         });
     }
@@ -1433,7 +1432,7 @@ vp_base_squelch_max_selected_peers=2
             // bootup
             BEAST_EXPECT(!createSlots(true).baseSquelchReady());
 
-            ManualClock::advance(reduce_relay::kWAIT_ON_BOOTUP + minutes{1});
+            ManualClock::advance(reduce_relay::kWaitOnBootup + minutes{1});
 
             // base squelch enabled and bootup time passed
             BEAST_EXPECT(createSlots(true).baseSquelchReady());
@@ -1470,7 +1469,7 @@ vp_base_squelch_max_selected_peers=2
             peers = network_.overlay().getPeers(network_.validator(0));
             BEAST_EXPECT(std::get<1>(peers[0]) == (nMessages - 1));
             // advance the clock
-            ManualClock::advance(reduce_relay::kIDLED + seconds(1));
+            ManualClock::advance(reduce_relay::kIdled + seconds(1));
             network_.overlay().updateSlotAndSquelch(
                 key, network_.validator(0), 0, [&](PublicKey const&, PeerWPtr, std::uint32_t) {});
             peers = network_.overlay().getPeers(network_.validator(0));
@@ -1508,7 +1507,7 @@ vp_base_squelch_max_selected_peers=2
                 // to counting state and resets the counts of all peers +
                 // MAX_MESSAGE_THRESHOLD + 1 messages to reach the threshold
                 // and switch the slot's state to peer selection.
-                for (int m = 1; m <= reduce_relay::kMAX_MESSAGE_THRESHOLD + 2; m++)
+                for (int m = 1; m <= reduce_relay::kMaxMessageThreshold + 2; m++)
                 {
                     for (int peer = 0; peer < npeers; peer++)
                     {
@@ -1525,39 +1524,39 @@ vp_base_squelch_max_selected_peers=2
             };
 
             using namespace reduce_relay;
-            // expect max duration less than kMAX_UNSQUELCH_EXPIRE_DEFAULT with
+            // expect max duration less than kMaxUnsquelchExpireDefault with
             // less than or equal to 60 peers
             run(20);
             BEAST_EXPECT(
-                handler.maxDuration >= kMIN_UNSQUELCH_EXPIRE.count() &&
-                handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_DEFAULT.count());
+                handler.maxDuration >= kMinUnsquelchExpire.count() &&
+                handler.maxDuration <= kMaxUnsquelchExpireDefault.count());
             run(60);
             BEAST_EXPECT(
-                handler.maxDuration >= kMIN_UNSQUELCH_EXPIRE.count() &&
-                handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_DEFAULT.count());
-            // expect max duration greater than kMIN_UNSQUELCH_EXPIRE and less
-            // than kMAX_UNSQUELCH_EXPIRE_PEERS with peers greater than 60
+                handler.maxDuration >= kMinUnsquelchExpire.count() &&
+                handler.maxDuration <= kMaxUnsquelchExpireDefault.count());
+            // expect max duration greater than kMinUnsquelchExpire and less
+            // than kMaxUnsquelchExpirePeers with peers greater than 60
             // and less than 360
             run(350);
             // can't make this condition stronger. squelch
             // duration is probabilistic and max condition may still fail.
             // log when the value is low
             BEAST_EXPECT(
-                handler.maxDuration >= kMIN_UNSQUELCH_EXPIRE.count() &&
-                handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_PEERS.count());
+                handler.maxDuration >= kMinUnsquelchExpire.count() &&
+                handler.maxDuration <= kMaxUnsquelchExpirePeers.count());
             using namespace beast::unit_test::detail;
-            if (handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_DEFAULT.count())
+            if (handler.maxDuration <= kMaxUnsquelchExpireDefault.count())
             {
                 log << makeReason("warning: squelch duration is low", __FILE__, __LINE__)
                     << std::endl
                     << std::flush;
             }
-            // more than 400 is still less than kMAX_UNSQUELCH_EXPIRE_PEERS
+            // more than 400 is still less than kMaxUnsquelchExpirePeers
             run(400);
             BEAST_EXPECT(
-                handler.maxDuration >= kMIN_UNSQUELCH_EXPIRE.count() &&
-                handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_PEERS.count());
-            if (handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_DEFAULT.count())
+                handler.maxDuration >= kMinUnsquelchExpire.count() &&
+                handler.maxDuration <= kMaxUnsquelchExpirePeers.count());
+            if (handler.maxDuration <= kMaxUnsquelchExpireDefault.count())
             {
                 log << makeReason("warning: squelch duration is low", __FILE__, __LINE__)
                     << std::endl
@@ -1602,7 +1601,7 @@ vp_base_squelch_max_selected_peers=2
                 // inbound is enabled if the request's header has the feature
                 // enabled and the peer's configuration is enabled
                 auto const inboundEnabled =
-                    peerFeatureEnabled(httpRequest, kFEATURE_VPRR, inboundEnable);
+                    peerFeatureEnabled(httpRequest, kFeatureVprr, inboundEnable);
                 BEAST_EXPECT(!(peerEnabled ^ inboundEnabled));
 
                 setEnv(inboundEnable);
@@ -1611,7 +1610,7 @@ vp_base_squelch_max_selected_peers=2
                 // outbound is enabled if the response's header has the feature
                 // enabled and the peer's configuration is enabled
                 auto const outboundEnabled =
-                    peerFeatureEnabled(httpResp, kFEATURE_VPRR, outboundEnable);
+                    peerFeatureEnabled(httpResp, kFeatureVprr, outboundEnable);
                 BEAST_EXPECT(!(peerEnabled ^ outboundEnabled));
             };
             handshake(1, 1);
diff --git a/src/test/peerfinder/Livecache_test.cpp b/src/test/peerfinder/Livecache_test.cpp
index 28d5beef88..9dae410b5b 100644
--- a/src/test/peerfinder/Livecache_test.cpp
+++ b/src/test/peerfinder/Livecache_test.cpp
@@ -116,7 +116,7 @@ public:
         BEAST_EXPECT(c.size() == 1);
         // verify that advancing to 1 sec before expiration
         // leaves our entry intact
-        clock_.advance(Tuning::kLIVE_CACHE_SECONDS_TO_LIVE - 1s);
+        clock_.advance(Tuning::kLiveCacheSecondsToLive - 1s);
         c.expire();
         BEAST_EXPECT(c.size() == 1);
         // now advance to the point of expiration
@@ -129,9 +129,9 @@ public:
     testHistogram()
     {
         testcase("Histogram");
-        constexpr auto kNUM_EPS = 40;
+        static constexpr auto kNumEps = 40;
         Livecache<> c(clock_, journal_);
-        for (auto i = 0; i < kNUM_EPS; ++i)
+        for (auto i = 0; i < kNumEps; ++i)
             add(beast::IP::randomEP(true), c, xrpl::randInt<std::uint32_t>());
         auto h = c.hops.histogram();
         if (!BEAST_EXPECT(!h.empty()))
@@ -145,7 +145,7 @@ public:
             sum += val;
             BEAST_EXPECT(val >= 0);
         }
-        BEAST_EXPECT(sum == kNUM_EPS);
+        BEAST_EXPECT(sum == kNumEps);
     }
 
     void
@@ -154,10 +154,10 @@ public:
         testcase("Shuffle");
         Livecache<> c(clock_, journal_);
         for (auto i = 0; i < 100; ++i)
-            add(beast::IP::randomEP(true), c, xrpl::randInt(Tuning::kMAX_HOPS + 1));
+            add(beast::IP::randomEP(true), c, xrpl::randInt(Tuning::kMaxHops + 1));
 
         using at_hop = std::vector<xrpl::PeerFinder::Endpoint>;
-        using all_hops = std::array<at_hop, 1 + Tuning::kMAX_HOPS + 1>;
+        using all_hops = std::array<at_hop, 1 + Tuning::kMaxHops + 1>;
 
         auto cmpEp = [](Endpoint const& a, Endpoint const& b) {
             return (b.hops < a.hops || (b.hops == a.hops && b.address < a.address));
diff --git a/src/test/protocol/ApiVersion_test.cpp b/src/test/protocol/ApiVersion_test.cpp
index 588de6ee80..c41fa6f6c0 100644
--- a/src/test/protocol/ApiVersion_test.cpp
+++ b/src/test/protocol/ApiVersion_test.cpp
@@ -10,11 +10,10 @@ struct ApiVersion_test : beast::unit_test::Suite
         {
             testcase("API versions invariants");
 
-            static_assert(
-                RPC::kAPI_MINIMUM_SUPPORTED_VERSION <= RPC::kAPI_MAXIMUM_SUPPORTED_VERSION);
-            static_assert(RPC::kAPI_MINIMUM_SUPPORTED_VERSION <= RPC::kAPI_MAXIMUM_VALID_VERSION);
-            static_assert(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION <= RPC::kAPI_MAXIMUM_VALID_VERSION);
-            static_assert(RPC::kAPI_BETA_VERSION <= RPC::kAPI_MAXIMUM_VALID_VERSION);
+            static_assert(RPC::kApiMinimumSupportedVersion <= RPC::kApiMaximumSupportedVersion);
+            static_assert(RPC::kApiMinimumSupportedVersion <= RPC::kApiMaximumValidVersion);
+            static_assert(RPC::kApiMaximumSupportedVersion <= RPC::kApiMaximumValidVersion);
+            static_assert(RPC::kApiBetaVersion <= RPC::kApiMaximumValidVersion);
 
             BEAST_EXPECT(true);
         }
@@ -23,14 +22,14 @@ struct ApiVersion_test : beast::unit_test::Suite
             // Update when we change versions
             testcase("API versions");
 
-            static_assert(RPC::kAPI_MINIMUM_SUPPORTED_VERSION >= 1);
-            static_assert(RPC::kAPI_MINIMUM_SUPPORTED_VERSION < 2);
-            static_assert(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION >= 2);
-            static_assert(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION < 3);
-            static_assert(RPC::kAPI_MAXIMUM_VALID_VERSION >= 3);
-            static_assert(RPC::kAPI_MAXIMUM_VALID_VERSION < 4);
-            static_assert(RPC::kAPI_BETA_VERSION >= 3);
-            static_assert(RPC::kAPI_BETA_VERSION < 4);
+            static_assert(RPC::kApiMinimumSupportedVersion >= 1);
+            static_assert(RPC::kApiMinimumSupportedVersion < 2);
+            static_assert(RPC::kApiMaximumSupportedVersion >= 2);
+            static_assert(RPC::kApiMaximumSupportedVersion < 3);
+            static_assert(RPC::kApiMaximumValidVersion >= 3);
+            static_assert(RPC::kApiMaximumValidVersion < 4);
+            static_assert(RPC::kApiBetaVersion >= 3);
+            static_assert(RPC::kApiBetaVersion < 4);
 
             BEAST_EXPECT(true);
         }
diff --git a/src/test/protocol/Hooks_test.cpp b/src/test/protocol/Hooks_test.cpp
index e948c76365..20fe205579 100644
--- a/src/test/protocol/Hooks_test.cpp
+++ b/src/test/protocol/Hooks_test.cpp
@@ -73,7 +73,7 @@ class Hooks_test : public beast::unit_test::Suite
         {
             SField const& f = rf.get();
 
-            STObject dummy{kSF_GENERIC};
+            STObject dummy{kSfGeneric};
 
             BEAST_EXPECT(!dummy.isFieldPresent(f));
 
@@ -161,8 +161,8 @@ class Hooks_test : public beast::unit_test::Suite
 
                 case STI_ARRAY: {
                     STArray dummy2{f, 2};
-                    dummy2.pushBack(STObject{kSF_GENERIC});
-                    dummy2.pushBack(STObject{kSF_GENERIC});
+                    dummy2.pushBack(STObject{kSfGeneric});
+                    dummy2.pushBack(STObject{kSfGeneric});
                     dummy.setFieldArray(f, dummy2);
                     BEAST_EXPECT(dummy.getFieldArray(f) == dummy2);
                     BEAST_EXPECT(dummy.isFieldPresent(f));
diff --git a/src/test/protocol/InnerObjectFormats_test.cpp b/src/test/protocol/InnerObjectFormats_test.cpp
index efef209c6b..5154153ecf 100644
--- a/src/test/protocol/InnerObjectFormats_test.cpp
+++ b/src/test/protocol/InnerObjectFormats_test.cpp
@@ -21,7 +21,7 @@ struct TestJSONTxt
     bool const expectFail;
 };
 
-static TestJSONTxt const kTEST_ARRAY[] = {
+static TestJSONTxt const kTestArray[] = {
 
     // Valid SignerEntry
     {.txt = R"({
@@ -162,7 +162,7 @@ public:
         // Instantiate a jtx::Env so debugLog writes are exercised.
         test::jtx::Env const env(*this);
 
-        for (auto const& test : kTEST_ARRAY)
+        for (auto const& test : kTestArray)
         {
             json::Value req;
             json::Reader().parse(test.txt, req);
diff --git a/src/test/protocol/MultiApiJson_test.cpp b/src/test/protocol/MultiApiJson_test.cpp
index 2e5a2bb433..c6f844a206 100644
--- a/src/test/protocol/MultiApiJson_test.cpp
+++ b/src/test/protocol/MultiApiJson_test.cpp
@@ -47,7 +47,7 @@ struct MultiApiJson_test : beast::unit_test::Suite
 
         MultiApiJson<1, 3> subject{};
         static_assert(sizeof(subject) == sizeof(subject.val));
-        static_assert(subject.kSIZE == subject.val.size());
+        static_assert(subject.kSize == subject.val.size());
         static_assert(std::is_same_v<decltype(subject.val), std::array<json::Value, 3>>);
 
         BEAST_EXPECT(subject.val.size() == 3);
@@ -60,42 +60,37 @@ struct MultiApiJson_test : beast::unit_test::Suite
             testcase("forApiVersions, forAllApiVersions");
 
             // Some static data for test inputs
-            static int const kPRIMES[] = {2,  3,  5,  7,  11, 13, 17, 19, 23, 29, 31, 37, 41,
+            static int const kPrimes[] = {2,  3,  5,  7,  11, 13, 17, 19, 23, 29, 31, 37, 41,
                                           43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97};
-            static_assert(std::size(kPRIMES) > RPC::kAPI_MAXIMUM_VALID_VERSION);
+            static_assert(std::size(kPrimes) > RPC::kApiMaximumValidVersion);
 
             MultiApiJson<1, 3> s1{};
             static_assert(
-                s1.kSIZE ==
-                RPC::kAPI_MAXIMUM_VALID_VERSION + 1 - RPC::kAPI_MINIMUM_SUPPORTED_VERSION);
+                s1.kSize == RPC::kApiMaximumValidVersion + 1 - RPC::kApiMinimumSupportedVersion);
 
             int productAllVersions = 1;
-            for (unsigned i = RPC::kAPI_MINIMUM_SUPPORTED_VERSION;
-                 i <= RPC::kAPI_MAXIMUM_VALID_VERSION;
+            for (unsigned i = RPC::kApiMinimumSupportedVersion; i <= RPC::kApiMaximumValidVersion;
                  ++i)
             {
-                auto const index = i - RPC::kAPI_MINIMUM_SUPPORTED_VERSION;
+                auto const index = i - RPC::kApiMinimumSupportedVersion;
                 BEAST_EXPECT(index == s1.index(i));
                 BEAST_EXPECT(s1.valid(i));
-                s1.val[index] = makeJson("value", kPRIMES[i]);
-                productAllVersions *= kPRIMES[i];
+                s1.val[index] = makeJson("value", kPrimes[i]);
+                productAllVersions *= kPrimes[i];
             }
             BEAST_EXPECT(!s1.valid(0));
-            BEAST_EXPECT(!s1.valid(RPC::kAPI_MAXIMUM_VALID_VERSION + 1));
+            BEAST_EXPECT(!s1.valid(RPC::kApiMaximumValidVersion + 1));
             BEAST_EXPECT(!s1.valid(
-                std::numeric_limits<decltype(RPC::kAPI_MAXIMUM_VALID_VERSION.value)>::max()));
+                std::numeric_limits<decltype(RPC::kApiMaximumValidVersion.value)>::max()));
 
             int result = 1;
-            static_assert(
-                RPC::kAPI_MINIMUM_SUPPORTED_VERSION + 1 <= RPC::kAPI_MAXIMUM_VALID_VERSION);
-            forApiVersions<
-                RPC::kAPI_MINIMUM_SUPPORTED_VERSION,
-                RPC::kAPI_MINIMUM_SUPPORTED_VERSION + 1>(
+            static_assert(RPC::kApiMinimumSupportedVersion + 1 <= RPC::kApiMaximumValidVersion);
+            forApiVersions<RPC::kApiMinimumSupportedVersion, RPC::kApiMinimumSupportedVersion + 1>(
                 std::as_const(s1).visit(),
                 [this](json::Value const& json, unsigned int version, int* result) {
                     BEAST_EXPECT(
-                        version >= RPC::kAPI_MINIMUM_SUPPORTED_VERSION &&
-                        version <= RPC::kAPI_MINIMUM_SUPPORTED_VERSION + 1);
+                        version >= RPC::kApiMinimumSupportedVersion &&
+                        version <= RPC::kApiMinimumSupportedVersion + 1);
                     if (BEAST_EXPECT(json.isMember("value")))
                     {
                         *result *= json["value"].asInt();
@@ -104,15 +99,15 @@ struct MultiApiJson_test : beast::unit_test::Suite
                 &result);
             BEAST_EXPECT(
                 result ==
-                kPRIMES[RPC::kAPI_MINIMUM_SUPPORTED_VERSION] *
-                    kPRIMES[RPC::kAPI_MINIMUM_SUPPORTED_VERSION + 1]);
+                kPrimes[RPC::kApiMinimumSupportedVersion] *
+                    kPrimes[RPC::kApiMinimumSupportedVersion + 1]);
 
             // Check all the values with mutable data
             forAllApiVersions(s1.visit(), [&s1, this](json::Value& json, auto version) {
                 BEAST_EXPECT(s1.val[s1.index(version)] == json);
                 if (BEAST_EXPECT(json.isMember("value")))
                 {
-                    BEAST_EXPECT(json["value"].asInt() == kPRIMES[version]);
+                    BEAST_EXPECT(json["value"].asInt() == kPrimes[version]);
                 }
             });
 
@@ -121,8 +116,8 @@ struct MultiApiJson_test : beast::unit_test::Suite
                 std::as_const(s1).visit(),
                 [this](json::Value const& json, unsigned int version, int* result) {
                     BEAST_EXPECT(
-                        version >= RPC::kAPI_MINIMUM_SUPPORTED_VERSION &&
-                        version <= RPC::kAPI_MAXIMUM_VALID_VERSION);
+                        version >= RPC::kApiMinimumSupportedVersion &&
+                        version <= RPC::kApiMaximumValidVersion);
                     if (BEAST_EXPECT(json.isMember("value")))
                     {
                         *result *= json["value"].asInt();
@@ -363,14 +358,14 @@ struct MultiApiJson_test : beast::unit_test::Suite
             // Test different overloads
             static_assert([](auto&& v) {
                 return requires {
-                    v.kVISITOR(
+                    v.kVisitor(
                         v,
                         std::integral_constant<unsigned, 1>{},
                         [](json::Value&, std::integral_constant<unsigned, 1>) {});
                 };
             }(s1));
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,
                     std::integral_constant<unsigned, 1>{},
                     Overload{
@@ -382,11 +377,11 @@ struct MultiApiJson_test : beast::unit_test::Suite
 
             static_assert([](auto&& v) {
                 return requires {
-                    v.kVISITOR(v, std::integral_constant<unsigned, 1>{}, [](json::Value&) {});
+                    v.kVisitor(v, std::integral_constant<unsigned, 1>{}, [](json::Value&) {});
                 };
             }(s1));
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,
                     std::integral_constant<unsigned, 1>{},
                     Overload{
@@ -396,14 +391,14 @@ struct MultiApiJson_test : beast::unit_test::Suite
 
             static_assert([](auto&& v) {
                 return requires {
-                    v.kVISITOR(
+                    v.kVisitor(
                         v,
                         std::integral_constant<unsigned, 1>{},
                         [](json::Value const&, std::integral_constant<unsigned, 1>) {});
                 };
             }(std::as_const(s1)));
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     std::as_const(s1),
                     std::integral_constant<unsigned, 2>{},
                     Overload{
@@ -415,11 +410,11 @@ struct MultiApiJson_test : beast::unit_test::Suite
 
             static_assert([](auto&& v) {
                 return requires {
-                    v.kVISITOR(v, std::integral_constant<unsigned, 1>{}, [](json::Value const&) {});
+                    v.kVisitor(v, std::integral_constant<unsigned, 1>{}, [](json::Value const&) {});
                 };
             }(std::as_const(s1)));
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     std::as_const(s1),
                     std::integral_constant<unsigned, 2>{},
                     Overload{
@@ -428,10 +423,10 @@ struct MultiApiJson_test : beast::unit_test::Suite
                         [](auto...) { return 0; }}) == 3);
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](json::Value&, unsigned) {}); };
+                return requires { v.kVisitor(v, 1, [](json::Value&, unsigned) {}); };
             }(s1));
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  //
                     3u,
                     Overload{
@@ -440,9 +435,9 @@ struct MultiApiJson_test : beast::unit_test::Suite
                         [](auto, auto) { return 0; }}) == 5);
 
             static_assert(
-                [](auto&& v) { return requires { v.kVISITOR(v, 1, [](json::Value&) {}); }; }(s1));
+                [](auto&& v) { return requires { v.kVisitor(v, 1, [](json::Value&) {}); }; }(s1));
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  //
                     3,
                     Overload{
@@ -451,10 +446,10 @@ struct MultiApiJson_test : beast::unit_test::Suite
                         [](auto...) { return 0; }}) == 5);
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](json::Value const&, unsigned) {}); };
+                return requires { v.kVisitor(v, 1, [](json::Value const&, unsigned) {}); };
             }(std::as_const(s1)));
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     std::as_const(s1),  //
                     2u,
                     Overload{
@@ -463,10 +458,10 @@ struct MultiApiJson_test : beast::unit_test::Suite
                         [](auto, auto) { return 0; }}) == 3);
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](json::Value const&) {}); };
+                return requires { v.kVisitor(v, 1, [](json::Value const&) {}); };
             }(std::as_const(s1)));
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     std::as_const(s1),  //
                     2,
                     Overload{
@@ -476,64 +471,64 @@ struct MultiApiJson_test : beast::unit_test::Suite
 
             // Test type conversions
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,
                     std::integral_constant<unsigned, 1>{},  // to unsigned
                     [](json::Value& v, unsigned) { return v["value"].asInt(); }) == 2);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     std::as_const(s1),
                     std::integral_constant<unsigned, 2>{},  // to unsigned
                     [](json::Value const& v, unsigned) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  // to const
                     std::integral_constant<unsigned, 3>{},
                     [](json::Value const& v, auto) { return v["value"].asInt(); }) == 5);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  // to const
                     std::integral_constant<unsigned, 3>{},
                     [](json::Value const& v) { return v["value"].asInt(); }) == 5);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,
                     3,  // to long
                     [](json::Value& v, long) { return v["value"].asInt(); }) == 5);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     std::as_const(s1),
                     1,  // to long
                     [](json::Value const& v, long) { return v["value"].asInt(); }) == 2);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  // to const
                     2,
                     [](json::Value const& v, auto) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  // type deduction
                     2,
                     [](auto& v, auto) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  // to const, type deduction
                     2,
                     [](auto const& v, auto) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  // type deduction
                     2,
                     [](auto& v) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,  // to const, type deduction
                     2,
                     [](auto const& v) { return v["value"].asInt(); }) == 3);
 
             // Test passing of additional arguments
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,
                     std::integral_constant<unsigned, 2>{},
                     [](json::Value& v, auto ver, auto a1, auto a2) {
@@ -542,7 +537,7 @@ struct MultiApiJson_test : beast::unit_test::Suite
                     5,
                     7) == 2 * 5 * 7 * 3);
             BEAST_EXPECT(
-                s1.kVISITOR(
+                s1.kVisitor(
                     s1,
                     std::integral_constant<unsigned, 2>{},
                     [](json::Value& v, auto ver, auto... args) {
@@ -554,7 +549,7 @@ struct MultiApiJson_test : beast::unit_test::Suite
             // Several overloads we want to fail
             static_assert([](auto&& v) {
                 return !requires {
-                    v.kVISITOR(
+                    v.kVisitor(
                         v,
                         1,                           //
                         [](json::Value&, auto) {});  // missing const
@@ -563,7 +558,7 @@ struct MultiApiJson_test : beast::unit_test::Suite
 
             static_assert([](auto&& v) {
                 return !requires {
-                    v.kVISITOR(
+                    v.kVisitor(
                         decltype(v){},  // cannot bind rvalue
                         1,
                         [](json::Value&, auto) {});
@@ -572,7 +567,7 @@ struct MultiApiJson_test : beast::unit_test::Suite
 
             static_assert([](auto&& v) {
                 return !requires {
-                    v.kVISITOR(
+                    v.kVisitor(
                         v,
                         1,         //
                         []() {});  // missing parameter
@@ -581,7 +576,7 @@ struct MultiApiJson_test : beast::unit_test::Suite
 
             static_assert([](auto&& v) {
                 return !requires {
-                    v.kVISITOR(
+                    v.kVisitor(
                         v,
                         1,                               //
                         [](json::Value&, int, int) {});  // too many parameters
@@ -589,39 +584,39 @@ struct MultiApiJson_test : beast::unit_test::Suite
             }(s1));
 
             // Want these to be unambiguous
-            static_assert([](auto&& v) { return requires { v.kVISITOR(v, 1, [](auto) {}); }; }(s1));
+            static_assert([](auto&& v) { return requires { v.kVisitor(v, 1, [](auto) {}); }; }(s1));
 
             static_assert(
-                [](auto&& v) { return requires { v.kVISITOR(v, 1, [](json::Value&) {}); }; }(s1));
+                [](auto&& v) { return requires { v.kVisitor(v, 1, [](json::Value&) {}); }; }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](json::Value&, auto...) {}); };
+                return requires { v.kVisitor(v, 1, [](json::Value&, auto...) {}); };
             }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](json::Value const&) {}); };
+                return requires { v.kVisitor(v, 1, [](json::Value const&) {}); };
             }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](json::Value const&, auto...) {}); };
+                return requires { v.kVisitor(v, 1, [](json::Value const&, auto...) {}); };
             }(s1));
 
             static_assert(
-                [](auto&& v) { return requires { v.kVISITOR(v, 1, [](auto...) {}); }; }(s1));
+                [](auto&& v) { return requires { v.kVisitor(v, 1, [](auto...) {}); }; }(s1));
 
             static_assert(
-                [](auto&& v) { return requires { v.kVISITOR(v, 1, [](auto, auto...) {}); }; }(s1));
+                [](auto&& v) { return requires { v.kVisitor(v, 1, [](auto, auto...) {}); }; }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](auto, auto, auto...) {}); };
+                return requires { v.kVisitor(v, 1, [](auto, auto, auto...) {}); };
             }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](auto, auto, auto...) {}, ""); };
+                return requires { v.kVisitor(v, 1, [](auto, auto, auto...) {}, ""); };
             }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.kVISITOR(v, 1, [](auto, auto, auto, auto...) {}, ""); };
+                return requires { v.kVisitor(v, 1, [](auto, auto, auto, auto...) {}, ""); };
             }(s1));
         }
 
diff --git a/src/test/protocol/PublicKey_test.cpp b/src/test/protocol/PublicKey_test.cpp
index 874eda8c65..1494e57a5e 100644
--- a/src/test/protocol/PublicKey_test.cpp
+++ b/src/test/protocol/PublicKey_test.cpp
@@ -46,12 +46,12 @@ public:
             }
         };
 
-        static Table kLUT;
+        static Table kLut;
         out.reserve(std::distance(first, last) / 2);
         while (first != last)
         {
-            auto const hi(kLUT[(*first++)]);
-            auto const lo(kLUT[(*first++)]);
+            auto const hi(kLut[(*first++)]);
+            auto const lo(kLut[(*first++)]);
             out.push_back((hi * 16) + lo);
         }
     }
diff --git a/src/test/protocol/Quality_test.cpp b/src/test/protocol/Quality_test.cpp
index fe049f11f2..df95cea8ef 100644
--- a/src/test/protocol/Quality_test.cpp
+++ b/src/test/protocol/Quality_test.cpp
@@ -263,7 +263,7 @@ public:
                 raw(2755280000000000ull, -15));                // 2.75528
             STAmount const limit(raw(4131113916555555, -16));  // .4131113916555555
             Amounts const result(q.ceilOut(value, limit));
-            BEAST_EXPECT(result.in != beast::kZERO);
+            BEAST_EXPECT(result.in != beast::kZero);
         }
     }
 
diff --git a/src/test/protocol/STAmount_test.cpp b/src/test/protocol/STAmount_test.cpp
index 7c37d3e9bc..b387c361cb 100644
--- a/src/test/protocol/STAmount_test.cpp
+++ b/src/test/protocol/STAmount_test.cpp
@@ -37,7 +37,7 @@ public:
         s.add(ser);
 
         SerialIter sit(ser.slice());
-        return STAmount(sit, kSF_GENERIC);
+        return STAmount(sit, kSfGeneric);
     }
 
     //--------------------------------------------------------------------------
@@ -54,7 +54,7 @@ public:
         {
             mantissa--;
 
-            if (mantissa < STAmount::kMIN_VALUE)
+            if (mantissa < STAmount::kMinValue)
                 return {amount.asset(), mantissa, amount.exponent(), amount.negative()};
 
             return {
@@ -69,7 +69,7 @@ public:
         {
             mantissa++;
 
-            if (mantissa > STAmount::kMAX_VALUE)
+            if (mantissa > STAmount::kMaxValue)
                 return {amount.asset(), mantissa, amount.exponent(), amount.negative()};
 
             return {
@@ -228,9 +228,9 @@ public:
         unexpected(serializeAndDeserialize(hundred) != hundred, "STAmount fail");
         unexpected(!zeroSt.native(), "STAmount fail");
         unexpected(!hundred.native(), "STAmount fail");
-        unexpected(zeroSt != beast::kZERO, "STAmount fail");
-        unexpected(one == beast::kZERO, "STAmount fail");
-        unexpected(hundred == beast::kZERO, "STAmount fail");
+        unexpected(zeroSt != beast::kZero, "STAmount fail");
+        unexpected(one == beast::kZero, "STAmount fail");
+        unexpected(hundred == beast::kZero, "STAmount fail");
         unexpected((zeroSt < zeroSt), "STAmount fail");  // NOLINT(misc-redundant-expression)
         unexpected(!(zeroSt < one), "STAmount fail");
         unexpected(!(zeroSt < hundred), "STAmount fail");
@@ -314,9 +314,9 @@ public:
         unexpected(serializeAndDeserialize(hundred) != hundred, "STAmount fail");
         unexpected(zeroSt.native(), "STAmount fail");
         unexpected(hundred.native(), "STAmount fail");
-        unexpected(zeroSt != beast::kZERO, "STAmount fail");
-        unexpected(one == beast::kZERO, "STAmount fail");
-        unexpected(hundred == beast::kZERO, "STAmount fail");
+        unexpected(zeroSt != beast::kZero, "STAmount fail");
+        unexpected(one == beast::kZero, "STAmount fail");
+        unexpected(hundred == beast::kZero, "STAmount fail");
         unexpected((zeroSt < zeroSt), "STAmount fail");  // NOLINT(misc-redundant-expression)
         unexpected(!(zeroSt < one), "STAmount fail");
         unexpected(!(zeroSt < hundred), "STAmount fail");
@@ -494,34 +494,30 @@ public:
     {
         testcase("underflow");
 
-        STAmount const bigNative(STAmount::kMAX_NATIVE / 2);
+        STAmount const bigNative(STAmount::kMaxNative / 2);
         STAmount const bigValue(
-            noIssue(),
-            (STAmount::kMIN_VALUE + STAmount::kMAX_VALUE) / 2,
-            STAmount::kMAX_OFFSET - 1);
+            noIssue(), (STAmount::kMinValue + STAmount::kMaxValue) / 2, STAmount::kMaxOffset - 1);
         STAmount const smallValue(
-            noIssue(),
-            (STAmount::kMIN_VALUE + STAmount::kMAX_VALUE) / 2,
-            STAmount::kMIN_OFFSET + 1);
+            noIssue(), (STAmount::kMinValue + STAmount::kMaxValue) / 2, STAmount::kMinOffset + 1);
         STAmount const zeroSt(noIssue(), 0);
 
         STAmount const smallXSmall = multiply(smallValue, smallValue, noIssue());
 
-        BEAST_EXPECT(smallXSmall == beast::kZERO);
+        BEAST_EXPECT(smallXSmall == beast::kZero);
 
         STAmount bigDsmall = divide(smallValue, bigValue, noIssue());
 
-        BEAST_EXPECT(bigDsmall == beast::kZERO);
+        BEAST_EXPECT(bigDsmall == beast::kZero);
 
-        BEAST_EXPECT(bigDsmall == beast::kZERO);
+        BEAST_EXPECT(bigDsmall == beast::kZero);
 
         bigDsmall = divide(smallValue, bigValue, xrpIssue());
 
-        BEAST_EXPECT(bigDsmall == beast::kZERO);
+        BEAST_EXPECT(bigDsmall == beast::kZero);
 
         bigDsmall = divide(smallValue, bigNative, xrpIssue());
 
-        BEAST_EXPECT(bigDsmall == beast::kZERO);
+        BEAST_EXPECT(bigDsmall == beast::kZero);
 
         // very bad offer
         std::uint64_t r = getRate(smallValue, bigValue);
@@ -618,17 +614,17 @@ public:
             BEAST_EXPECT(amountFromJson(sfNumber, "0") == XRPAmount(0));
             BEAST_EXPECT(amountFromJson(sfNumber, "-0") == XRPAmount(0));
 
-            constexpr auto kIMIN = std::numeric_limits<int>::min();
-            BEAST_EXPECT(amountFromJson(sfNumber, kIMIN) == XRPAmount(kIMIN));
-            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(kIMIN)) == XRPAmount(kIMIN));
+            constexpr auto kIMin = std::numeric_limits<int>::min();
+            BEAST_EXPECT(amountFromJson(sfNumber, kIMin) == XRPAmount(kIMin));
+            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(kIMin)) == XRPAmount(kIMin));
 
-            constexpr auto kIMAX = std::numeric_limits<int>::max();
-            BEAST_EXPECT(amountFromJson(sfNumber, kIMAX) == XRPAmount(kIMAX));
-            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(kIMAX)) == XRPAmount(kIMAX));
+            constexpr auto kIMax = std::numeric_limits<int>::max();
+            BEAST_EXPECT(amountFromJson(sfNumber, kIMax) == XRPAmount(kIMax));
+            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(kIMax)) == XRPAmount(kIMax));
 
-            constexpr auto kUMAX = std::numeric_limits<unsigned int>::max();
-            BEAST_EXPECT(amountFromJson(sfNumber, kUMAX) == XRPAmount(kUMAX));
-            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(kUMAX)) == XRPAmount(kUMAX));
+            constexpr auto kUMax = std::numeric_limits<unsigned int>::max();
+            BEAST_EXPECT(amountFromJson(sfNumber, kUMax) == XRPAmount(kUMax));
+            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(kUMax)) == XRPAmount(kUMax));
 
             // XRP does not handle fractional part
             try
diff --git a/src/test/protocol/STNumber_test.cpp b/src/test/protocol/STNumber_test.cpp
index 914e2d003f..4d95bc1ef7 100644
--- a/src/test/protocol/STNumber_test.cpp
+++ b/src/test/protocol/STNumber_test.cpp
@@ -55,7 +55,7 @@ struct STNumber_test : public beast::unit_test::Suite
             testCombo(Number{mantissa});
 
         std::initializer_list<std::int32_t> const exponents = {
-            Number::kMIN_EXPONENT, -1, 0, 1, Number::kMAX_EXPONENT - 1};
+            Number::kMinExponent, -1, 0, 1, Number::kMaxExponent - 1};
         for (std::int32_t const exponent : exponents)
             testCombo(Number{123, exponent});
 
@@ -128,23 +128,23 @@ struct STNumber_test : public beast::unit_test::Suite
                 }
             }
 
-            constexpr auto kIMIN = std::numeric_limits<int>::min();
-            BEAST_EXPECT(numberFromJson(sfNumber, kIMIN) == STNumber(sfNumber, Number(kIMIN, 0)));
+            constexpr auto kIMin = std::numeric_limits<int>::min();
+            BEAST_EXPECT(numberFromJson(sfNumber, kIMin) == STNumber(sfNumber, Number(kIMin, 0)));
             BEAST_EXPECT(
-                numberFromJson(sfNumber, std::to_string(kIMIN)) ==
-                STNumber(sfNumber, Number(kIMIN, 0)));
+                numberFromJson(sfNumber, std::to_string(kIMin)) ==
+                STNumber(sfNumber, Number(kIMin, 0)));
 
-            constexpr auto kIMAX = std::numeric_limits<int>::max();
-            BEAST_EXPECT(numberFromJson(sfNumber, kIMAX) == STNumber(sfNumber, Number(kIMAX, 0)));
+            constexpr auto kIMax = std::numeric_limits<int>::max();
+            BEAST_EXPECT(numberFromJson(sfNumber, kIMax) == STNumber(sfNumber, Number(kIMax, 0)));
             BEAST_EXPECT(
-                numberFromJson(sfNumber, std::to_string(kIMAX)) ==
-                STNumber(sfNumber, Number(kIMAX, 0)));
+                numberFromJson(sfNumber, std::to_string(kIMax)) ==
+                STNumber(sfNumber, Number(kIMax, 0)));
 
-            constexpr auto kUMAX = std::numeric_limits<unsigned int>::max();
-            BEAST_EXPECT(numberFromJson(sfNumber, kUMAX) == STNumber(sfNumber, Number(kUMAX, 0)));
+            constexpr auto kUMax = std::numeric_limits<unsigned int>::max();
+            BEAST_EXPECT(numberFromJson(sfNumber, kUMax) == STNumber(sfNumber, Number(kUMax, 0)));
             BEAST_EXPECT(
-                numberFromJson(sfNumber, std::to_string(kUMAX)) ==
-                STNumber(sfNumber, Number(kUMAX, 0)));
+                numberFromJson(sfNumber, std::to_string(kUMax)) ==
+                STNumber(sfNumber, Number(kUMax, 0)));
 
             // Obvious non-numbers tested here
             try
diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp
index 1621a278ea..59b78d213d 100644
--- a/src/test/protocol/STObject_test.cpp
+++ b/src/test/protocol/STObject_test.cpp
@@ -36,19 +36,19 @@ public:
     {
         testcase("serialization");
 
-        unexpected(kSF_GENERIC.isUseful(), "sfGeneric must not be useful");
+        unexpected(kSfGeneric.isUseful(), "sfGeneric must not be useful");
         {
             // Try to put sfGeneric in an SOTemplate.
             except<std::runtime_error>(
-                [&]() { SOTemplate const elements{{kSF_GENERIC, SoeRequired}}; });
+                [&]() { SOTemplate const elements{{kSfGeneric, SoeRequired}}; });
         }
 
-        unexpected(kSF_INVALID.isUseful(), "sfInvalid must not be useful");
+        unexpected(kSfInvalid.isUseful(), "sfInvalid must not be useful");
         {
             // Test return of sfInvalid.
             auto testInvalid = [this](SerializedTypeID tid, int fv) {
                 SField const& shouldBeInvalid{SField::getField(tid, fv)};
-                BEAST_EXPECT(shouldBeInvalid == kSF_INVALID);
+                BEAST_EXPECT(shouldBeInvalid == kSfInvalid);
             };
             testInvalid(STI_VL, 255);
             testInvalid(STI_UINT256, 255);
@@ -59,7 +59,7 @@ public:
         {
             // Try to put sfInvalid in an SOTemplate.
             except<std::runtime_error>(
-                [&]() { SOTemplate const elements{{kSF_INVALID, SoeRequired}}; });
+                [&]() { SOTemplate const elements{{kSfInvalid, SoeRequired}}; });
         }
         {
             // Try to put the same SField into an SOTemplate twice.
@@ -188,7 +188,7 @@ public:
 
         {
             auto const st = [&]() {
-                STObject s(kSF_GENERIC);
+                STObject s(kSfGeneric);
                 s.setFieldU32(sf1Outer, 1);
                 s.setFieldU32(sf2Outer, 2);
                 return s;
@@ -219,7 +219,7 @@ public:
 
         {
             auto const st = [&]() {
-                STObject s(sotOuter, kSF_GENERIC);
+                STObject s(sotOuter, kSfGeneric);
                 s.setFieldU32(sf1Outer, 1);
                 s.setFieldU32(sf2Outer, 2);
                 return s;
@@ -239,7 +239,7 @@ public:
         // write free object
 
         {
-            STObject st(kSF_GENERIC);
+            STObject st(kSfGeneric);
             unexcept([&]() { st[sf1Outer]; });
             except([&]() { return st[sf1Outer] == 0; });
             BEAST_EXPECT(st[~sf1Outer] == std::nullopt);
@@ -295,7 +295,7 @@ public:
         // Write templated object
 
         {
-            STObject st(sotOuter, kSF_GENERIC);
+            STObject st(sotOuter, kSfGeneric);
             BEAST_EXPECT(!!st[~sf1Outer]);
             BEAST_EXPECT(st[~sf1Outer] != std::nullopt);
             BEAST_EXPECT(st[sf1Outer] == 0);
@@ -353,7 +353,7 @@ public:
         // coercion operator to std::optional
 
         {
-            STObject st(kSF_GENERIC);
+            STObject st(kSfGeneric);
             auto const v = ~st[~sf1Outer];
             static_assert(
                 std::is_same_v<std::decay_t<decltype(v)>, std::optional<std::uint32_t>>, "");
@@ -362,7 +362,7 @@ public:
         // UDT scalar fields
 
         {
-            STObject st(kSF_GENERIC);
+            STObject st(kSfGeneric);
             st[sfAmount] = STAmount{};
             st[sfAccount] = AccountID{};
             st[sfDigest] = uint256{};
@@ -375,7 +375,7 @@ public:
 
         {
             {
-                STObject st(kSF_GENERIC);
+                STObject st(kSfGeneric);
                 Buffer b(1);
                 BEAST_EXPECT(!b.empty());
                 st[sf4] = std::move(b);
@@ -392,7 +392,7 @@ public:
                 BEAST_EXPECT(Slice(st[sf5]).size() == 2);
             }
             {
-                STObject st(sotOuter, kSF_GENERIC);
+                STObject st(sotOuter, kSfGeneric);
                 BEAST_EXPECT(st[sf5] == Slice{});
                 BEAST_EXPECT(!!st[~sf5]);
                 BEAST_EXPECT(!!~st[~sf5]);
@@ -408,7 +408,7 @@ public:
         // UDT blobs
 
         {
-            STObject st(kSF_GENERIC);
+            STObject st(kSfGeneric);
             BEAST_EXPECT(!st[~sf5]);
             auto const kp = generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase"));
             st[sf5] = kp.first;
@@ -419,7 +419,7 @@ public:
 
         {
             auto const& sf = sfIndexes;
-            STObject st(kSF_GENERIC);
+            STObject st(kSfGeneric);
             std::vector<uint256> v;
             v.emplace_back(1);
             v.emplace_back(2);
@@ -446,7 +446,7 @@ public:
                 {sf3, SoeDefault},
             };
 
-            STObject st(sot, kSF_GENERIC);
+            STObject st(sot, kSfGeneric);
             auto const& cst(st);
             BEAST_EXPECT(cst[sf1].empty());
             BEAST_EXPECT(!cst[~sf2]);
diff --git a/src/test/protocol/STTx_test.cpp b/src/test/protocol/STTx_test.cpp
index 9edc7e2ff3..42cb2bb9a7 100644
--- a/src/test/protocol/STTx_test.cpp
+++ b/src/test/protocol/STTx_test.cpp
@@ -66,12 +66,12 @@ public:
     {
         testcase("Malformed serialized form");
 
-        constexpr unsigned char kPAYLOAD1[] = {
+        static constexpr unsigned char kPayload1[] = {
             0x0a, 0xff, 0xff, 0xff, 0xff, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
             0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x29, 0x1b, 0x1b, 0x1b,
             0x1b, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef};
 
-        constexpr unsigned char kPAYLOAD2[] = {
+        static constexpr unsigned char kPayload2[] = {
             0xff, 0xef, 0xff, 0xef, 0xff, 0xef, 0xff, 0xef, 0xff, 0xef, 0xff, 0xef, 0xef, 0xff,
             0xef, 0xef, 0xff, 0xef, 0xff, 0xef, 0xef, 0xff, 0xef, 0xff, 0xef, 0xef, 0xff, 0xef,
             0xff, 0xef, 0xff, 0xef, 0xef, 0xff, 0xef, 0xff, 0xef, 0xff, 0xef, 0xef, 0xff, 0xef,
@@ -1063,7 +1063,7 @@ public:
             0xef, 0xff, 0xef, 0xff, 0xef, 0xff, 0xef, 0x3b, 0x3b, 0x43, 0x3b, 0x3b, 0xff, 0x3b,
             0x12, 0xf1, 0x12, 0x12, 0x12, 0xff};
 
-        constexpr unsigned char kPAYLOAD3[] = {
+        static constexpr unsigned char kPayload3[] = {
             0x12, 0x00, 0x65, 0x24, 0x00, 0x00, 0x00, 0x00, 0x20, 0x1e, 0x00, 0x4f, 0x00, 0x00,
             0x20, 0x1f, 0x03, 0xf6, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x35, 0x00,
             0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1083,7 +1083,7 @@ public:
             0x02, 0x00, 0x73, 0x00, 0x81, 0x14, 0x00, 0x10, 0x00, 0x73, 0x00, 0x81, 0x14, 0x00,
             0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x00, 0xe5, 0xfe};
 
-        constexpr unsigned char kPAYLOAD4[] = {
+        static constexpr unsigned char kPayload4[] = {
             0x12, 0x00, 0x65, 0x24, 0x00, 0x00, 0x00, 0x00, 0x20, 0x1e, 0x00, 0x4f, 0x00, 0x00,
             0x20, 0x1f, 0x03, 0xf6, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x35, 0x00,
             0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1279,7 +1279,7 @@ public:
             // from earlier versions results in "Unknown field". Either way,
             // we expect an exception from STTx, but the specific message will
             // vary.
-            BEAST_EXPECT(!tx2.ParseFromArray(kPAYLOAD1, sizeof(kPAYLOAD1)));
+            BEAST_EXPECT(!tx2.ParseFromArray(kPayload1, sizeof(kPayload1)));
 
             xrpl::SerialIter sit(xrpl::makeSlice(tx2.rawtransaction()));
 
@@ -1293,7 +1293,7 @@ public:
 
         try
         {
-            xrpl::SerialIter sit{kPAYLOAD2};
+            xrpl::SerialIter sit{kPayload2};
             auto stx = std::make_shared<xrpl::STTx const>(sit);
             fail("An exception should have been thrown");
         }
@@ -1304,7 +1304,7 @@ public:
 
         try
         {
-            xrpl::SerialIter sit{kPAYLOAD3};
+            xrpl::SerialIter sit{kPayload3};
             auto stx = std::make_shared<xrpl::STTx const>(sit);
             fail("An exception should have been thrown");
         }
@@ -1315,7 +1315,7 @@ public:
 
         try
         {
-            xrpl::SerialIter sit{kPAYLOAD4};
+            xrpl::SerialIter sit{kPayload4};
             auto stx = std::make_shared<xrpl::STTx const>(sit);
             fail("An exception should have been thrown");
         }
@@ -1390,7 +1390,7 @@ public:
         // Lambda that returns a Payment STObject.
         auto getPayment = [kp1, id1, id2]() {
             // Account id1 pays account id2 10,000 XRP.
-            STObject payment(kSF_GENERIC);
+            STObject payment(kSfGeneric);
             payment.setFieldU16(sfTransactionType, ttPAYMENT);
             payment.setAccountID(sfAccount, id1);
             payment.setAccountID(sfDestination, id2);
diff --git a/src/test/protocol/STValidation_test.cpp b/src/test/protocol/STValidation_test.cpp
index 6ad0f92b42..e42411bd3f 100644
--- a/src/test/protocol/STValidation_test.cpp
+++ b/src/test/protocol/STValidation_test.cpp
@@ -22,7 +22,7 @@ namespace xrpl {
 class STValidation_test : public beast::unit_test::Suite
 {
     // No public key:
-    static constexpr std::uint8_t kPAYLOAD1[] = {
+    static constexpr std::uint8_t kPayload1[] = {
         0x22, 0x80, 0x00, 0x00, 0x01, 0x26, 0x03, 0x4B, 0xEA, 0x97, 0x29, 0x26, 0x47, 0x31, 0x1A,
         0x3A, 0x4E, 0x69, 0x6B, 0x2B, 0x54, 0x69, 0x66, 0x66, 0x51, 0x53, 0x1F, 0x1A, 0x4E, 0xBB,
         0x43, 0x19, 0x69, 0x16, 0xF8, 0x3E, 0xEA, 0x5C, 0x77, 0x94, 0x08, 0x19, 0x0B, 0x4B, 0x40,
@@ -36,7 +36,7 @@ class STValidation_test : public beast::unit_test::Suite
         0x8E, 0x09, 0x11, 0x52, 0x28, 0x5A, 0x48, 0x8F, 0x98, 0x7A, 0x5A, 0x10, 0x74, 0xCC};
 
     // Short public key:
-    static constexpr std::uint8_t kPAYLOAD2[] = {
+    static constexpr std::uint8_t kPayload2[] = {
         0x22, 0x80, 0x00, 0x00, 0x01, 0x26, 0x03, 0x4B, 0xEA, 0x97, 0x29, 0x26, 0x47, 0x31, 0x1A,
         0x51, 0x53, 0x1F, 0x1A, 0x4E, 0xBB, 0x43, 0x19, 0x69, 0x16, 0xF8, 0x3E, 0xEA, 0x5C, 0x77,
         0x94, 0x08, 0x19, 0x0B, 0x4B, 0x40, 0x8C, 0xDE, 0xB8, 0x79, 0x39, 0xF3, 0x9D, 0x66, 0x7B,
@@ -52,7 +52,7 @@ class STValidation_test : public beast::unit_test::Suite
         0xD7, 0xFF, 0x83, 0x9D, 0xEF, 0x7D, 0xF7, 0x6A};
 
     // Long public key:
-    static constexpr std::uint8_t kPAYLOAD3[] = {
+    static constexpr std::uint8_t kPayload3[] = {
         0x22, 0x80, 0x00, 0x00, 0x01, 0x26, 0x03, 0x4B, 0xEA, 0x97, 0x29, 0x26, 0x47, 0x31, 0x1A,
         0x51, 0x53, 0x1F, 0x1A, 0x4E, 0xBB, 0x43, 0x19, 0x69, 0x16, 0xF8, 0x3E, 0xEA, 0x5C, 0x77,
         0x94, 0x08, 0x19, 0x0B, 0x4B, 0x40, 0x8C, 0xDE, 0xB8, 0x79, 0x39, 0xF3, 0x9D, 0x66, 0x7B,
@@ -68,7 +68,7 @@ class STValidation_test : public beast::unit_test::Suite
         0xEF, 0x4C, 0x73, 0xB3, 0xFF, 0xFE, 0xA9, 0x8E, 0x92, 0xE8};
 
     // Ed25519 public key:
-    static constexpr std::uint8_t kPAYLOAD4[] = {
+    static constexpr std::uint8_t kPayload4[] = {
         0x22, 0x80, 0x00, 0x00, 0x01, 0x26, 0x03, 0x4B, 0xEA, 0x97, 0x29, 0x26, 0x47, 0x31, 0x1A,
         0x51, 0x53, 0x1F, 0x1A, 0x4E, 0xBB, 0x43, 0x19, 0x69, 0x16, 0xF8, 0x3E, 0xEA, 0x5C, 0x77,
         0x94, 0x08, 0x19, 0x0B, 0x4B, 0x40, 0x8C, 0xDE, 0xB8, 0x79, 0x39, 0xF3, 0x9D, 0x66, 0x7B,
@@ -84,7 +84,7 @@ class STValidation_test : public beast::unit_test::Suite
         0x7E, 0x84, 0x09};
 
     // No ledger sequence:
-    static constexpr std::uint8_t kPAYLOAD5[] = {
+    static constexpr std::uint8_t kPayload5[] = {
         0x22, 0x80, 0x00, 0x00, 0x01, 0x29, 0x26, 0x47, 0x31, 0x1A, 0x51, 0x53, 0x1F, 0x1A, 0x4E,
         0xBB, 0x43, 0x19, 0x69, 0x16, 0xF8, 0x3E, 0xEA, 0x5C, 0x77, 0x94, 0x08, 0x19, 0x0B, 0x4B,
         0x40, 0x8C, 0xDE, 0xB8, 0x79, 0x39, 0xF3, 0x9D, 0x66, 0x7B, 0x12, 0xCA, 0x97, 0x50, 0x17,
@@ -100,7 +100,7 @@ class STValidation_test : public beast::unit_test::Suite
         0xEA, 0x5F, 0xD9, 0xC7, 0xAA};
 
     // No sign time:
-    static constexpr std::uint8_t kPAYLOAD6[] = {
+    static constexpr std::uint8_t kPayload6[] = {
         0x22, 0x80, 0x00, 0x00, 0x01, 0x26, 0x03, 0x4B, 0xEA, 0x97, 0x51, 0x53, 0x1F, 0x1A, 0x4E,
         0xBB, 0x43, 0x19, 0x69, 0x16, 0xF8, 0x3E, 0xEA, 0x5C, 0x77, 0x94, 0x08, 0x19, 0x0B, 0x4B,
         0x40, 0x8C, 0xDE, 0xB8, 0x79, 0x39, 0xF3, 0x9D, 0x66, 0x7B, 0x12, 0xCA, 0x97, 0x50, 0x17,
@@ -116,7 +116,7 @@ class STValidation_test : public beast::unit_test::Suite
         0x23, 0xE2, 0x14, 0x80, 0x54};
 
     // No signature field:
-    static constexpr std::uint8_t kPAYLOAD7[] = {
+    static constexpr std::uint8_t kPayload7[] = {
         0x22, 0x80, 0x00, 0x00, 0x01, 0x26, 0x03, 0x4B, 0xEA, 0x97, 0x29, 0x26, 0x47, 0x31, 0x1A,
         0x51, 0x53, 0x1F, 0x1A, 0x4E, 0xBB, 0x43, 0x19, 0x69, 0x16, 0xF8, 0x3E, 0xEA, 0x5C, 0x77,
         0x94, 0x08, 0x19, 0x0B, 0x4B, 0x40, 0x8C, 0xDE, 0xB8, 0x79, 0x39, 0xF3, 0x9D, 0x66, 0x7B,
@@ -127,7 +127,7 @@ class STValidation_test : public beast::unit_test::Suite
         0xA5, 0xC3, 0x3E, 0x92, 0x8C, 0x27, 0x51, 0xFC, 0x1B, 0x31, 0xEB, 0x32};
 
     // Good:
-    static constexpr std::uint8_t kPAYLOAD8[] = {
+    static constexpr std::uint8_t kPayload8[] = {
         0x22, 0x80, 0x00, 0x00, 0x01, 0x26, 0x03, 0x4B, 0xEA, 0x97, 0x29, 0x26, 0x47, 0x31, 0x1A,
         0x51, 0x53, 0x1F, 0x1A, 0x4E, 0xBB, 0x43, 0x19, 0x69, 0x16, 0xF8, 0x3E, 0xEA, 0x5C, 0x77,
         0x94, 0x08, 0x19, 0x0B, 0x4B, 0x40, 0x8C, 0xDE, 0xB8, 0x79, 0x39, 0xF3, 0x9D, 0x66, 0x7B,
@@ -150,7 +150,7 @@ public:
 
         try
         {
-            SerialIter sit{kPAYLOAD8};
+            SerialIter sit{kPayload8};
 
             auto val = std::make_shared<STValidation>(
                 sit, [](PublicKey const& pk) { return calcNodeID(pk); }, true);
@@ -172,7 +172,7 @@ public:
 
         try
         {
-            SerialIter sit{kPAYLOAD1};
+            SerialIter sit{kPayload1};
             auto val = std::make_shared<xrpl::STValidation>(
                 sit, [](PublicKey const& pk) { return calcNodeID(pk); }, false);
             fail("An exception should have been thrown");
@@ -184,7 +184,7 @@ public:
 
         try
         {
-            SerialIter sit{kPAYLOAD2};
+            SerialIter sit{kPayload2};
             auto val = std::make_shared<xrpl::STValidation>(
                 sit, [](PublicKey const& pk) { return calcNodeID(pk); }, false);
             fail("An exception should have been thrown");
@@ -196,7 +196,7 @@ public:
 
         try
         {
-            SerialIter sit{kPAYLOAD3};
+            SerialIter sit{kPayload3};
             auto val = std::make_shared<xrpl::STValidation>(
                 sit, [](PublicKey const& pk) { return calcNodeID(pk); }, false);
             fail("An exception should have been thrown");
@@ -208,7 +208,7 @@ public:
 
         try
         {
-            SerialIter sit{kPAYLOAD4};
+            SerialIter sit{kPayload4};
             auto val = std::make_shared<xrpl::STValidation>(
                 sit, [](PublicKey const& pk) { return calcNodeID(pk); }, false);
             fail("An exception should have been thrown");
@@ -222,7 +222,7 @@ public:
 
         try
         {
-            SerialIter sit{kPAYLOAD5};
+            SerialIter sit{kPayload5};
             auto val = std::make_shared<STValidation>(
                 sit, [](PublicKey const& pk) { return calcNodeID(pk); }, false);
             fail("Expected exception not thrown from validation");
@@ -234,7 +234,7 @@ public:
 
         try
         {
-            SerialIter sit{kPAYLOAD6};
+            SerialIter sit{kPayload6};
             auto val = std::make_shared<STValidation>(
                 sit, [](PublicKey const& pk) { return calcNodeID(pk); }, false);
             fail("Expected exception not thrown from validation");
@@ -246,7 +246,7 @@ public:
 
         try
         {
-            SerialIter sit{kPAYLOAD7};
+            SerialIter sit{kPayload7};
 
             auto val = std::make_shared<STValidation>(
                 sit, [](PublicKey const& pk) { return calcNodeID(pk); }, false);
@@ -262,7 +262,7 @@ public:
 
         // Mutate a known-good validation and expect it to fail:
         std::vector<std::uint8_t> v;
-        for (auto c : kPAYLOAD8)
+        for (auto c : kPayload8)
             v.push_back(c);
 
         beast::xor_shift_engine g(148979842);
diff --git a/src/test/protocol/SecretKey_test.cpp b/src/test/protocol/SecretKey_test.cpp
index 5dbb0727e8..967c4417eb 100644
--- a/src/test/protocol/SecretKey_test.cpp
+++ b/src/test/protocol/SecretKey_test.cpp
@@ -301,7 +301,7 @@ public:
     {
         testcase("secp256k1: key derivation");
 
-        for (auto const& test : kSECP256K1_TEST_VECTORS)
+        for (auto const& test : kSecP256K1TestVectors)
         {
             auto const id = parseBase58<AccountID>(test.addr);
             BEAST_EXPECT(id);
@@ -320,7 +320,7 @@ public:
     {
         testcase("ed25519: key derivation");
 
-        for (auto const& test : kED25519_TEST_VECTORS)
+        for (auto const& test : kED25519TestVectors)
         {
             auto const id = parseBase58<AccountID>(test.addr);
             BEAST_EXPECT(id);
@@ -352,7 +352,7 @@ public:
 
 private:
     // clang-format off
-inline static TestKeyData const kSECP256K1_TEST_VECTORS[] = {
+inline static TestKeyData const kSecP256K1TestVectors[] = {
     {.seed={0xDE,0xDC,0xE9,0xCE,0x67,0xB4,0x51,0xD8,0x52,0xFD,0x4E,0x84,0x6F,0xCD,0xE3,0x1C},
      .pubkey={0x03,0x30,0xE7,0xFC,0x9D,0x56,0xBB,0x25,0xD6,0x89,0x3B,0xA3,0xF3,0x17,0xAE,0x5B,
       0xCF,0x33,0xB3,0x29,0x1B,0xD6,0x3D,0xB3,0x26,0x54,0xA3,0x13,0x22,0x2F,0x7F,0xD0,0x20},
@@ -925,7 +925,7 @@ inline static TestKeyData const kSECP256K1_TEST_VECTORS[] = {
      .addr="rsYryUWhbYRiQivh693pgjnseAwPHezNj1"}
 };
 
-inline static TestKeyData const kED25519_TEST_VECTORS[] = {
+inline static TestKeyData const kED25519TestVectors[] = {
     {.seed={0xAF,0x41,0xFF,0x66,0xF7,0x5E,0xBD,0x3A,0x6B,0x18,0xFB,0x7A,0x1D,0xF6,0x1C,0x97},
      .pubkey={0xED,0x48,0xCB,0xBB,0xE0,0xEE,0x7B,0x86,0x86,0xA7,0xDE,0x9F,0x0A,0x01,0x59,0x73,
       0x4E,0x65,0xF9,0xC3,0x69,0x94,0x7F,0x2E,0x26,0x96,0x23,0x2B,0x46,0x1E,0x55,0x32,0x13},
diff --git a/src/test/protocol/SeqProxy_test.cpp b/src/test/protocol/SeqProxy_test.cpp
index 7da5751506..90345ddc22 100644
--- a/src/test/protocol/SeqProxy_test.cpp
+++ b/src/test/protocol/SeqProxy_test.cpp
@@ -64,157 +64,157 @@ struct SeqProxy_test : public beast::unit_test::Suite
         // While SeqProxy supports values of zero, they are not
         // expected in the wild.  Nevertheless they are tested here.
         // But so are values of 1, which are expected to occur in the wild.
-        static constexpr std::uint32_t kUINT_MAX{std::numeric_limits<std::uint32_t>::max()};
-        static constexpr SeqProxy::Type kSEQ{SeqProxy::Type::Seq};
-        static constexpr SeqProxy::Type kTICKET{SeqProxy::Type::Ticket};
+        static constexpr std::uint32_t kUintMax{std::numeric_limits<std::uint32_t>::max()};
+        static constexpr SeqProxy::Type kSeq{SeqProxy::Type::Seq};
+        static constexpr SeqProxy::Type kTicket{SeqProxy::Type::Ticket};
 
-        static constexpr SeqProxy kSEQ_ZERO{kSEQ, 0};
-        static constexpr SeqProxy kSEQ_SMALL{kSEQ, 1};
-        static constexpr SeqProxy kSEQ_MID0{kSEQ, 2};
-        static constexpr SeqProxy kSEQ_MID1{kSEQ_MID0};
-        static constexpr SeqProxy kSEQ_BIG{kSEQ, kUINT_MAX};
+        static constexpr SeqProxy kSeqZero{kSeq, 0};
+        static constexpr SeqProxy kSeqSmall{kSeq, 1};
+        static constexpr SeqProxy kSeqMiD0{kSeq, 2};
+        static constexpr SeqProxy kSeqMiD1{kSeqMiD0};
+        static constexpr SeqProxy kSeqBig{kSeq, kUintMax};
 
-        static constexpr SeqProxy kTIC_ZERO{kTICKET, 0};
-        static constexpr SeqProxy kTIC_SMALL{kTICKET, 1};
-        static constexpr SeqProxy kTIC_MID0{kTICKET, 2};
-        static constexpr SeqProxy kTIC_MID1{kTIC_MID0};
-        static constexpr SeqProxy kTIC_BIG{kTICKET, kUINT_MAX};
+        static constexpr SeqProxy kTicZero{kTicket, 0};
+        static constexpr SeqProxy kTicSmall{kTicket, 1};
+        static constexpr SeqProxy kTicMid0{kTicket, 2};
+        static constexpr SeqProxy kTicMid1{kTicMid0};
+        static constexpr SeqProxy kTicBig{kTicket, kUintMax};
 
         // Verify operation of value(), isSeq() and isTicket().
-        static_assert(expectValues(kSEQ_ZERO, 0, kSEQ), "");
-        static_assert(expectValues(kSEQ_SMALL, 1, kSEQ), "");
-        static_assert(expectValues(kSEQ_MID0, 2, kSEQ), "");
-        static_assert(expectValues(kSEQ_MID1, 2, kSEQ), "");
-        static_assert(expectValues(kSEQ_BIG, kUINT_MAX, kSEQ), "");
+        static_assert(expectValues(kSeqZero, 0, kSeq), "");
+        static_assert(expectValues(kSeqSmall, 1, kSeq), "");
+        static_assert(expectValues(kSeqMiD0, 2, kSeq), "");
+        static_assert(expectValues(kSeqMiD1, 2, kSeq), "");
+        static_assert(expectValues(kSeqBig, kUintMax, kSeq), "");
 
-        static_assert(expectValues(kTIC_ZERO, 0, kTICKET), "");
-        static_assert(expectValues(kTIC_SMALL, 1, kTICKET), "");
-        static_assert(expectValues(kTIC_MID0, 2, kTICKET), "");
-        static_assert(expectValues(kTIC_MID1, 2, kTICKET), "");
-        static_assert(expectValues(kTIC_BIG, kUINT_MAX, kTICKET), "");
+        static_assert(expectValues(kTicZero, 0, kTicket), "");
+        static_assert(expectValues(kTicSmall, 1, kTicket), "");
+        static_assert(expectValues(kTicMid0, 2, kTicket), "");
+        static_assert(expectValues(kTicMid1, 2, kTicket), "");
+        static_assert(expectValues(kTicBig, kUintMax, kTicket), "");
 
         // Verify expected behavior of comparison operators.
-        static_assert(expectEq(kSEQ_ZERO, kSEQ_ZERO), "");
-        static_assert(expectLt(kSEQ_ZERO, kSEQ_SMALL), "");
-        static_assert(expectLt(kSEQ_ZERO, kSEQ_MID0), "");
-        static_assert(expectLt(kSEQ_ZERO, kSEQ_MID1), "");
-        static_assert(expectLt(kSEQ_ZERO, kSEQ_BIG), "");
-        static_assert(expectLt(kSEQ_ZERO, kTIC_ZERO), "");
-        static_assert(expectLt(kSEQ_ZERO, kTIC_SMALL), "");
-        static_assert(expectLt(kSEQ_ZERO, kTIC_MID0), "");
-        static_assert(expectLt(kSEQ_ZERO, kTIC_MID1), "");
-        static_assert(expectLt(kSEQ_ZERO, kTIC_BIG), "");
+        static_assert(expectEq(kSeqZero, kSeqZero), "");
+        static_assert(expectLt(kSeqZero, kSeqSmall), "");
+        static_assert(expectLt(kSeqZero, kSeqMiD0), "");
+        static_assert(expectLt(kSeqZero, kSeqMiD1), "");
+        static_assert(expectLt(kSeqZero, kSeqBig), "");
+        static_assert(expectLt(kSeqZero, kTicZero), "");
+        static_assert(expectLt(kSeqZero, kTicSmall), "");
+        static_assert(expectLt(kSeqZero, kTicMid0), "");
+        static_assert(expectLt(kSeqZero, kTicMid1), "");
+        static_assert(expectLt(kSeqZero, kTicBig), "");
 
-        static_assert(expectGt(kSEQ_SMALL, kSEQ_ZERO), "");
-        static_assert(expectEq(kSEQ_SMALL, kSEQ_SMALL), "");
-        static_assert(expectLt(kSEQ_SMALL, kSEQ_MID0), "");
-        static_assert(expectLt(kSEQ_SMALL, kSEQ_MID1), "");
-        static_assert(expectLt(kSEQ_SMALL, kSEQ_BIG), "");
-        static_assert(expectLt(kSEQ_SMALL, kTIC_ZERO), "");
-        static_assert(expectLt(kSEQ_SMALL, kTIC_SMALL), "");
-        static_assert(expectLt(kSEQ_SMALL, kTIC_MID0), "");
-        static_assert(expectLt(kSEQ_SMALL, kTIC_MID1), "");
-        static_assert(expectLt(kSEQ_SMALL, kTIC_BIG), "");
+        static_assert(expectGt(kSeqSmall, kSeqZero), "");
+        static_assert(expectEq(kSeqSmall, kSeqSmall), "");
+        static_assert(expectLt(kSeqSmall, kSeqMiD0), "");
+        static_assert(expectLt(kSeqSmall, kSeqMiD1), "");
+        static_assert(expectLt(kSeqSmall, kSeqBig), "");
+        static_assert(expectLt(kSeqSmall, kTicZero), "");
+        static_assert(expectLt(kSeqSmall, kTicSmall), "");
+        static_assert(expectLt(kSeqSmall, kTicMid0), "");
+        static_assert(expectLt(kSeqSmall, kTicMid1), "");
+        static_assert(expectLt(kSeqSmall, kTicBig), "");
 
-        static_assert(expectGt(kSEQ_MID0, kSEQ_ZERO), "");
-        static_assert(expectGt(kSEQ_MID0, kSEQ_SMALL), "");
-        static_assert(expectEq(kSEQ_MID0, kSEQ_MID0), "");
-        static_assert(expectEq(kSEQ_MID0, kSEQ_MID1), "");
-        static_assert(expectLt(kSEQ_MID0, kSEQ_BIG), "");
-        static_assert(expectLt(kSEQ_MID0, kTIC_ZERO), "");
-        static_assert(expectLt(kSEQ_MID0, kTIC_SMALL), "");
-        static_assert(expectLt(kSEQ_MID0, kTIC_MID0), "");
-        static_assert(expectLt(kSEQ_MID0, kTIC_MID1), "");
-        static_assert(expectLt(kSEQ_MID0, kTIC_BIG), "");
+        static_assert(expectGt(kSeqMiD0, kSeqZero), "");
+        static_assert(expectGt(kSeqMiD0, kSeqSmall), "");
+        static_assert(expectEq(kSeqMiD0, kSeqMiD0), "");
+        static_assert(expectEq(kSeqMiD0, kSeqMiD1), "");
+        static_assert(expectLt(kSeqMiD0, kSeqBig), "");
+        static_assert(expectLt(kSeqMiD0, kTicZero), "");
+        static_assert(expectLt(kSeqMiD0, kTicSmall), "");
+        static_assert(expectLt(kSeqMiD0, kTicMid0), "");
+        static_assert(expectLt(kSeqMiD0, kTicMid1), "");
+        static_assert(expectLt(kSeqMiD0, kTicBig), "");
 
-        static_assert(expectGt(kSEQ_MID1, kSEQ_ZERO), "");
-        static_assert(expectGt(kSEQ_MID1, kSEQ_SMALL), "");
-        static_assert(expectEq(kSEQ_MID1, kSEQ_MID0), "");
-        static_assert(expectEq(kSEQ_MID1, kSEQ_MID1), "");
-        static_assert(expectLt(kSEQ_MID1, kSEQ_BIG), "");
-        static_assert(expectLt(kSEQ_MID1, kTIC_ZERO), "");
-        static_assert(expectLt(kSEQ_MID1, kTIC_SMALL), "");
-        static_assert(expectLt(kSEQ_MID1, kTIC_MID0), "");
-        static_assert(expectLt(kSEQ_MID1, kTIC_MID1), "");
-        static_assert(expectLt(kSEQ_MID1, kTIC_BIG), "");
+        static_assert(expectGt(kSeqMiD1, kSeqZero), "");
+        static_assert(expectGt(kSeqMiD1, kSeqSmall), "");
+        static_assert(expectEq(kSeqMiD1, kSeqMiD0), "");
+        static_assert(expectEq(kSeqMiD1, kSeqMiD1), "");
+        static_assert(expectLt(kSeqMiD1, kSeqBig), "");
+        static_assert(expectLt(kSeqMiD1, kTicZero), "");
+        static_assert(expectLt(kSeqMiD1, kTicSmall), "");
+        static_assert(expectLt(kSeqMiD1, kTicMid0), "");
+        static_assert(expectLt(kSeqMiD1, kTicMid1), "");
+        static_assert(expectLt(kSeqMiD1, kTicBig), "");
 
-        static_assert(expectGt(kSEQ_BIG, kSEQ_ZERO), "");
-        static_assert(expectGt(kSEQ_BIG, kSEQ_SMALL), "");
-        static_assert(expectGt(kSEQ_BIG, kSEQ_MID0), "");
-        static_assert(expectGt(kSEQ_BIG, kSEQ_MID1), "");
-        static_assert(expectEq(kSEQ_BIG, kSEQ_BIG), "");
-        static_assert(expectLt(kSEQ_BIG, kTIC_ZERO), "");
-        static_assert(expectLt(kSEQ_BIG, kTIC_SMALL), "");
-        static_assert(expectLt(kSEQ_BIG, kTIC_MID0), "");
-        static_assert(expectLt(kSEQ_BIG, kTIC_MID1), "");
-        static_assert(expectLt(kSEQ_BIG, kTIC_BIG), "");
+        static_assert(expectGt(kSeqBig, kSeqZero), "");
+        static_assert(expectGt(kSeqBig, kSeqSmall), "");
+        static_assert(expectGt(kSeqBig, kSeqMiD0), "");
+        static_assert(expectGt(kSeqBig, kSeqMiD1), "");
+        static_assert(expectEq(kSeqBig, kSeqBig), "");
+        static_assert(expectLt(kSeqBig, kTicZero), "");
+        static_assert(expectLt(kSeqBig, kTicSmall), "");
+        static_assert(expectLt(kSeqBig, kTicMid0), "");
+        static_assert(expectLt(kSeqBig, kTicMid1), "");
+        static_assert(expectLt(kSeqBig, kTicBig), "");
 
-        static_assert(expectGt(kTIC_ZERO, kSEQ_ZERO), "");
-        static_assert(expectGt(kTIC_ZERO, kSEQ_SMALL), "");
-        static_assert(expectGt(kTIC_ZERO, kSEQ_MID0), "");
-        static_assert(expectGt(kTIC_ZERO, kSEQ_MID1), "");
-        static_assert(expectGt(kTIC_ZERO, kSEQ_BIG), "");
-        static_assert(expectEq(kTIC_ZERO, kTIC_ZERO), "");
-        static_assert(expectLt(kTIC_ZERO, kTIC_SMALL), "");
-        static_assert(expectLt(kTIC_ZERO, kTIC_MID0), "");
-        static_assert(expectLt(kTIC_ZERO, kTIC_MID1), "");
-        static_assert(expectLt(kTIC_ZERO, kTIC_BIG), "");
+        static_assert(expectGt(kTicZero, kSeqZero), "");
+        static_assert(expectGt(kTicZero, kSeqSmall), "");
+        static_assert(expectGt(kTicZero, kSeqMiD0), "");
+        static_assert(expectGt(kTicZero, kSeqMiD1), "");
+        static_assert(expectGt(kTicZero, kSeqBig), "");
+        static_assert(expectEq(kTicZero, kTicZero), "");
+        static_assert(expectLt(kTicZero, kTicSmall), "");
+        static_assert(expectLt(kTicZero, kTicMid0), "");
+        static_assert(expectLt(kTicZero, kTicMid1), "");
+        static_assert(expectLt(kTicZero, kTicBig), "");
 
-        static_assert(expectGt(kTIC_SMALL, kSEQ_ZERO), "");
-        static_assert(expectGt(kTIC_SMALL, kSEQ_SMALL), "");
-        static_assert(expectGt(kTIC_SMALL, kSEQ_MID0), "");
-        static_assert(expectGt(kTIC_SMALL, kSEQ_MID1), "");
-        static_assert(expectGt(kTIC_SMALL, kSEQ_BIG), "");
-        static_assert(expectGt(kTIC_SMALL, kTIC_ZERO), "");
-        static_assert(expectEq(kTIC_SMALL, kTIC_SMALL), "");
-        static_assert(expectLt(kTIC_SMALL, kTIC_MID0), "");
-        static_assert(expectLt(kTIC_SMALL, kTIC_MID1), "");
-        static_assert(expectLt(kTIC_SMALL, kTIC_BIG), "");
+        static_assert(expectGt(kTicSmall, kSeqZero), "");
+        static_assert(expectGt(kTicSmall, kSeqSmall), "");
+        static_assert(expectGt(kTicSmall, kSeqMiD0), "");
+        static_assert(expectGt(kTicSmall, kSeqMiD1), "");
+        static_assert(expectGt(kTicSmall, kSeqBig), "");
+        static_assert(expectGt(kTicSmall, kTicZero), "");
+        static_assert(expectEq(kTicSmall, kTicSmall), "");
+        static_assert(expectLt(kTicSmall, kTicMid0), "");
+        static_assert(expectLt(kTicSmall, kTicMid1), "");
+        static_assert(expectLt(kTicSmall, kTicBig), "");
 
-        static_assert(expectGt(kTIC_MID0, kSEQ_ZERO), "");
-        static_assert(expectGt(kTIC_MID0, kSEQ_SMALL), "");
-        static_assert(expectGt(kTIC_MID0, kSEQ_MID0), "");
-        static_assert(expectGt(kTIC_MID0, kSEQ_MID1), "");
-        static_assert(expectGt(kTIC_MID0, kSEQ_BIG), "");
-        static_assert(expectGt(kTIC_MID0, kTIC_ZERO), "");
-        static_assert(expectGt(kTIC_MID0, kTIC_SMALL), "");
-        static_assert(expectEq(kTIC_MID0, kTIC_MID0), "");
-        static_assert(expectEq(kTIC_MID0, kTIC_MID1), "");
-        static_assert(expectLt(kTIC_MID0, kTIC_BIG), "");
+        static_assert(expectGt(kTicMid0, kSeqZero), "");
+        static_assert(expectGt(kTicMid0, kSeqSmall), "");
+        static_assert(expectGt(kTicMid0, kSeqMiD0), "");
+        static_assert(expectGt(kTicMid0, kSeqMiD1), "");
+        static_assert(expectGt(kTicMid0, kSeqBig), "");
+        static_assert(expectGt(kTicMid0, kTicZero), "");
+        static_assert(expectGt(kTicMid0, kTicSmall), "");
+        static_assert(expectEq(kTicMid0, kTicMid0), "");
+        static_assert(expectEq(kTicMid0, kTicMid1), "");
+        static_assert(expectLt(kTicMid0, kTicBig), "");
 
-        static_assert(expectGt(kTIC_MID1, kSEQ_ZERO), "");
-        static_assert(expectGt(kTIC_MID1, kSEQ_SMALL), "");
-        static_assert(expectGt(kTIC_MID1, kSEQ_MID0), "");
-        static_assert(expectGt(kTIC_MID1, kSEQ_MID1), "");
-        static_assert(expectGt(kTIC_MID1, kSEQ_BIG), "");
-        static_assert(expectGt(kTIC_MID1, kTIC_ZERO), "");
-        static_assert(expectGt(kTIC_MID1, kTIC_SMALL), "");
-        static_assert(expectEq(kTIC_MID1, kTIC_MID0), "");
-        static_assert(expectEq(kTIC_MID1, kTIC_MID1), "");
-        static_assert(expectLt(kTIC_MID1, kTIC_BIG), "");
+        static_assert(expectGt(kTicMid1, kSeqZero), "");
+        static_assert(expectGt(kTicMid1, kSeqSmall), "");
+        static_assert(expectGt(kTicMid1, kSeqMiD0), "");
+        static_assert(expectGt(kTicMid1, kSeqMiD1), "");
+        static_assert(expectGt(kTicMid1, kSeqBig), "");
+        static_assert(expectGt(kTicMid1, kTicZero), "");
+        static_assert(expectGt(kTicMid1, kTicSmall), "");
+        static_assert(expectEq(kTicMid1, kTicMid0), "");
+        static_assert(expectEq(kTicMid1, kTicMid1), "");
+        static_assert(expectLt(kTicMid1, kTicBig), "");
 
-        static_assert(expectGt(kTIC_BIG, kSEQ_ZERO), "");
-        static_assert(expectGt(kTIC_BIG, kSEQ_SMALL), "");
-        static_assert(expectGt(kTIC_BIG, kSEQ_MID0), "");
-        static_assert(expectGt(kTIC_BIG, kSEQ_MID1), "");
-        static_assert(expectGt(kTIC_BIG, kSEQ_BIG), "");
-        static_assert(expectGt(kTIC_BIG, kTIC_ZERO), "");
-        static_assert(expectGt(kTIC_BIG, kTIC_SMALL), "");
-        static_assert(expectGt(kTIC_BIG, kTIC_MID0), "");
-        static_assert(expectGt(kTIC_BIG, kTIC_MID1), "");
-        static_assert(expectEq(kTIC_BIG, kTIC_BIG), "");
+        static_assert(expectGt(kTicBig, kSeqZero), "");
+        static_assert(expectGt(kTicBig, kSeqSmall), "");
+        static_assert(expectGt(kTicBig, kSeqMiD0), "");
+        static_assert(expectGt(kTicBig, kSeqMiD1), "");
+        static_assert(expectGt(kTicBig, kSeqBig), "");
+        static_assert(expectGt(kTicBig, kTicZero), "");
+        static_assert(expectGt(kTicBig, kTicSmall), "");
+        static_assert(expectGt(kTicBig, kTicMid0), "");
+        static_assert(expectGt(kTicBig, kTicMid1), "");
+        static_assert(expectEq(kTicBig, kTicBig), "");
 
         // Verify streaming.
-        BEAST_EXPECT(streamTest(kSEQ_ZERO));
-        BEAST_EXPECT(streamTest(kSEQ_SMALL));
-        BEAST_EXPECT(streamTest(kSEQ_MID0));
-        BEAST_EXPECT(streamTest(kSEQ_MID1));
-        BEAST_EXPECT(streamTest(kSEQ_BIG));
-        BEAST_EXPECT(streamTest(kTIC_ZERO));
-        BEAST_EXPECT(streamTest(kTIC_SMALL));
-        BEAST_EXPECT(streamTest(kTIC_MID0));
-        BEAST_EXPECT(streamTest(kTIC_MID1));
-        BEAST_EXPECT(streamTest(kTIC_BIG));
+        BEAST_EXPECT(streamTest(kSeqZero));
+        BEAST_EXPECT(streamTest(kSeqSmall));
+        BEAST_EXPECT(streamTest(kSeqMiD0));
+        BEAST_EXPECT(streamTest(kSeqMiD1));
+        BEAST_EXPECT(streamTest(kSeqBig));
+        BEAST_EXPECT(streamTest(kTicZero));
+        BEAST_EXPECT(streamTest(kTicSmall));
+        BEAST_EXPECT(streamTest(kTicMid0));
+        BEAST_EXPECT(streamTest(kTicMid1));
+        BEAST_EXPECT(streamTest(kTicBig));
     }
 };
 
diff --git a/src/test/protocol/TER_test.cpp b/src/test/protocol/TER_test.cpp
index d9028fa941..af1cfced0e 100644
--- a/src/test/protocol/TER_test.cpp
+++ b/src/test/protocol/TER_test.cpp
@@ -114,12 +114,12 @@ struct TER_test : public beast::unit_test::Suite
         // are not valid.
 
         // Examples of each kind of enum.
-        static auto const kTER_ENUMS = std::make_tuple(
+        static auto const kTerEnums = std::make_tuple(
             telLOCAL_ERROR, temMALFORMED, tefFAILURE, terRETRY, tesSUCCESS, tecCLAIM);
-        static int const kHI_INDEX{std::tuple_size_v<decltype(kTER_ENUMS)> - 1};
+        static int const kHiIndex{std::tuple_size_v<decltype(kTerEnums)> - 1};
 
         // Verify that enums cannot be converted to other enum types.
-        testIterate<kHI_INDEX, kHI_INDEX, NotConvertible>(kTER_ENUMS, *this);
+        testIterate<kHiIndex, kHiIndex, NotConvertible>(kTerEnums, *this);
 
         // Lambda that verifies assignability and convertibility.
         auto isConvertible = [](auto from, auto to) {
@@ -216,7 +216,7 @@ struct TER_test : public beast::unit_test::Suite
         // All of the TER-related types should be comparable.
 
         // Examples of all the types we expect to successfully compare.
-        static auto const kTERS = std::make_tuple(
+        static auto const kTers = std::make_tuple(
             telLOCAL_ERROR,
             temMALFORMED,
             tefFAILURE,
@@ -225,11 +225,11 @@ struct TER_test : public beast::unit_test::Suite
             tecCLAIM,
             NotTEC{telLOCAL_ERROR},
             TER{tecCLAIM});
-        static int const kHI_INDEX{std::tuple_size_v<decltype(kTERS)> - 1};
+        static int const kHiIndex{std::tuple_size_v<decltype(kTers)> - 1};
 
         // Verify that all types in the ters tuple can be compared with all
         // the other types in ters.
-        testIterate<kHI_INDEX, kHI_INDEX, CheckComparable>(kTERS, *this);
+        testIterate<kHiIndex, kHiIndex, CheckComparable>(kTers, *this);
     }
 
     void
diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp
index 0710bdcc93..de4575cb16 100644
--- a/src/test/resource/Logic_test.cpp
+++ b/src/test/resource/Logic_test.cpp
@@ -86,7 +86,7 @@ public:
 
         TestLogic logic(j);
 
-        Charge const fee(kDROP_THRESHOLD + 1);
+        Charge const fee(kDropThreshold + 1);
         beast::IP::Endpoint const addr(beast::IP::Endpoint::fromString("192.0.2.2"));
 
         std::function<Consumer(beast::IP::Endpoint)> const ep = limited
@@ -179,7 +179,7 @@ public:
             using namespace std::chrono_literals;
             // Give Consumer time to become readmitted.  Should never
             // exceed expiration time.
-            auto n = kSECONDS_UNTIL_EXPIRATION + 1s;
+            auto n = kSecondsUntilExpiration + 1s;
             while (--n > 0s)
             {
                 ++logic.clock();
diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp
index b0cb949231..385fc2f58a 100644
--- a/src/test/rpc/AccountInfo_test.cpp
+++ b/src/test/rpc/AccountInfo_test.cpp
@@ -526,7 +526,7 @@ public:
             return res;
         };
 
-        static constexpr std::array<std::pair<std::string_view, std::uint32_t>, 7> kAS_FLAGS{
+        static constexpr std::array<std::pair<std::string_view, std::uint32_t>, 7> kAsFlags{
             {{"defaultRipple", asfDefaultRipple},
              {"depositAuth", asfDepositAuth},
              {"disallowIncomingXRP", asfDisallowXRP},
@@ -535,7 +535,7 @@ public:
              {"requireAuthorization", asfRequireAuth},
              {"requireDestinationTag", asfRequireDest}}};
 
-        for (auto& asf : kAS_FLAGS)
+        for (auto& asf : kAsFlags)
         {
             // Clear a flag and check that account_info returns results
             // as expected
@@ -555,13 +555,13 @@ public:
         }
 
         static constexpr std::array<std::pair<std::string_view, std::uint32_t>, 4>
-            kDISALLOW_INCOMING_FLAGS{
+            kDisallowIncomingFlags{
                 {{"disallowIncomingCheck", asfDisallowIncomingCheck},
                  {"disallowIncomingNFTokenOffer", asfDisallowIncomingNFTokenOffer},
                  {"disallowIncomingPayChan", asfDisallowIncomingPayChan},
                  {"disallowIncomingTrustline", asfDisallowIncomingTrustline}}};
 
-        for (auto& asf : kDISALLOW_INCOMING_FLAGS)
+        for (auto& asf : kDisallowIncomingFlags)
         {
             // Clear a flag and check that account_info returns results
             // as expected
@@ -580,47 +580,47 @@ public:
             BEAST_EXPECT(f2.value());  // NOLINT(bugprone-unchecked-optional-access)
         }
 
-        static constexpr std::pair<std::string_view, std::uint32_t> kALLOW_TRUST_LINE_CLAWBACK_FLAG{
+        static constexpr std::pair<std::string_view, std::uint32_t> kAllowTrustLineClawbackFlag{
             "allowTrustLineClawback", asfAllowTrustLineClawback};
 
         if (features[featureClawback])
         {
             // must use bob's account because alice has noFreeze set
-            auto const f1 = getAccountFlag(kALLOW_TRUST_LINE_CLAWBACK_FLAG.first, bob);
+            auto const f1 = getAccountFlag(kAllowTrustLineClawbackFlag.first, bob);
             BEAST_EXPECT(f1.has_value());
             BEAST_EXPECT(!f1.value());  // NOLINT(bugprone-unchecked-optional-access)
 
             // Set allowTrustLineClawback
-            env(fset(bob, kALLOW_TRUST_LINE_CLAWBACK_FLAG.second));
+            env(fset(bob, kAllowTrustLineClawbackFlag.second));
             env.close();
-            auto const f2 = getAccountFlag(kALLOW_TRUST_LINE_CLAWBACK_FLAG.first, bob);
+            auto const f2 = getAccountFlag(kAllowTrustLineClawbackFlag.first, bob);
             BEAST_EXPECT(f2.has_value());
             BEAST_EXPECT(f2.value());  // NOLINT(bugprone-unchecked-optional-access)
         }
         else
         {
-            BEAST_EXPECT(!getAccountFlag(kALLOW_TRUST_LINE_CLAWBACK_FLAG.first, bob));
+            BEAST_EXPECT(!getAccountFlag(kAllowTrustLineClawbackFlag.first, bob));
         }
 
-        static constexpr std::pair<std::string_view, std::uint32_t> kALLOW_TRUST_LINE_LOCKING_FLAG{
+        static constexpr std::pair<std::string_view, std::uint32_t> kAllowTrustLineLockingFlag{
             "allowTrustLineLocking", asfAllowTrustLineLocking};
 
         if (features[featureTokenEscrow])
         {
-            auto const f1 = getAccountFlag(kALLOW_TRUST_LINE_LOCKING_FLAG.first, bob);
+            auto const f1 = getAccountFlag(kAllowTrustLineLockingFlag.first, bob);
             BEAST_EXPECT(f1.has_value());
             BEAST_EXPECT(!f1.value());  // NOLINT(bugprone-unchecked-optional-access)
 
             // Set allowTrustLineLocking
-            env(fset(bob, kALLOW_TRUST_LINE_LOCKING_FLAG.second));
+            env(fset(bob, kAllowTrustLineLockingFlag.second));
             env.close();
-            auto const f2 = getAccountFlag(kALLOW_TRUST_LINE_LOCKING_FLAG.first, bob);
+            auto const f2 = getAccountFlag(kAllowTrustLineLockingFlag.first, bob);
             BEAST_EXPECT(f2.has_value());
             BEAST_EXPECT(f2.value());  // NOLINT(bugprone-unchecked-optional-access)
         }
         else
         {
-            BEAST_EXPECT(!getAccountFlag(kALLOW_TRUST_LINE_LOCKING_FLAG.first, bob));
+            BEAST_EXPECT(!getAccountFlag(kAllowTrustLineLockingFlag.first, bob));
         }
     }
 
diff --git a/src/test/rpc/AccountLines_test.cpp b/src/test/rpc/AccountLines_test.cpp
index 7bb1ca227f..8d55c5e19d 100644
--- a/src/test/rpc/AccountLines_test.cpp
+++ b/src/test/rpc/AccountLines_test.cpp
@@ -554,8 +554,8 @@ public:
         env.close();
 
         // Escrow, in each direction
-        env(escrow::create(alice, becky, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
-        env(escrow::create(becky, alice, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
+        env(escrow::create(alice, becky, XRP(1000)), escrow::kFinishTime(env.now() + 1s));
+        env(escrow::create(becky, alice, XRP(1000)), escrow::kFinishTime(env.now() + 1s));
 
         // Pay channels, in each direction
         env(payChan(alice, becky, XRP(1000), 100s, alice.pk()));
@@ -628,9 +628,9 @@ public:
                 };
 
             auto aliceLines = getNextLine(env, alice, std::nullopt);
-            constexpr std::size_t kEXPECTED_ITERATIONS = 16;
-            constexpr std::size_t kEXPECTED_LINES = 2;
-            constexpr std::size_t kEXPECTED_NF_TS = 1;
+            static constexpr std::size_t kExpectedIterations = 16;
+            static constexpr std::size_t kExpectedLines = 2;
+            static constexpr std::size_t kExpectedNfTs = 1;
             std::size_t foundLines = 0;
 
             auto hasMarker = [](auto const& aliceLines) {
@@ -661,7 +661,7 @@ public:
                 foundLines += aliceLines[jss::result][jss::lines].size();
                 ++iterations;
             }
-            BEAST_EXPECT(kEXPECTED_LINES == foundLines);
+            BEAST_EXPECT(kExpectedLines == foundLines);
 
             json::Value aliceObjectsParams2;
             aliceObjectsParams2[jss::account] = alice.human();
@@ -677,10 +677,10 @@ public:
             // this test will need to be updated.
             BEAST_EXPECT(
                 aliceObjects[jss::result][jss::account_objects].size() ==
-                iterations + kEXPECTED_NF_TS);
+                iterations + kExpectedNfTs);
             // If ledger object association ever changes, for whatever
             // reason, this test will need to be updated.
-            BEAST_EXPECTS(iterations == kEXPECTED_ITERATIONS, std::to_string(iterations));
+            BEAST_EXPECTS(iterations == kExpectedIterations, std::to_string(iterations));
 
             // Get becky's objects just to confirm that they're symmetrical
             json::Value beckyObjectsParams;
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index 427627c0ad..4307b7ab7f 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -740,11 +740,11 @@ public:
                 return scEnv.rpc("json", "account_objects", to_string(params));
             };
 
-            json::Value const resp = scEnvAcctObjs(Account::kMASTER, jss::bridge);
+            json::Value const resp = scEnvAcctObjs(Account::kMaster, jss::bridge);
 
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
             auto const& acctBridge = resp[jss::result][jss::account_objects][0u];
-            BEAST_EXPECT(acctBridge[sfAccount.jsonName] == Account::kMASTER.human());
+            BEAST_EXPECT(acctBridge[sfAccount.jsonName] == Account::kMaster.human());
             BEAST_EXPECT(acctBridge[sfLedgerEntryType.getJsonName()] == "Bridge");
             BEAST_EXPECT(acctBridge[sfXChainClaimID.getJsonName()].asUInt() == 0);
             BEAST_EXPECT(acctBridge[sfXChainAccountClaimCount.getJsonName()].asUInt() == 0);
@@ -800,7 +800,7 @@ public:
 
             // send first batch of account create attestations, so the
             // xchain_create_account_claim_id_ should be present on the door
-            // account (Account::kMASTER) to collect the signatures until a
+            // account (Account::kMaster) to collect the signatures until a
             // quorum is reached
             scEnv(
                 test::jtx::createAccountAttestation(
@@ -827,13 +827,13 @@ public:
             {
                 // Find the xchain_create_account_claim_id_
                 json::Value const resp =
-                    scEnvAcctObjs(Account::kMASTER, jss::xchain_owned_create_account_claim_id);
+                    scEnvAcctObjs(Account::kMaster, jss::xchain_owned_create_account_claim_id);
                 BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
                 auto const& xchainCreateAccountClaimId =
                     resp[jss::result][jss::account_objects][0u];
                 BEAST_EXPECT(
-                    xchainCreateAccountClaimId[sfAccount.jsonName] == Account::kMASTER.human());
+                    xchainCreateAccountClaimId[sfAccount.jsonName] == Account::kMaster.human());
                 BEAST_EXPECT(
                     xchainCreateAccountClaimId[sfXChainAccountCreateCount.getJsonName()].asUInt() ==
                     1);
@@ -1061,8 +1061,8 @@ public:
         Account const bob{"bob"};
         env.fund(XRP(10000), bob);
 
-        static constexpr unsigned kNFTS_SIZE = 10;
-        for (unsigned i = 0; i < kNFTS_SIZE; i++)
+        static constexpr unsigned kNftsSize = 10;
+        for (unsigned i = 0; i < kNftsSize; i++)
         {
             env(token::mint(bob, 0));
         }
diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp
index 610a07c275..5d32eac8dc 100644
--- a/src/test/rpc/AccountTx_test.cpp
+++ b/src/test/rpc/AccountTx_test.cpp
@@ -651,7 +651,7 @@ class AccountTx_test : public beast::unit_test::Suite
         // clang-format off
         // Do a sanity check on each returned transaction.  They should
         // be returned in the reverse order of application to the ledger.
-        static const NodeSanity kSANITY[]{
+        static const NodeSanity kSanity[]{
             //    txType,                    created,                                                    deleted,                          modified
             {0,  jss::DepositPreauth,         {jss::DepositPreauth},                                      {jss::Ticket},                    {jss::AccountRoot, jss::DirectoryNode}},
             {1,  jss::TicketCreate,           {jss::Ticket},                                              {},                               {jss::AccountRoot, jss::DirectoryNode}},
@@ -678,11 +678,11 @@ class AccountTx_test : public beast::unit_test::Suite
         };
         // clang-format on
 
-        BEAST_EXPECT(std::size(kSANITY) == result[jss::result][jss::transactions].size());
+        BEAST_EXPECT(std::size(kSanity) == result[jss::result][jss::transactions].size());
 
-        for (unsigned int index{0}; index < std::size(kSANITY); ++index)
+        for (unsigned int index{0}; index < std::size(kSanity); ++index)
         {
-            checkSanity(txs[index], kSANITY[index]);
+            checkSanity(txs[index], kSanity[index]);
         }
     }
 
@@ -733,7 +733,7 @@ class AccountTx_test : public beast::unit_test::Suite
         //
         // Note that the first two transactions in sanity have not occurred
         // yet.  We'll see those after becky's account is resurrected.
-        static const NodeSanity kSANITY[]
+        static const NodeSanity kSanity[]
         {
                                     //   txType,                    created,            deleted,            modified
 /* becky pays alice              */ { 0, jss::Payment,              {},                 {},                 {jss::AccountRoot, jss::AccountRoot}},
@@ -759,16 +759,16 @@ class AccountTx_test : public beast::unit_test::Suite
             BEAST_EXPECT(result[jss::result][jss::transactions].isArray());
 
             // The first two transactions listed in sanity haven't happened yet.
-            constexpr unsigned int kBECKY_DELETED_OFFSET = 2;
+            static constexpr unsigned int kBeckyDeletedOffset = 2;
             BEAST_EXPECT(
-                std::size(kSANITY) ==
-                result[jss::result][jss::transactions].size() + kBECKY_DELETED_OFFSET);
+                std::size(kSanity) ==
+                result[jss::result][jss::transactions].size() + kBeckyDeletedOffset);
 
             json::Value const& txs{result[jss::result][jss::transactions]};
 
-            for (unsigned int index = kBECKY_DELETED_OFFSET; index < std::size(kSANITY); ++index)
+            for (unsigned int index = kBeckyDeletedOffset; index < std::size(kSanity); ++index)
             {
-                checkSanity(txs[index - kBECKY_DELETED_OFFSET], kSANITY[index]);
+                checkSanity(txs[index - kBeckyDeletedOffset], kSanity[index]);
             }
         }
 
@@ -802,13 +802,13 @@ class AccountTx_test : public beast::unit_test::Suite
         BEAST_EXPECT(result[jss::result][jss::status] == "success");
         BEAST_EXPECT(result[jss::result][jss::transactions].isArray());
 
-        BEAST_EXPECT(std::size(kSANITY) == result[jss::result][jss::transactions].size());
+        BEAST_EXPECT(std::size(kSanity) == result[jss::result][jss::transactions].size());
 
         json::Value const& txs{result[jss::result][jss::transactions]};
 
-        for (unsigned int index = 0; index < std::size(kSANITY); ++index)
+        for (unsigned int index = 0; index < std::size(kSanity); ++index)
         {
-            checkSanity(txs[index], kSANITY[index]);
+            checkSanity(txs[index], kSanity[index]);
         }
     }
 
diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp
index 453a1800c1..bde55d4985 100644
--- a/src/test/rpc/Book_test.cpp
+++ b/src/test/rpc/Book_test.cpp
@@ -1548,7 +1548,7 @@ public:
 
         auto usd = gw["USD"];
 
-        for (auto i = 0; i <= RPC::Tuning::kBOOK_OFFERS.rmax; i++)
+        for (auto i = 0; i <= RPC::Tuning::kBookOffers.rmax; i++)
             env(offer(gw, XRP(50 + (1 * i)), usd(1.0 + (0.1 * i))));
 
         if (asAdmin)
@@ -1565,17 +1565,15 @@ public:
         BEAST_EXPECT(jrr[jss::offers].size() == (asAdmin ? 1u : 0u));
         // NOTE - a marker field is not returned for this method
 
-        jvParams[jss::limit] = RPC::Tuning::kBOOK_OFFERS.rmax + 1;
+        jvParams[jss::limit] = RPC::Tuning::kBookOffers.rmax + 1;
         jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
         BEAST_EXPECT(jrr[jss::offers].isArray());
-        BEAST_EXPECT(
-            jrr[jss::offers].size() == (asAdmin ? RPC::Tuning::kBOOK_OFFERS.rmax + 1 : 0u));
+        BEAST_EXPECT(jrr[jss::offers].size() == (asAdmin ? RPC::Tuning::kBookOffers.rmax + 1 : 0u));
 
         jvParams[jss::limit] = json::ValueType::Null;
         jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
         BEAST_EXPECT(jrr[jss::offers].isArray());
-        BEAST_EXPECT(
-            jrr[jss::offers].size() == (asAdmin ? RPC::Tuning::kBOOK_OFFERS.rDefault : 0u));
+        BEAST_EXPECT(jrr[jss::offers].size() == (asAdmin ? RPC::Tuning::kBookOffers.rDefault : 0u));
     }
 
     void
diff --git a/src/test/rpc/DeliveredAmount_test.cpp b/src/test/rpc/DeliveredAmount_test.cpp
index 0e171a8c84..7daf05aaf1 100644
--- a/src/test/rpc/DeliveredAmount_test.cpp
+++ b/src/test/rpc/DeliveredAmount_test.cpp
@@ -40,7 +40,7 @@ class CheckDeliveredAmount
     int numExpectedNotSet_ = 0;
 
     // Increment one of the expected numExpected{Available_, Unavailable_,
-    // NotSet_} values. Which value to kINCREMENT depends on: 1) If the ledger is
+    // NotSet_} values. Which value to kIncrement depends on: 1) If the ledger is
     // before or after the switch time 2) If the tx is a partial payment 3) If
     // the payment is successful or not
     void
diff --git a/src/test/rpc/DepositAuthorized_test.cpp b/src/test/rpc/DepositAuthorized_test.cpp
index 9fff429fa1..89053557a7 100644
--- a/src/test/rpc/DepositAuthorized_test.cpp
+++ b/src/test/rpc/DepositAuthorized_test.cpp
@@ -415,7 +415,7 @@ public:
         }
 
         {
-            static std::vector<std::string> const kCRED_IDS = {
+            static std::vector<std::string> const kCredIds = {
                 "18004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
                 "28004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
                 "38004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
@@ -426,15 +426,15 @@ public:
                 "88004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
                 "98004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
             };
-            assert(kCRED_IDS.size() > kMAX_CREDENTIALS_ARRAY_SIZE);
+            assert(kCredIds.size() > kMaxCredentialsArraySize);
 
             testcase("deposit_authorized too long credentials");
             auto const jv = env.rpc(
                 "json",
                 "deposit_authorized",
-                depositAuthArgs(alice, becky, "validated", kCRED_IDS).toStyledString());
+                depositAuthArgs(alice, becky, "validated", kCredIds).toStyledString());
             checkCredentialsResponse(
-                jv[jss::result], alice, becky, false, kCRED_IDS, "invalidParams");
+                jv[jss::result], alice, becky, false, kCredIds, "invalidParams");
         }
 
         {
diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp
index befb5aeddb..d899b6dfd9 100644
--- a/src/test/rpc/Feature_test.cpp
+++ b/src/test/rpc/Feature_test.cpp
@@ -208,35 +208,35 @@ class Feature_test : public beast::unit_test::Suite
         BEAST_EXPECT(jrr[jss::error_message] == "Feature unknown or invalid.");
 
         // Test feature name size checks
-        constexpr auto kOK63_NAME = [] {
+        static constexpr auto kOK63Name = [] {
             return "123456789012345678901234567890123456789012345678901234567890123";
         };
-        static_assert(validFeatureNameSize(kOK63_NAME));
+        static_assert(validFeatureNameSize(kOK63Name));
 
-        constexpr auto kBAD64_NAME = [] {
+        static constexpr auto kBaD64Name = [] {
             return "1234567890123456789012345678901234567890123456789012345678901234";
         };
-        static_assert(!validFeatureNameSize(kBAD64_NAME));
+        static_assert(!validFeatureNameSize(kBaD64Name));
 
-        constexpr auto kOK31_NAME = [] { return "1234567890123456789012345678901"; };
-        static_assert(validFeatureNameSize(kOK31_NAME));
+        static constexpr auto kOK31Name = [] { return "1234567890123456789012345678901"; };
+        static_assert(validFeatureNameSize(kOK31Name));
 
-        constexpr auto kBAD32_NAME = [] { return "12345678901234567890123456789012"; };
-        static_assert(!validFeatureNameSize(kBAD32_NAME));
+        static constexpr auto kBaD32Name = [] { return "12345678901234567890123456789012"; };
+        static_assert(!validFeatureNameSize(kBaD32Name));
 
-        constexpr auto kOK33_NAME = [] { return "123456789012345678901234567890123"; };
-        static_assert(validFeatureNameSize(kOK33_NAME));
+        static constexpr auto kOK33Name = [] { return "123456789012345678901234567890123"; };
+        static_assert(validFeatureNameSize(kOK33Name));
 
         // Test feature character set checks
-        constexpr auto kOK_NAME = [] { return "AMM_123"; };
-        static_assert(validFeatureName(kOK_NAME));
+        static constexpr auto kOkName = [] { return "AMM_123"; };
+        static_assert(validFeatureName(kOkName));
 
         // First character is Greek Capital Alpha, visually confusable with ASCII 'A'
-        constexpr auto kBAD_NAME = [] { return "ΑMM_123"; };
-        static_assert(!validFeatureName(kBAD_NAME));
+        static constexpr auto kBadName = [] { return "ΑMM_123"; };
+        static_assert(!validFeatureName(kBadName));
 
-        constexpr auto kBAD_EMOJI = [] { return "🔥"; };
-        static_assert(!validFeatureName(kBAD_EMOJI));
+        static constexpr auto kBadEmoji = [] { return "🔥"; };
+        static_assert(!validFeatureName(kBadEmoji));
     }
 
     void
@@ -474,40 +474,40 @@ class Feature_test : public beast::unit_test::Suite
 
         using namespace test::jtx;
         Env env{*this, FeatureBitset{featurePriceOracle}};
-        constexpr char const* kFEATURE_NAME = "fixAMMOverflowOffer";
+        static constexpr char const* kFeatureName = "fixAMMOverflowOffer";
 
-        auto jrr = env.rpc("feature", kFEATURE_NAME)[jss::result];
+        auto jrr = env.rpc("feature", kFeatureName)[jss::result];
         if (!BEAST_EXPECTS(jrr[jss::status] == jss::success, "status"))
             return;
         jrr.removeMember(jss::status);
         if (!BEAST_EXPECT(jrr.size() == 1))
             return;
         auto feature = *(jrr.begin());
-        BEAST_EXPECTS(feature[jss::name] == kFEATURE_NAME, "name");
+        BEAST_EXPECTS(feature[jss::name] == kFeatureName, "name");
         BEAST_EXPECTS(feature[jss::vetoed].isBool() && !feature[jss::vetoed].asBool(), "vetoed");
 
-        jrr = env.rpc("feature", kFEATURE_NAME, "reject")[jss::result];
+        jrr = env.rpc("feature", kFeatureName, "reject")[jss::result];
         if (!BEAST_EXPECTS(jrr[jss::status] == jss::success, "status"))
             return;
         jrr.removeMember(jss::status);
         if (!BEAST_EXPECT(jrr.size() == 1))
             return;
         feature = *(jrr.begin());
-        BEAST_EXPECTS(feature[jss::name] == kFEATURE_NAME, "name");
+        BEAST_EXPECTS(feature[jss::name] == kFeatureName, "name");
         BEAST_EXPECTS(feature[jss::vetoed].isBool() && feature[jss::vetoed].asBool(), "vetoed");
 
-        jrr = env.rpc("feature", kFEATURE_NAME, "accept")[jss::result];
+        jrr = env.rpc("feature", kFeatureName, "accept")[jss::result];
         if (!BEAST_EXPECTS(jrr[jss::status] == jss::success, "status"))
             return;
         jrr.removeMember(jss::status);
         if (!BEAST_EXPECT(jrr.size() == 1))
             return;
         feature = *(jrr.begin());
-        BEAST_EXPECTS(feature[jss::name] == kFEATURE_NAME, "name");
+        BEAST_EXPECTS(feature[jss::name] == kFeatureName, "name");
         BEAST_EXPECTS(feature[jss::vetoed].isBool() && !feature[jss::vetoed].asBool(), "vetoed");
 
         // anything other than accept or reject is an error
-        jrr = env.rpc("feature", kFEATURE_NAME, "maybe");
+        jrr = env.rpc("feature", kFeatureName, "maybe");
         BEAST_EXPECT(jrr[jss::error] == "invalidParams");
         BEAST_EXPECT(jrr[jss::error_message] == "Invalid parameters.");
     }
diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp
index 4f23db7b66..106b9b5f1a 100644
--- a/src/test/rpc/GatewayBalances_test.cpp
+++ b/src/test/rpc/GatewayBalances_test.cpp
@@ -190,7 +190,7 @@ public:
         auto usd = alice["USD"];
 
         // The largest valid STAmount of USD:
-        STAmount const maxUSD(usd, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
+        STAmount const maxUSD(usd, STAmount::kMaxValue, STAmount::kMaxOffset);
 
         // Create a hotwallet
         Account const hw{"hw"};
@@ -259,7 +259,7 @@ public:
 
         // Bob creates an escrow of MPT to Alice.
         auto const MPT = mpt["MPT"];  // NOLINT(readability-identifier-naming)
-        env(escrow::create(bob, alice, MPT(100)), escrow::kFINISH_TIME(env.now() + 10s));
+        env(escrow::create(bob, alice, MPT(100)), escrow::kFinishTime(env.now() + 10s));
         env.close();
 
         // Query gateway_balances for Bob.
diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp
index 418b36d703..1de08da205 100644
--- a/src/test/rpc/GetAggregatePrice_test.cpp
+++ b/src/test/rpc/GetAggregatePrice_test.cpp
@@ -25,22 +25,22 @@ public:
         using namespace jtx;
         Account const owner{"owner"};
         Account const some{"some"};
-        static OraclesData kORACLES = {{owner, 1}};
+        static OraclesData kOracles = {{owner, 1}};
 
         {
             Env env(*this);
             auto const baseFee = env.current()->fees().base;
             // missing base_asset
-            auto ret = Oracle::aggregatePrice(env, std::nullopt, "USD", kORACLES);
+            auto ret = Oracle::aggregatePrice(env, std::nullopt, "USD", kOracles);
             BEAST_EXPECT(ret[jss::error_message].asString() == "Missing field 'base_asset'.");
 
             // missing quote_asset
-            ret = Oracle::aggregatePrice(env, "XRP", std::nullopt, kORACLES);
+            ret = Oracle::aggregatePrice(env, "XRP", std::nullopt, kOracles);
             BEAST_EXPECT(ret[jss::error_message].asString() == "Missing field 'quote_asset'.");
 
             // invalid base_asset, quote_asset
             std::vector<AnyValue> const invalidAsset = {
-                kNONE_TAG,
+                kNoneTag,
                 1,
                 -1,
                 1.2,
@@ -56,11 +56,11 @@ public:
                 "012345678901234567890123456789012345678G"};
             for (auto const& v : invalidAsset)
             {
-                ret = Oracle::aggregatePrice(env, "USD", v, kORACLES);
+                ret = Oracle::aggregatePrice(env, "USD", v, kOracles);
                 BEAST_EXPECT(ret[jss::error].asString() == "invalidParams");
-                ret = Oracle::aggregatePrice(env, v, "USD", kORACLES);
+                ret = Oracle::aggregatePrice(env, v, "USD", kOracles);
                 BEAST_EXPECT(ret[jss::error].asString() == "invalidParams");
-                ret = Oracle::aggregatePrice(env, v, v, kORACLES);
+                ret = Oracle::aggregatePrice(env, v, v, kOracles);
                 BEAST_EXPECT(ret[jss::error].asString() == "invalidParams");
             }
 
@@ -73,7 +73,7 @@ public:
             BEAST_EXPECT(ret[jss::error].asString() == "oracleMalformed");
 
             // no token pairs found
-            ret = Oracle::aggregatePrice(env, "YAN", "USD", kORACLES);
+            ret = Oracle::aggregatePrice(env, "YAN", "USD", kOracles);
             BEAST_EXPECT(ret[jss::error].asString() == "objectNotFound");
 
             // invalid oracle document id
@@ -81,7 +81,7 @@ public:
             ret = Oracle::aggregatePrice(env, "XRP", "USD", {{{owner, 2}}});
             BEAST_EXPECT(ret[jss::error].asString() == "objectNotFound");
             // invalid values
-            std::vector<AnyValue> const invalidDocument = {kNONE_TAG, 1.2, -1, "", "none", "1.2"};
+            std::vector<AnyValue> const invalidDocument = {kNoneTag, 1.2, -1, "", "none", "1.2"};
             for (auto const& v : invalidDocument)
             {
                 ret = Oracle::aggregatePrice(env, "XRP", "USD", {{{owner, v}}});
@@ -111,8 +111,7 @@ public:
             BEAST_EXPECT(ret[jss::error].asString() == "objectNotFound");
 
             // invalid trim value
-            std::vector<AnyValue> const invalidTrim = {
-                kNONE_TAG, 0, 26, -1, 1.2, "", "none", "1.2"};
+            std::vector<AnyValue> const invalidTrim = {kNoneTag, 0, 26, -1, 1.2, "", "none", "1.2"};
             for (auto const& v : invalidTrim)
             {
                 ret =
@@ -121,7 +120,7 @@ public:
             }
 
             // invalid time threshold value
-            std::vector<AnyValue> const invalidTime = {kNONE_TAG, -1, 1.2, "", "none", "1.2"};
+            std::vector<AnyValue> const invalidTime = {kNoneTag, -1, 1.2, "", "none", "1.2"};
             for (auto const& v : invalidTime)
             {
                 ret = Oracle::aggregatePrice(
diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp
index 3b4d482a6a..10e4daf933 100644
--- a/src/test/rpc/JSONRPC_test.cpp
+++ b/src/test/rpc/JSONRPC_test.cpp
@@ -49,7 +49,7 @@ struct TxnTestData
     //   3. sign_for, and
     //   4. submit_multisigned.
     // The JSON is not valid for all of these interfaces, but it should
-    // crash kNONE of them, and should provide reliable error messages.
+    // crash kNone of them, and should provide reliable error messages.
     //
     // The expMsg array contains the expected error string for the above cases.
     std::array<char const* const, 4> const expMsg;
@@ -72,7 +72,7 @@ struct TxnTestData
     operator=(TxnTestData&&) = delete;
 };
 
-static constexpr TxnTestData kTXN_TEST_ARRAY[] = {
+static constexpr TxnTestData kTxnTestArray[] = {
 
     {"Minimal payment, no Amount only DeliverMax",
      __LINE__,
@@ -2777,26 +2777,26 @@ public:
 
         using TestStuff = std::tuple<signFunc, submitFunc, char const*, unsigned int>;
 
-        static TestStuff const kTEST_FUNCS[] = {
+        static TestStuff const kTestFuncs[] = {
             TestStuff{transactionSign, nullptr, "sign", 0},
             TestStuff{nullptr, transactionSubmit, "submit", 1},
             TestStuff{transactionSignFor, nullptr, "sign_for", 2},
             TestStuff{nullptr, transactionSubmitMultiSigned, "submit_multisigned", 3}};
 
-        for (auto testFunc : kTEST_FUNCS)
+        for (auto testFunc : kTestFuncs)
         {
             // For each JSON test.
-            for (auto const& txnTest : kTXN_TEST_ARRAY)
+            for (auto const& txnTest : kTxnTestArray)
             {
                 json::Value req;
                 json::Reader().parse(txnTest.json, req);
                 if (RPC::containsError(req))
                     Throw<std::runtime_error>("Internal JSONRPC_test error.  Bad test JSON.");
 
-                static Role const kTESTED_ROLES[] = {
+                static Role const kTestedRoles[] = {
                     Role::GUEST, Role::USER, Role::ADMIN, Role::FORBID};
 
-                for (Role const testRole : kTESTED_ROLES)
+                for (Role const testRole : kTestedRoles)
                 {
                     json::Value result;
                     auto const signFn = get<0>(testFunc);
diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp
index d4807176dd..bb1f95bef1 100644
--- a/src/test/rpc/KeyGeneration_test.cpp
+++ b/src/test/rpc/KeyGeneration_test.cpp
@@ -37,7 +37,7 @@ static char const* gMasterSeed = "snMwVWs2hZzfDUF3p2tHZ3EgmyhFs";
 static char const* gMasterSeedHex = "BE6A670A19B209E112146D0A7ED2AAD7";
 }  // namespace common
 
-static KeyStrings const kSECP256K1_STRINGS = {
+static KeyStrings const kSecP256K1Strings = {
     .account_id = "r4Vtj2jrfmTVZGfSP3gH9hQPMqFPQFin8f",
     .master_key = common::gMasterKey,
     .master_seed = common::gMasterSeed,
@@ -52,7 +52,7 @@ static KeyStrings const kSECP256K1_STRINGS = {
         "to brute-force attacks.",
 };
 
-static KeyStrings const kED25519_STRINGS = {
+static KeyStrings const kED25519Strings = {
     .account_id = "r4qV6xTXerqaZav3MJfSY79ynmc1BSBev1",
     .master_key = common::gMasterKey,
     .master_seed = common::gMasterSeed,
@@ -67,7 +67,7 @@ static KeyStrings const kED25519_STRINGS = {
         "to brute-force attacks.",
 };
 
-static KeyStrings const kSTRONG_BRAIN_STRINGS = {
+static KeyStrings const kStrongBrainStrings = {
     .account_id = "rBcvXmNb7KPkNdMkpckdWPpbvkWgcV3nir",
     .master_key = "TED AVON CAVE HOUR BRAG JEFF RIFT NEAL TOLD FAT SEW SAN",
     .master_seed = "shKdhWka8hS7Es3bpctCZXBiAwfUN",
@@ -781,16 +781,16 @@ public:
     void
     run() override
     {
-        testKeyType(std::nullopt, kSECP256K1_STRINGS);
-        testKeyType(std::string("secp256k1"), kSECP256K1_STRINGS);
-        testKeyType(std::string("ed25519"), kED25519_STRINGS);
-        testKeyType(std::string("secp256k1"), kSTRONG_BRAIN_STRINGS);
+        testKeyType(std::nullopt, kSecP256K1Strings);
+        testKeyType(std::string("secp256k1"), kSecP256K1Strings);
+        testKeyType(std::string("ed25519"), kED25519Strings);
+        testKeyType(std::string("secp256k1"), kStrongBrainStrings);
         testBadInput();
 
-        testKeypairForSignature(std::nullopt, kSECP256K1_STRINGS);
-        testKeypairForSignature(std::string("secp256k1"), kSECP256K1_STRINGS);
-        testKeypairForSignature(std::string("ed25519"), kED25519_STRINGS);
-        testKeypairForSignature(std::string("secp256k1"), kSTRONG_BRAIN_STRINGS);
+        testKeypairForSignature(std::nullopt, kSecP256K1Strings);
+        testKeypairForSignature(std::string("secp256k1"), kSecP256K1Strings);
+        testKeypairForSignature(std::string("ed25519"), kED25519Strings);
+        testKeypairForSignature(std::string("secp256k1"), kStrongBrainStrings);
 
         testXrplLibEd25519();
 
diff --git a/src/test/rpc/LedgerEntry_test.cpp b/src/test/rpc/LedgerEntry_test.cpp
index 8fcdf2d064..0f9421beb2 100644
--- a/src/test/rpc/LedgerEntry_test.cpp
+++ b/src/test/rpc/LedgerEntry_test.cpp
@@ -180,19 +180,19 @@ class LedgerEntry_test : public beast::unit_test::Suite
     static std::vector<json::Value>
     getBadValues(FieldType fieldType)
     {
-        static json::Value const kINJECT_OBJECT = []() {
+        static json::Value const kInjectObject = []() {
             json::Value obj(json::ValueType::Object);
             obj[jss::account] = "rhigTLJJyXXSRUyRCQtqi1NoAZZzZnS4KU";
             obj[jss::ledger_index] = "validated";
             return obj;
         }();
-        static json::Value const kINJECT_ARRAY = []() {
+        static json::Value const kInjectArray = []() {
             json::Value arr(json::ValueType::Array);
             arr[0u] = "rhigTLJJyXXSRUyRCQtqi1NoAZZzZnS4KU";
             arr[1u] = "validated";
             return arr;
         }();
-        static std::array<json::Value, 21> const kALL_BAD_VALUES = {
+        static std::array<json::Value, 21> const kAllBadValues = {
             "",                                                      // 0
             true,                                                    // 1
             1,                                                       // 2
@@ -213,58 +213,58 @@ class LedgerEntry_test : public beast::unit_test::Suite
             "6D",                     // 16
             json::ValueType::Array,   // 17
             json::ValueType::Object,  // 18
-            kINJECT_OBJECT,           // 19
-            kINJECT_ARRAY             // 20
+            kInjectObject,            // 19
+            kInjectArray              // 20
         };
 
         auto remove = [&](std::vector<std::uint8_t> indices) -> std::vector<json::Value> {
             std::unordered_set<std::uint8_t> const indexSet(indices.begin(), indices.end());
             std::vector<json::Value> values;
-            values.reserve(kALL_BAD_VALUES.size() - indexSet.size());
-            for (std::size_t i = 0; i < kALL_BAD_VALUES.size(); ++i)
+            values.reserve(kAllBadValues.size() - indexSet.size());
+            for (std::size_t i = 0; i < kAllBadValues.size(); ++i)
             {
                 if (!indexSet.contains(i))
                 {
-                    values.push_back(kALL_BAD_VALUES[i]);
+                    values.push_back(kAllBadValues[i]);
                 }
             }
             return values;
         };
 
-        static auto const& kBAD_ACCOUNT_VALUES = remove({12});
-        static auto const& kBAD_ARRAY_VALUES = remove({17, 20});
-        static auto const& kBAD_BLOB_VALUES = remove({3, 7, 8, 16});
-        static auto const& kBAD_CURRENCY_VALUES = remove({14});
-        static auto const& kBAD_HASH_VALUES = remove({2, 3, 7, 8, 16});
-        static auto const& kBAD_FIXED_HASH_VALUES = remove({1, 2, 3, 4, 7, 8, 16});
-        static auto const& kBAD_INDEX_VALUES = remove({12, 16, 18, 19});
-        static auto const& kBAD_U_INT32_VALUES = remove({2, 3});
-        static auto const& kBAD_U_INT64_VALUES = remove({2, 3});
-        static auto const& kBAD_ISSUE_VALUES = remove({});
+        static auto const& kBadAccountValues = remove({12});
+        static auto const& kBadArrayValues = remove({17, 20});
+        static auto const& kBadBlobValues = remove({3, 7, 8, 16});
+        static auto const& kBadCurrencyValues = remove({14});
+        static auto const& kBadHashValues = remove({2, 3, 7, 8, 16});
+        static auto const& kBadFixedHashValues = remove({1, 2, 3, 4, 7, 8, 16});
+        static auto const& kBadIndexValues = remove({12, 16, 18, 19});
+        static auto const& kBadUInt32Values = remove({2, 3});
+        static auto const& kBadUInt64Values = remove({2, 3});
+        static auto const& kBadIssueValues = remove({});
 
         switch (fieldType)
         {
             case FieldType::AccountField:
-                return kBAD_ACCOUNT_VALUES;
+                return kBadAccountValues;
             case FieldType::ArrayField:
             case FieldType::TwoAccountArrayField:
-                return kBAD_ARRAY_VALUES;
+                return kBadArrayValues;
             case FieldType::BlobField:
-                return kBAD_BLOB_VALUES;
+                return kBadBlobValues;
             case FieldType::CurrencyField:
-                return kBAD_CURRENCY_VALUES;
+                return kBadCurrencyValues;
             case FieldType::HashField:
-                return kBAD_HASH_VALUES;
+                return kBadHashValues;
             case FieldType::HashOrObjectField:
-                return kBAD_INDEX_VALUES;
+                return kBadIndexValues;
             case FieldType::FixedHashField:
-                return kBAD_FIXED_HASH_VALUES;
+                return kBadFixedHashValues;
             case FieldType::AssetField:
-                return kBAD_ISSUE_VALUES;
+                return kBadIssueValues;
             case FieldType::UInt32Field:
-                return kBAD_U_INT32_VALUES;
+                return kBadUInt32Values;
             case FieldType::UInt64Field:
-                return kBAD_U_INT64_VALUES;
+                return kBadUInt64Values;
             default:
                 Throw<std::runtime_error>(
                     "unknown type " + std::to_string(static_cast<uint8_t>(fieldType)));
@@ -274,13 +274,13 @@ class LedgerEntry_test : public beast::unit_test::Suite
     static json::Value
     getCorrectValue(json::StaticString fieldName)
     {
-        static json::Value const kTWO_ACCOUNT_ARRAY = []() {
+        static json::Value const kTwoAccountArray = []() {
             json::Value arr(json::ValueType::Array);
             arr[0u] = "rhigTLJJyXXSRUyRCQtqi1NoAZZzZnS4KU";
             arr[1u] = "r4MrUGTdB57duTnRs6KbsRGQXgkseGb1b5";
             return arr;
         }();
-        static json::Value const kISSUE_OBJECT = []() {
+        static json::Value const kIssueObject = []() {
             json::Value arr(json::ValueType::Object);
             arr[jss::currency] = "XRP";
             return arr;
@@ -301,12 +301,12 @@ class LedgerEntry_test : public beast::unit_test::Suite
                 return "5233D68B4D44388F98559DE42903767803EFA7C1F8D01413FC16EE6"
                        "B01403D6D";
             case FieldType::AssetField:
-                return kISSUE_OBJECT;
+                return kIssueObject;
             case FieldType::HashOrObjectField:
                 return "5233D68B4D44388F98559DE42903767803EFA7C1F8D01413FC16EE6"
                        "B01403D6D";
             case FieldType::TwoAccountArrayField:
-                return kTWO_ACCOUNT_ARRAY;
+                return kTwoAccountArray;
             case FieldType::UInt32Field:
                 return 1;
             case FieldType::UInt64Field:
@@ -584,7 +584,7 @@ class LedgerEntry_test : public beast::unit_test::Suite
             accountRootIndex = jrr[jss::index].asString();
         }
         {
-            constexpr char kALICE_ACCT_ROOT_BINARY[]{
+            static constexpr char kAliceAcctRootBinary[]{
                 "1100612200800000240000000425000000032D00000000559CE54C3B934E4"
                 "73A995B477E92EC229F99CED5B62BF4D2ACE4DC42719103AE2F6240000002"
                 "540BE4008114AE123A8556F3CF91154711376AFB0F894F832B3D"};
@@ -597,7 +597,7 @@ class LedgerEntry_test : public beast::unit_test::Suite
             json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr.isMember(jss::node_binary));
-            BEAST_EXPECT(jrr[jss::node_binary] == kALICE_ACCT_ROOT_BINARY);
+            BEAST_EXPECT(jrr[jss::node_binary] == kAliceAcctRootBinary);
         }
         {
             // Request alice's account root using the index.
@@ -1232,10 +1232,9 @@ class LedgerEntry_test : public beast::unit_test::Suite
 
         {
             // Failed, authorized_credentials is too long
-            static std::array<std::string_view, 9> const kCRED_TYPES = {
+            static std::array<std::string_view, 9> const kCredTypes = {
                 "cred1", "cred2", "cred3", "cred4", "cred5", "cred6", "cred7", "cred8", "cred9"};
-            static_assert(
-                sizeof(kCRED_TYPES) / sizeof(kCRED_TYPES[0]) > kMAX_CREDENTIALS_ARRAY_SIZE);
+            static_assert(sizeof(kCredTypes) / sizeof(kCredTypes[0]) > kMaxCredentialsArraySize);
 
             json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
@@ -1244,7 +1243,7 @@ class LedgerEntry_test : public beast::unit_test::Suite
 
             auto& arr(jvParams[jss::deposit_preauth][jss::authorized_credentials]);
 
-            for (auto cred : kCRED_TYPES)
+            for (auto cred : kCredTypes)
             {
                 json::Value jo;
                 jo[jss::issuer] = issuer.human();
@@ -2764,7 +2763,7 @@ class LedgerEntry_XChain_test : public beast::unit_test::Suite,
             // swap door accounts and make sure we get an error value
             json::Value jvParams;
             // Sidechain door account is "master", not scDoor
-            jvParams[jss::bridge_account] = Account::kMASTER.human();
+            jvParams[jss::bridge_account] = Account::kMaster.human();
             jvParams[jss::bridge] = jvb;
             jvParams[jss::ledger_hash] = ledgerHash;
             json::Value const jrr =
@@ -2869,7 +2868,7 @@ class LedgerEntry_XChain_test : public beast::unit_test::Suite,
 
         // send less than quorum of attestations (otherwise funds are
         // immediately transferred and no "claim" object is created)
-        size_t constexpr kNUM_ATTEST = 3;
+        static constexpr size_t kNumAttest = 3;
         auto attestations = createAccountAttestations(
             scAttester,
             jvb,
@@ -2881,8 +2880,8 @@ class LedgerEntry_XChain_test : public beast::unit_test::Suite,
             1,
             scCarol,
             signers,
-            kUT_XCHAIN_DEFAULT_NUM_SIGNERS);
-        for (size_t i = 0; i < kNUM_ATTEST; ++i)
+            kUtXchainDefaultNumSigners);
+        for (size_t i = 0; i < kNumAttest; ++i)
         {
             scEnv(attestations[i]);
         }
@@ -2901,7 +2900,7 @@ class LedgerEntry_XChain_test : public beast::unit_test::Suite,
             auto r = jrr[jss::node];
 
             BEAST_EXPECT(r.isMember(jss::Account));
-            BEAST_EXPECT(r[jss::Account] == Account::kMASTER.human());
+            BEAST_EXPECT(r[jss::Account] == Account::kMaster.human());
 
             BEAST_EXPECT(r.isMember(sfXChainAccountCreateCount.jsonName));
             BEAST_EXPECT(r[sfXChainAccountCreateCount.jsonName].asInt() == 1);
@@ -2912,13 +2911,12 @@ class LedgerEntry_XChain_test : public beast::unit_test::Suite,
             BEAST_EXPECT(attest.size() == 3);
             BEAST_EXPECT(
                 attest[json::Value::UInt(0)].isMember(sfXChainCreateAccountProofSig.jsonName));
-            json::Value a[kNUM_ATTEST];
-            for (size_t i = 0; i < kNUM_ATTEST; ++i)
+            json::Value a[kNumAttest];
+            for (size_t i = 0; i < kNumAttest; ++i)
             {
                 a[i] = attest[json::Value::UInt(0)][sfXChainCreateAccountProofSig.jsonName];
                 BEAST_EXPECT(
-                    a[i].isMember(jss::Amount) &&
-                    a[i][jss::Amount].asInt() == 1000 * kDROP_PER_XRP);
+                    a[i].isMember(jss::Amount) && a[i][jss::Amount].asInt() == 1000 * kDropPerXrp);
                 BEAST_EXPECT(
                     a[i].isMember(jss::Destination) && a[i][jss::Destination] == scCarol.human());
                 BEAST_EXPECT(
@@ -2936,13 +2934,13 @@ class LedgerEntry_XChain_test : public beast::unit_test::Suite,
                     a[i][sfWasLockingChainSend.jsonName] == 1);
                 BEAST_EXPECT(
                     a[i].isMember(sfSignatureReward.jsonName) &&
-                    a[i][sfSignatureReward.jsonName].asInt() == 1 * kDROP_PER_XRP);
+                    a[i][sfSignatureReward.jsonName].asInt() == 1 * kDropPerXrp);
             }
         }
 
         // complete attestations quorum - CreateAccountClaimID should not be
         // present anymore
-        for (size_t i = kNUM_ATTEST; i < kUT_XCHAIN_DEFAULT_NUM_SIGNERS; ++i)
+        for (size_t i = kNumAttest; i < kUtXchainDefaultNumSigners; ++i)
         {
             scEnv(attestations[i]);
         }
diff --git a/src/test/rpc/LedgerRequest_test.cpp b/src/test/rpc/LedgerRequest_test.cpp
index 65bcfb309b..0a2b51dc8b 100644
--- a/src/test/rpc/LedgerRequest_test.cpp
+++ b/src/test/rpc/LedgerRequest_test.cpp
@@ -20,12 +20,12 @@ namespace xrpl::RPC {
 
 class LedgerRequest_test : public beast::unit_test::Suite
 {
-    static constexpr char const* kHASH1 =
+    static constexpr char const* kHash1 =
         "3020EB9E7BE24EF7D7A060CB051583EC117384636D1781AFB5B87F3E348DA489";
-    static constexpr char const* kACCOUNTHASH1 =
+    static constexpr char const* kAccountHash1 =
         "BD8A3D72CA73DDE887AD63666EC2BAD07875CBA997A102579B5B95ECDFFEAED8";
 
-    static constexpr char const* kZEROHASH =
+    static constexpr char const* kZeroHASH =
         "0000000000000000000000000000000000000000000000000000000000000000";
 
 public:
@@ -173,32 +173,32 @@ public:
         BEAST_EXPECT(result[jss::ledger][jss::ledger_index] == "1");
         BEAST_EXPECT(result[jss::ledger][jss::total_coins] == "100000000000000000");
         BEAST_EXPECT(result[jss::ledger][jss::closed] == true);
-        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHASH1);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kZEROHASH);
-        BEAST_EXPECT(result[jss::ledger][jss::account_hash] == kACCOUNTHASH1);
-        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == kZEROHASH);
+        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHash1);
+        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kZeroHASH);
+        BEAST_EXPECT(result[jss::ledger][jss::account_hash] == kAccountHash1);
+        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == kZeroHASH);
 
         result = env.rpc("ledger_request", "2")[jss::result];
-        constexpr char const* kHASH2 =
+        static constexpr char const* kHash2 =
             "CCC3B3E88CCAC17F1BE6B4A648A55999411F19E3FE55EB721960EB0DF28EDDA5";
         BEAST_EXPECT(result[jss::ledger][jss::ledger_index] == "2");
         BEAST_EXPECT(result[jss::ledger][jss::total_coins] == "100000000000000000");
         BEAST_EXPECT(result[jss::ledger][jss::closed] == true);
-        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHASH2);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kHASH1);
+        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHash2);
+        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kHash1);
         BEAST_EXPECT(
             result[jss::ledger][jss::account_hash] ==
             "3C834285F7F464FBE99AFEB84D354A968EB2CAA24523FF26797A973D906A3D29");
-        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == kZEROHASH);
+        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == kZeroHASH);
 
         result = env.rpc("ledger_request", "3")[jss::result];
-        constexpr char const* kHASH3 =
+        static constexpr char const* kHash3 =
             "9FFD8AE09190D5002FE4252A1B29EABCF40DABBCE3B42619C6BD0BE381D51103";
         BEAST_EXPECT(result[jss::ledger][jss::ledger_index] == "3");
         BEAST_EXPECT(result[jss::ledger][jss::total_coins] == "99999999999999980");
         BEAST_EXPECT(result[jss::ledger][jss::closed] == true);
-        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHASH3);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kHASH2);
+        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHash3);
+        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kHash2);
         BEAST_EXPECT(
             result[jss::ledger][jss::account_hash] ==
             "35738B8517F37D08983AF6BC7DA483CCA9CF6B41B1FECB31A20028D78FE0BB22");
@@ -207,13 +207,13 @@ public:
             "CBD7F0948EBFA2241DE4EA627939A0FFEE6B80A90FE09C42C825DA546E9B73FF");
 
         result = env.rpc("ledger_request", "4")[jss::result];
-        constexpr char const* kHASH4 =
+        static constexpr char const* kHash4 =
             "7C9B614445517B8C6477E0AB10A35FFC1A23A34FEA41A91ECBDE884CC097C6E1";
         BEAST_EXPECT(result[jss::ledger][jss::ledger_index] == "4");
         BEAST_EXPECT(result[jss::ledger][jss::total_coins] == "99999999999999960");
         BEAST_EXPECT(result[jss::ledger][jss::closed] == true);
-        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHASH4);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kHASH3);
+        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHash4);
+        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kHash3);
         BEAST_EXPECT(
             result[jss::ledger][jss::account_hash] ==
             "1EE701DD2A150205173E1EDE8D474DF6803EC95253DAAEE965B9D896CFC32A04");
@@ -222,13 +222,13 @@ public:
             "9BBDDBF926100DFFF364E16268F544B19F5B9BC6ECCBBC104F98D13FA9F3BC35");
 
         result = env.rpc("ledger_request", "5")[jss::result];
-        constexpr char const* kHASH5 =
+        static constexpr char const* kHash5 =
             "98885D02145CCE4AD2605F1809F17188DB2053B14ED399CAC985DD8E03DCA8C0";
         BEAST_EXPECT(result[jss::ledger][jss::ledger_index] == "5");
         BEAST_EXPECT(result[jss::ledger][jss::total_coins] == "99999999999999940");
         BEAST_EXPECT(result[jss::ledger][jss::closed] == true);
-        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHASH5);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kHASH4);
+        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHash5);
+        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kHash4);
         BEAST_EXPECT(
             result[jss::ledger][jss::account_hash] ==
             "41D64D64796468DEA7AE2A7282C0BB525D6FD7ABC29453C5E5BC6406E947CBCE");
@@ -322,10 +322,10 @@ public:
         BEAST_EXPECT(result[jss::ledger][jss::ledger_index] == "1");
         BEAST_EXPECT(result[jss::ledger][jss::total_coins] == "100000000000000000");
         BEAST_EXPECT(result[jss::ledger][jss::closed] == true);
-        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHASH1);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kZEROHASH);
-        BEAST_EXPECT(result[jss::ledger][jss::account_hash] == kACCOUNTHASH1);
-        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == kZEROHASH);
+        BEAST_EXPECT(result[jss::ledger][jss::ledger_hash] == kHash1);
+        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == kZeroHASH);
+        BEAST_EXPECT(result[jss::ledger][jss::account_hash] == kAccountHash1);
+        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == kZeroHASH);
     }
 
     void
diff --git a/src/test/rpc/NoRippleCheck_test.cpp b/src/test/rpc/NoRippleCheck_test.cpp
index 28d0462203..3793efffcd 100644
--- a/src/test/rpc/NoRippleCheck_test.cpp
+++ b/src/test/rpc/NoRippleCheck_test.cpp
@@ -293,15 +293,15 @@ class NoRippleCheckLimits_test : public beast::unit_test::Suite
                 Endpoint::fromString(test::getEnvLocalhostAddr()));
 
             // if we go above the warning threshold, reset
-            if (c.balance() > kWARNING_THRESHOLD)
+            if (c.balance() > kWarningThreshold)
             {
                 using ct = beast::AbstractClock<steady_clock>;
                 c.entry().local_balance =
-                    DecayingSample<kDECAY_WINDOW_SECONDS, ct>{steady_clock::now()};
+                    DecayingSample<kDecayWindowSeconds, ct>{steady_clock::now()};
             }
         };
 
-        for (auto i = 0; i < xrpl::RPC::Tuning::kNO_RIPPLE_CHECK.rmax + 5; ++i)
+        for (auto i = 0; i < xrpl::RPC::Tuning::kNoRippleCheck.rmax + 5; ++i)
         {
             if (!admin)
                 checkBalance();
@@ -311,13 +311,13 @@ class NoRippleCheckLimits_test : public beast::unit_test::Suite
             env.memoize(gw);
             auto const baseFee = env.current()->fees().base;
             env(pay(env.master, gw, XRP(1000)),
-                Seq(kAUTOFILL),
+                Seq(kAutofill),
                 Fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1),
-                Sig(kAUTOFILL));
+                Sig(kAutofill));
             env(fset(gw, asfDefaultRipple),
-                Seq(kAUTOFILL),
+                Seq(kAutofill),
                 Fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1),
-                Sig(kAUTOFILL));
+                Sig(kAutofill));
             env(trust(alice, gw["USD"](10)),
                 Fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1));
             env.close();
diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp
index 436044e771..66ddfde8e2 100644
--- a/src/test/rpc/RPCCall_test.cpp
+++ b/src/test/rpc/RPCCall_test.cpp
@@ -66,7 +66,7 @@ struct RPCCallTestData
     operator=(RPCCallTestData&&) = delete;
 };
 
-static RPCCallTestData const kRPC_CALL_TEST_ARRAY[] = {
+static RPCCallTestData const kRpcCallTestArray[] = {
     // account_channels
     // ------------------------------------------------------------
     {"account_channels: minimal.",
@@ -5832,9 +5832,9 @@ std::string
 updateAPIVersionString(char const* const req, unsigned apiVersion)
 {
     std::string const versionStr = std::to_string(apiVersion);
-    static auto const kPLACE_HOLDER = "%API_VER%";
+    static auto const kPlaceHolder = "%API_VER%";
     std::string jr(req);
-    boost::replace_all(jr, kPLACE_HOLDER, versionStr);
+    boost::replace_all(jr, kPlaceHolder, versionStr);
     return jr;
 }
 
@@ -5856,14 +5856,14 @@ public:
     {
         testcase << "RPCCall API version " << apiVersion;
         if (!BEAST_EXPECT(
-                apiVersion >= RPC::kAPI_MINIMUM_SUPPORTED_VERSION &&
-                apiVersion <= RPC::kAPI_MAXIMUM_VALID_VERSION))
+                apiVersion >= RPC::kApiMinimumSupportedVersion &&
+                apiVersion <= RPC::kApiMaximumValidVersion))
             return;
 
         test::jtx::Env const env(*this, makeNetworkConfig(11111));  // Used only for its Journal.
 
         // For each RPCCall test.
-        for (RPCCallTestData const& rpcCallTest : kRPC_CALL_TEST_ARRAY)
+        for (RPCCallTestData const& rpcCallTest : kRpcCallTestArray)
         {
             if (!BEAST_EXPECT(!rpcCallTest.exp.empty()))
                 break;
@@ -5871,11 +5871,11 @@ public:
             std::vector<std::string> const args{rpcCallTest.args.begin(), rpcCallTest.args.end()};
 
             char const* const expVersioned =
-                (apiVersion - RPC::kAPI_MINIMUM_SUPPORTED_VERSION) < rpcCallTest.exp.size()
-                ? rpcCallTest.exp[apiVersion - RPC::kAPI_MINIMUM_SUPPORTED_VERSION]
+                (apiVersion - RPC::kApiMinimumSupportedVersion) < rpcCallTest.exp.size()
+                ? rpcCallTest.exp[apiVersion - RPC::kApiMinimumSupportedVersion]
                 : rpcCallTest.exp.back();
 
-            // Note that, over the long term, kNONE of these tests should
+            // Note that, over the long term, kNone of these tests should
             // throw.  But, for the moment, some of them do.  So handle it.
             json::Value got;
             try
diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp
index b47d37c0cf..1d52f3b83e 100644
--- a/src/test/rpc/ServerInfo_test.cpp
+++ b/src/test/rpc/ServerInfo_test.cpp
@@ -16,9 +16,9 @@
 namespace xrpl::test {
 
 namespace validator_data {
-static auto const kPUBLIC_KEY = "nHBt9fsb4849WmZiCds4r5TXyBeQjqnH5kzPtqgMAQMgi39YZRPa";
+static auto const kPublicKey = "nHBt9fsb4849WmZiCds4r5TXyBeQjqnH5kzPtqgMAQMgi39YZRPa";
 
-static auto const kTOKEN =
+static auto const kToken =
     "eyJ2YWxpZGF0aW9uX3NlY3JldF9rZXkiOiI5ZWQ0NWY4NjYyNDFjYzE4YTI3NDdiNT\n"
     "QzODdjMDYyNTkwNzk3MmY0ZTcxOTAyMzFmYWE5Mzc0NTdmYTlkYWY2IiwibWFuaWZl\n"
     "c3QiOiJKQUFBQUFGeEllMUZ0d21pbXZHdEgyaUNjTUpxQzlnVkZLaWxHZncxL3ZDeE\n"
@@ -54,8 +54,7 @@ protocol = wss2
 admin = 127.0.0.1
 )xrpldConfig");
 
-        p->loadFromString(
-            boost::str(toLoad % validator_data::kTOKEN % validator_data::kPUBLIC_KEY));
+        p->loadFromString(boost::str(toLoad % validator_data::kToken % validator_data::kPublicKey));
 
         setupConfigForUnitTests(*p);
 
@@ -122,7 +121,7 @@ admin = 127.0.0.1
             BEAST_EXPECT(result[jss::result].isMember(jss::info));
             BEAST_EXPECT(
                 result[jss::result][jss::info][jss::pubkey_validator] ==
-                validator_data::kPUBLIC_KEY);
+                validator_data::kPublicKey);
 
             auto const& ports = result[jss::result][jss::info][jss::ports];
             BEAST_EXPECT(ports.isArray() && ports.size() == 3);
diff --git a/src/test/rpc/Simulate_test.cpp b/src/test/rpc/Simulate_test.cpp
index 06a77647c4..b66b3dfe9f 100644
--- a/src/test/rpc/Simulate_test.cpp
+++ b/src/test/rpc/Simulate_test.cpp
@@ -66,7 +66,7 @@ class Simulate_test : public beast::unit_test::Suite
         {
             auto const unHexed = strUnHex(result[jss::tx_blob].asString());
             SerialIter sitTrans(makeSlice(*unHexed));  // NOLINT(bugprone-unchecked-optional-access)
-            txJson = STObject(std::ref(sitTrans), kSF_GENERIC).getJson(JsonOptions::Values::None);
+            txJson = STObject(std::ref(sitTrans), kSfGeneric).getJson(JsonOptions::Values::None);
         }
         BEAST_EXPECT(txJson[jss::TransactionType] == tx[jss::TransactionType]);
         BEAST_EXPECT(txJson[jss::Account] == tx[jss::Account]);
@@ -162,7 +162,7 @@ class Simulate_test : public beast::unit_test::Suite
         {
             auto unHexed = strUnHex(txResult[jss::meta_blob].asString());
             SerialIter sitTrans(makeSlice(*unHexed));  // NOLINT(bugprone-unchecked-optional-access)
-            return STObject(std::ref(sitTrans), kSF_GENERIC).getJson(JsonOptions::Values::None);
+            return STObject(std::ref(sitTrans), kSfGeneric).getJson(JsonOptions::Values::None);
         }
 
         return txResult[jss::meta];
@@ -495,7 +495,7 @@ class Simulate_test : public beast::unit_test::Suite
                     cfg->NETWORK_ID = 0;
                     return cfg;
                 })};
-        static auto const kNEW_DOMAIN = "123ABC";
+        static auto const kNewDomain = "123ABC";
 
         {
             auto validateOutput = [&](json::Value const& resp, json::Value const& tx) {
@@ -521,7 +521,7 @@ class Simulate_test : public beast::unit_test::Suite
                             auto modifiedNode = node[sfModifiedNode];
                             BEAST_EXPECT(modifiedNode[sfLedgerEntryType] == "AccountRoot");
                             auto finalFields = modifiedNode[sfFinalFields];
-                            BEAST_EXPECT(finalFields[sfDomain] == kNEW_DOMAIN);
+                            BEAST_EXPECT(finalFields[sfDomain] == kNewDomain);
                         }
                     }
                     BEAST_EXPECT(metadata[sfTransactionIndex.jsonName] == 0);
@@ -533,7 +533,7 @@ class Simulate_test : public beast::unit_test::Suite
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = kNEW_DOMAIN;
+            tx[sfDomain] = kNewDomain;
 
             // test with autofill
             testTx(env, tx, validateOutput);
@@ -666,7 +666,7 @@ class Simulate_test : public beast::unit_test::Suite
 
         using namespace jtx;
         Env env(*this);
-        static auto const kNEW_DOMAIN = "123ABC";
+        static auto const kNewDomain = "123ABC";
         Account const alice("alice");
         Account const becky("becky");
         Account const carol("carol");
@@ -706,7 +706,7 @@ class Simulate_test : public beast::unit_test::Suite
                             auto modifiedNode = node[sfModifiedNode];
                             BEAST_EXPECT(modifiedNode[sfLedgerEntryType] == "AccountRoot");
                             auto finalFields = modifiedNode[sfFinalFields];
-                            BEAST_EXPECT(finalFields[sfDomain] == kNEW_DOMAIN);
+                            BEAST_EXPECT(finalFields[sfDomain] == kNewDomain);
                         }
                     }
                     BEAST_EXPECT(metadata[sfTransactionIndex.jsonName] == 0);
@@ -718,7 +718,7 @@ class Simulate_test : public beast::unit_test::Suite
 
             tx[jss::Account] = alice.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = kNEW_DOMAIN;
+            tx[sfDomain] = kNewDomain;
 
             // test with autofill
             testTx(env, tx, validateOutput, false);
@@ -755,7 +755,7 @@ class Simulate_test : public beast::unit_test::Suite
 
         using namespace jtx;
         Env env(*this);
-        static auto const kNEW_DOMAIN = "123ABC";
+        static auto const kNewDomain = "123ABC";
         Account const alice{"alice"};
         env(regkey(env.master, alice));
         env(fset(env.master, asfDisableMaster), Sig(env.master));
@@ -779,7 +779,7 @@ class Simulate_test : public beast::unit_test::Suite
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = kNEW_DOMAIN;
+            tx[sfDomain] = kNewDomain;
             // master key is disabled, so this is invalid
             tx[jss::SigningPubKey] = strHex(env.master.pk().slice());
 
@@ -804,7 +804,7 @@ class Simulate_test : public beast::unit_test::Suite
 
         using namespace jtx;
         Env env(*this);
-        static auto const kNEW_DOMAIN = "123ABC";
+        static auto const kNewDomain = "123ABC";
         Account const alice("alice");
         Account const becky("becky");
         Account const carol("carol");
@@ -834,7 +834,7 @@ class Simulate_test : public beast::unit_test::Suite
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = kNEW_DOMAIN;
+            tx[sfDomain] = kNewDomain;
             // master key is disabled, so this is invalid
             tx[jss::SigningPubKey] = strHex(env.master.pk().slice());
             tx[sfSigners] = json::ValueType::Array;
@@ -867,7 +867,7 @@ class Simulate_test : public beast::unit_test::Suite
 
         using namespace jtx;
         Env env(*this);
-        static auto const kNEW_DOMAIN = "123ABC";
+        static auto const kNewDomain = "123ABC";
         Account const alice("alice");
         Account const becky("becky");
         Account const carol("carol");
@@ -899,7 +899,7 @@ class Simulate_test : public beast::unit_test::Suite
 
             tx[jss::Account] = alice.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = kNEW_DOMAIN;
+            tx[sfDomain] = kNewDomain;
             tx[sfSigners] = json::ValueType::Array;
             {
                 json::Value signer;
@@ -1035,7 +1035,7 @@ class Simulate_test : public beast::unit_test::Suite
                     cfg->NETWORK_ID = 1025;
                     return cfg;
                 })};
-        static auto const kNEW_DOMAIN = "123ABC";
+        static auto const kNewDomain = "123ABC";
 
         {
             auto validateOutput = [&](json::Value const& resp, json::Value const& tx) {
@@ -1061,7 +1061,7 @@ class Simulate_test : public beast::unit_test::Suite
                             auto modifiedNode = node[sfModifiedNode];
                             BEAST_EXPECT(modifiedNode[sfLedgerEntryType] == "AccountRoot");
                             auto finalFields = modifiedNode[sfFinalFields];
-                            BEAST_EXPECT(finalFields[sfDomain] == kNEW_DOMAIN);
+                            BEAST_EXPECT(finalFields[sfDomain] == kNewDomain);
                         }
                     }
                     BEAST_EXPECT(metadata[sfTransactionIndex.jsonName] == 0);
@@ -1073,7 +1073,7 @@ class Simulate_test : public beast::unit_test::Suite
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = kNEW_DOMAIN;
+            tx[sfDomain] = kNewDomain;
 
             // test with autofill
             testTx(env, tx, validateOutput);
diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp
index 3ce054a814..3011eb4170 100644
--- a/src/test/rpc/Subscribe_test.cpp
+++ b/src/test/rpc/Subscribe_test.cpp
@@ -474,7 +474,7 @@ public:
                 if (jv[jss::ledger_index] != std::to_string(env.closed()->header().seq))
                     return false;
 
-                if (jv[jss::flags] != (kVF_FULLY_CANONICAL_SIG | kVF_FULL_VALIDATION))
+                if (jv[jss::flags] != (kVfFullyCanonicalSig | kVfFullValidation))
                     return false;
 
                 if (jv[jss::full] != true)
@@ -932,9 +932,9 @@ public:
                 auto& from = (i % 2 == 0) ? a : b;
                 auto& to = (i % 2 == 0) ? b : a;
                 env(pay(from, to, jtx::XRP(numXRP)),
-                    jtx::Seq(jtx::kAUTOFILL),
-                    jtx::Fee(jtx::kAUTOFILL),
-                    jtx::Sig(jtx::kAUTOFILL));
+                    jtx::Seq(jtx::kAutofill),
+                    jtx::Fee(jtx::kAutofill),
+                    jtx::Sig(jtx::kAutofill));
             }
             for (int i = 0; i < ledgersToClose; ++i)
                 BEAST_EXPECT(env.syncClose());
diff --git a/src/test/rpc/Version_test.cpp b/src/test/rpc/Version_test.cpp
index 0740672815..75d74b4155 100644
--- a/src/test/rpc/Version_test.cpp
+++ b/src/test/rpc/Version_test.cpp
@@ -32,7 +32,7 @@ class Version_test : public beast::unit_test::Suite
         auto jrr = env.rpc(
             "json",
             "version",
-            "{\"api_version\": " + std::to_string(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION) +
+            "{\"api_version\": " + std::to_string(RPC::kApiMaximumSupportedVersion) +
                 "}")[jss::result];
         BEAST_EXPECT(isCorrectReply(jrr));
 
@@ -62,7 +62,7 @@ class Version_test : public beast::unit_test::Suite
         auto re = env.rpc(
             "json",
             "version",
-            "{\"api_version\": " + std::to_string(RPC::kAPI_MINIMUM_SUPPORTED_VERSION - 1) + "}");
+            "{\"api_version\": " + std::to_string(RPC::kApiMinimumSupportedVersion - 1) + "}");
         BEAST_EXPECT(badVersion(re));
 
         BEAST_EXPECT(env.app().config().BETA_RPC_API);
@@ -71,8 +71,7 @@ class Version_test : public beast::unit_test::Suite
             "version",
             "{\"api_version\": " +
                 std::to_string(
-                    std::max(
-                        RPC::kAPI_MAXIMUM_SUPPORTED_VERSION.value, RPC::kAPI_BETA_VERSION.value) +
+                    std::max(RPC::kApiMaximumSupportedVersion.value, RPC::kApiBetaVersion.value) +
                     1) +
                 "}");
         BEAST_EXPECT(badVersion(re));
@@ -87,9 +86,9 @@ class Version_test : public beast::unit_test::Suite
         testcase("test getAPIVersionNumber function");
 
         unsigned int const versionIfUnspecified =
-            RPC::kAPI_VERSION_IF_UNSPECIFIED < RPC::kAPI_MINIMUM_SUPPORTED_VERSION
-            ? RPC::kAPI_INVALID_VERSION
-            : RPC::kAPI_VERSION_IF_UNSPECIFIED;
+            RPC::kApiVersionIfUnspecified < RPC::kApiMinimumSupportedVersion
+            ? RPC::kApiInvalidVersion
+            : RPC::kApiVersionIfUnspecified;
 
         json::Value const jArray = json::Value(json::ValueType::Array);
         json::Value const jNull = json::Value(json::ValueType::Null);
@@ -98,29 +97,27 @@ class Version_test : public beast::unit_test::Suite
 
         json::Value jObject = json::Value(json::ValueType::Object);
         BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == versionIfUnspecified);
-        jObject[jss::api_version] = RPC::kAPI_VERSION_IF_UNSPECIFIED.value;
+        jObject[jss::api_version] = RPC::kApiVersionIfUnspecified.value;
         BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == versionIfUnspecified);
 
-        jObject[jss::api_version] = RPC::kAPI_MINIMUM_SUPPORTED_VERSION.value;
-        BEAST_EXPECT(
-            RPC::getAPIVersionNumber(jObject, false) == RPC::kAPI_MINIMUM_SUPPORTED_VERSION);
-        jObject[jss::api_version] = RPC::kAPI_MAXIMUM_SUPPORTED_VERSION.value;
-        BEAST_EXPECT(
-            RPC::getAPIVersionNumber(jObject, false) == RPC::kAPI_MAXIMUM_SUPPORTED_VERSION);
+        jObject[jss::api_version] = RPC::kApiMinimumSupportedVersion.value;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kApiMinimumSupportedVersion);
+        jObject[jss::api_version] = RPC::kApiMaximumSupportedVersion.value;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kApiMaximumSupportedVersion);
 
-        jObject[jss::api_version] = RPC::kAPI_MINIMUM_SUPPORTED_VERSION - 1;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kAPI_INVALID_VERSION);
-        jObject[jss::api_version] = RPC::kAPI_MAXIMUM_SUPPORTED_VERSION + 1;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kAPI_INVALID_VERSION);
-        jObject[jss::api_version] = RPC::kAPI_BETA_VERSION.value;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, true) == RPC::kAPI_BETA_VERSION);
-        jObject[jss::api_version] = RPC::kAPI_BETA_VERSION + 1;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, true) == RPC::kAPI_INVALID_VERSION);
+        jObject[jss::api_version] = RPC::kApiMinimumSupportedVersion - 1;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kApiInvalidVersion);
+        jObject[jss::api_version] = RPC::kApiMaximumSupportedVersion + 1;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kApiInvalidVersion);
+        jObject[jss::api_version] = RPC::kApiBetaVersion.value;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, true) == RPC::kApiBetaVersion);
+        jObject[jss::api_version] = RPC::kApiBetaVersion + 1;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, true) == RPC::kApiInvalidVersion);
 
-        jObject[jss::api_version] = RPC::kAPI_INVALID_VERSION.value;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kAPI_INVALID_VERSION);
+        jObject[jss::api_version] = RPC::kApiInvalidVersion.value;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kApiInvalidVersion);
         jObject[jss::api_version] = "a";
-        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kAPI_INVALID_VERSION);
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kApiInvalidVersion);
     }
 
     void
@@ -144,7 +141,7 @@ class Version_test : public beast::unit_test::Suite
             "\"method\": \"version\", "
             "\"params\": { "
             "\"api_version\": " +
-            std::to_string(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION) + "}}";
+            std::to_string(RPC::kApiMaximumSupportedVersion) + "}}";
         auto re = env.rpc("json2", '[' + withoutApiVerion + ", " + withApiVerion + ']');
 
         if (!BEAST_EXPECT(re.isArray()))
@@ -179,8 +176,7 @@ class Version_test : public beast::unit_test::Suite
             "\"params\": { "
             "\"api_version\": " +
             std::to_string(
-                std::max(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION.value, RPC::kAPI_BETA_VERSION.value) +
-                1) +
+                std::max(RPC::kApiMaximumSupportedVersion.value, RPC::kApiBetaVersion.value) + 1) +
             "}}";
         auto re = env.rpc("json2", '[' + withoutApiVerion + ", " + withWrongApiVerion + ']');
 
@@ -230,15 +226,15 @@ class Version_test : public beast::unit_test::Suite
         auto jrr = env.rpc(
             "json",
             "version",
-            "{\"api_version\": " + std::to_string(RPC::kAPI_BETA_VERSION) + "}")[jss::result];
+            "{\"api_version\": " + std::to_string(RPC::kApiBetaVersion) + "}")[jss::result];
 
         if (!BEAST_EXPECT(jrr.isMember(jss::version)))
             return;
         if (!BEAST_EXPECT(jrr[jss::version].isMember(jss::first)) &&
             jrr[jss::version].isMember(jss::last))
             return;
-        BEAST_EXPECT(jrr[jss::version][jss::first] == RPC::kAPI_MINIMUM_SUPPORTED_VERSION.value);
-        BEAST_EXPECT(jrr[jss::version][jss::last] == RPC::kAPI_BETA_VERSION.value);
+        BEAST_EXPECT(jrr[jss::version][jss::first] == RPC::kApiMinimumSupportedVersion.value);
+        BEAST_EXPECT(jrr[jss::version][jss::last] == RPC::kApiBetaVersion.value);
     }
 
 public:
diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp
index 31cb62daad..b2fc185b31 100644
--- a/src/test/shamap/FetchPack_test.cpp
+++ b/src/test/shamap/FetchPack_test.cpp
@@ -33,8 +33,8 @@ namespace xrpl::tests {
 class FetchPack_test : public beast::unit_test::Suite
 {
 public:
-    static constexpr auto kTABLE_ITEMS = 100;
-    static constexpr auto kTABLE_ITEMS_EXTRA = 20;
+    static constexpr auto kTableItems = 100;
+    static constexpr auto kTableItemsExtra = 20;
 
     using Map = hash_map<SHAMapHash, Blob>;
     using Table = SHAMap;
diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp
index 3b31459d8b..ab7e01e3af 100644
--- a/src/test/shamap/SHAMap_test.cpp
+++ b/src/test/shamap/SHAMap_test.cpp
@@ -222,7 +222,7 @@ public:
             testcase("build/tear unbacked");
         }
         {
-            constexpr std::array kEYS{
+            static constexpr std::array keys{
                 uint256(
                     "b92891fe4ef6cee585fdc6fda1e09eb4d386363158ec3321b8123e"
                     "5a772c6ca8"),
@@ -248,7 +248,7 @@ public:
                     "292891fe4ef6cee585fdc6fda1e09eb4d386363158ec3321b8123e"
                     "5a772c6ca8")};
 
-            constexpr std::array kHASHES{
+            static constexpr std::array kHashes{
                 uint256(
                     "B7387CFEA0465759ADC718E8C42B52D2309D179B326E239EB5075C"
                     "64B6281F7F"),
@@ -278,21 +278,21 @@ public:
             if (!backed)
                 map.setUnbacked();
 
-            BEAST_EXPECT(map.getHash() == beast::kZERO);
-            for (int k = 0; k < kEYS.size(); ++k)
+            BEAST_EXPECT(map.getHash() == beast::kZero);
+            for (int k = 0; k < keys.size(); ++k)
             {
                 BEAST_EXPECT(map.addItem(
-                    SHAMapNodeType::TnTransactionNm, makeShamapitem(kEYS[k], intToVuc(k))));
-                BEAST_EXPECT(map.getHash().asUInt256() == kHASHES[k]);
+                    SHAMapNodeType::TnTransactionNm, makeShamapitem(keys[k], intToVuc(k))));
+                BEAST_EXPECT(map.getHash().asUInt256() == kHashes[k]);
                 map.invariants();
             }
-            for (int k = kEYS.size() - 1; k >= 0; --k)
+            for (int k = keys.size() - 1; k >= 0; --k)
             {
-                BEAST_EXPECT(map.getHash().asUInt256() == kHASHES[k]);
-                BEAST_EXPECT(map.delItem(kEYS[k]));
+                BEAST_EXPECT(map.getHash().asUInt256() == kHashes[k]);
+                BEAST_EXPECT(map.delItem(keys[k]));
                 map.invariants();
             }
-            BEAST_EXPECT(map.getHash() == beast::kZERO);
+            BEAST_EXPECT(map.getHash() == beast::kZero);
         }
 
         if (backed)
@@ -305,7 +305,7 @@ public:
         }
 
         {
-            constexpr std::array kEYS{
+            static constexpr std::array keys{
                 uint256(
                     "f22891fe4ef6cee585fdc6fda1e09eb4d386363158ec3321b8123e"
                     "5a772c6ca8"),
@@ -335,7 +335,7 @@ public:
             SHAMap map{SHAMapType::FREE, tf};
             if (!backed)
                 map.setUnbacked();
-            for (auto const& k : kEYS)
+            for (auto const& k : keys)
             {
                 map.addItem(SHAMapNodeType::TnTransactionNm, makeShamapitem(k, intToVuc(0)));
                 map.invariants();
@@ -344,7 +344,7 @@ public:
             int h = 7;
             for (auto const& k : map)
             {
-                BEAST_EXPECT(k.key() == kEYS[h]);
+                BEAST_EXPECT(k.key() == keys[h]);
                 --h;
             }
         }
diff --git a/src/test/unit_test/FileDirGuard.h b/src/test/unit_test/FileDirGuard.h
index 4966b8089c..19110469ee 100644
--- a/src/test/unit_test/FileDirGuard.h
+++ b/src/test/unit_test/FileDirGuard.h
@@ -45,9 +45,9 @@ public:
     {
         using namespace boost::filesystem;
 
-        static auto kSUB_DIR_COUNTER = 0;
+        static auto kSubDirCounter = 0;
         if (useCounter)
-            subDir_ += std::to_string(++kSUB_DIR_COUNTER);
+            subDir_ += std::to_string(++kSubDirCounter);
         if (!exists(subDir_))
         {
             create_directory(subDir_);
diff --git a/src/test/unit_test/SuiteJournal.h b/src/test/unit_test/SuiteJournal.h
index 2ae8fd22a8..bd54683031 100644
--- a/src/test/unit_test/SuiteJournal.h
+++ b/src/test/unit_test/SuiteJournal.h
@@ -68,8 +68,8 @@ SuiteJournalSink::writeAlways(beast::Severity level, std::string const& text)
         return "FTL:";
     }();
 
-    static std::mutex kLOG_MUTEX;
-    std::scoped_lock const lock(kLOG_MUTEX);
+    static std::mutex kLogMutex;
+    std::scoped_lock const lock(kLogMutex);
     suite_.log << s << partition_ << text << std::endl;
 }
 
diff --git a/src/test/unit_test/multi_runner.cpp b/src/test/unit_test/multi_runner.cpp
index d21b7acc48..60e979299d 100644
--- a/src/test/unit_test/multi_runner.cpp
+++ b/src/test/unit_test/multi_runner.cpp
@@ -75,19 +75,19 @@ Results::add(SuiteResults const& r)
 
         if (iter != top.end())
         {
-            if (top.size() == kMAX_TOP && iter == top.end() - 1)
+            if (top.size() == kMaxTop && iter == top.end() - 1)
             {
                 // avoid invalidating the iterator
                 *iter = run_time{static_string{static_string::string_view_type{r.name}}, elapsed};
             }
             else
             {
-                if (top.size() == kMAX_TOP)
+                if (top.size() == kMaxTop)
                     top.resize(top.size() - 1);
                 top.emplace(iter, static_string{static_string::string_view_type{r.name}}, elapsed);
             }
         }
-        else if (top.size() < kMAX_TOP)
+        else if (top.size() < kMaxTop)
         {
             top.emplace_back(static_string{static_string::string_view_type{r.name}}, elapsed);
         }
@@ -103,14 +103,14 @@ Results::merge(Results const& r)
     failed += r.failed;
 
     // combine the two top collections
-    boost::container::static_vector<run_time, 2 * kMAX_TOP> topResult;
+    boost::container::static_vector<run_time, 2 * kMaxTop> topResult;
     topResult.resize(top.size() + r.top.size());
     std::ranges::merge(top, r.top, topResult.begin(), [](run_time const& t1, run_time const& t2) {
         return t1.second > t2.second;
     });
 
-    if (topResult.size() > kMAX_TOP)
-        topResult.resize(kMAX_TOP);
+    if (topResult.size() > kMaxTop)
+        topResult.resize(kMaxTop);
 
     top = topResult;
 }
@@ -218,8 +218,8 @@ MultiRunnerBase<IsParent>::MultiRunnerBase()
         if (IsParent)
         {
             // cleanup any leftover state for any previous failed runs
-            boost::interprocess::shared_memory_object::remove(kSHARED_MEM_NAME);
-            boost::interprocess::message_queue::remove(kMESSAGE_QUEUE_NAME);
+            boost::interprocess::shared_memory_object::remove(kSharedMemName);
+            boost::interprocess::message_queue::remove(kMessageQueueName);
         }
 
         shared_mem_ = boost::interprocess::shared_memory_object{
@@ -227,7 +227,7 @@ MultiRunnerBase<IsParent>::MultiRunnerBase()
                 IsParent,
                 boost::interprocess::create_only_t,
                 boost::interprocess::open_only_t>{},
-            kSHARED_MEM_NAME,
+            kSharedMemName,
             boost::interprocess::read_write};
 
         if (IsParent)
@@ -235,14 +235,14 @@ MultiRunnerBase<IsParent>::MultiRunnerBase()
             shared_mem_.truncate(sizeof(Inner));
             message_queue_ = std::make_unique<boost::interprocess::message_queue>(
                 boost::interprocess::create_only,
-                kMESSAGE_QUEUE_NAME,
+                kMessageQueueName,
                 /*max messages*/ 16,
                 /*max message size*/ 1 << 20);
         }
         else
         {
             message_queue_ = std::make_unique<boost::interprocess::message_queue>(
-                boost::interprocess::open_only, kMESSAGE_QUEUE_NAME);
+                boost::interprocess::open_only, kMessageQueueName);
         }
 
         region_ = boost::interprocess::mapped_region{shared_mem_, boost::interprocess::read_write};
@@ -259,8 +259,8 @@ MultiRunnerBase<IsParent>::MultiRunnerBase()
     {
         if (IsParent)
         {
-            boost::interprocess::shared_memory_object::remove(kSHARED_MEM_NAME);
-            boost::interprocess::message_queue::remove(kMESSAGE_QUEUE_NAME);
+            boost::interprocess::shared_memory_object::remove(kSharedMemName);
+            boost::interprocess::message_queue::remove(kMessageQueueName);
         }
         throw;
     }
@@ -272,8 +272,8 @@ MultiRunnerBase<IsParent>::~MultiRunnerBase()
     if (IsParent)
     {
         inner_->~Inner();
-        boost::interprocess::shared_memory_object::remove(kSHARED_MEM_NAME);
-        boost::interprocess::message_queue::remove(kMESSAGE_QUEUE_NAME);
+        boost::interprocess::shared_memory_object::remove(kSharedMemName);
+        boost::interprocess::message_queue::remove(kMessageQueueName);
     }
 }
 
diff --git a/src/test/unit_test/multi_runner.h b/src/test/unit_test/multi_runner.h
index 241f9630f6..5ebc8ec0a8 100644
--- a/src/test/unit_test/multi_runner.h
+++ b/src/test/unit_test/multi_runner.h
@@ -59,13 +59,13 @@ struct Results
     // pointers from different memory spaces do not co-mingle
     using run_time = std::pair<static_string, typename clock_type::duration>;
 
-    static constexpr auto kMAX_TOP = 10;
+    static constexpr auto kMaxTop = 10;
 
     std::size_t suites = 0;
     std::size_t cases = 0;
     std::size_t total = 0;
     std::size_t failed = 0;
-    boost::container::static_vector<run_time, kMAX_TOP> top;
+    boost::container::static_vector<run_time, kMaxTop> top;
     typename clock_type::time_point start = clock_type::now();
 
     void
@@ -131,10 +131,10 @@ class MultiRunnerBase
         printResults(S& s);
     };
 
-    static constexpr char const* kSHARED_MEM_NAME = "XrpldUnitTestSharedMem";
+    static constexpr char const* kSharedMemName = "XrpldUnitTestSharedMem";
     // name of the message queue a multi_runner_child will use to communicate
     // with multi_runner_parent
-    static constexpr char const* kMESSAGE_QUEUE_NAME = "XrpldUnitTestMessageQueue";
+    static constexpr char const* kMessageQueueName = "XrpldUnitTestMessageQueue";
 
     // `inner_` will be created in shared memory
     Inner* inner_;
diff --git a/src/test/unit_test/utils.h b/src/test/unit_test/utils.h
index beccf1c92e..028823c763 100644
--- a/src/test/unit_test/utils.h
+++ b/src/test/unit_test/utils.h
@@ -10,8 +10,8 @@ namespace xrpl::test {
 inline bool
 equal(SecretKey const& lhs, SecretKey const& rhs)
 {
-    return lhs.size() == SecretKey::kSIZE && rhs.size() == SecretKey::kSIZE &&
-        std::memcmp(lhs.data(), rhs.data(), SecretKey::kSIZE) == 0;
+    return lhs.size() == SecretKey::kSize && rhs.size() == SecretKey::kSize &&
+        std::memcmp(lhs.data(), rhs.data(), SecretKey::kSize) == 0;
 }
 
 }  // namespace xrpl::test
diff --git a/src/tests/libxrpl/basics/Slice.cpp b/src/tests/libxrpl/basics/Slice.cpp
index f999d99934..02287dddc6 100644
--- a/src/tests/libxrpl/basics/Slice.cpp
+++ b/src/tests/libxrpl/basics/Slice.cpp
@@ -8,7 +8,7 @@
 
 using namespace xrpl;
 
-static std::uint8_t const kDATA[] = {
+static std::uint8_t const kData[] = {
     0xa8, 0xa1, 0x38, 0x45, 0x23, 0xec, 0xe4, 0x23, 0x71, 0x6d, 0x2a, 0x18, 0xb4, 0x70, 0xcb, 0xf5,
     0xac, 0x2d, 0x89, 0x4d, 0x19, 0x9c, 0xf0, 0x2c, 0x15, 0xd1, 0xf9, 0x9b, 0x66, 0xd2, 0x30, 0xd3};
 
@@ -21,9 +21,9 @@ TEST(Slice, equality_and_inequality)
     EXPECT_EQ(s0, s0);
 
     // Test slices of equal and unequal size pointing to same data:
-    for (std::size_t i = 0; i != sizeof(kDATA); ++i)
+    for (std::size_t i = 0; i != sizeof(kData); ++i)
     {
-        Slice const s1{kDATA, i};
+        Slice const s1{kData, i};
 
         EXPECT_EQ(s1.size(), i);
         EXPECT_NE(s1.data(), nullptr);
@@ -37,9 +37,9 @@ TEST(Slice, equality_and_inequality)
             EXPECT_NE(s1, s0);
         }
 
-        for (std::size_t j = 0; j != sizeof(kDATA); ++j)
+        for (std::size_t j = 0; j != sizeof(kData); ++j)
         {
-            Slice const s2{kDATA, j};
+            Slice const s2{kData, j};
 
             if (i == j)
             {
@@ -53,11 +53,11 @@ TEST(Slice, equality_and_inequality)
     }
 
     // Test slices of equal size but pointing to different data:
-    std::array<std::uint8_t, sizeof(kDATA)> a{};
-    std::array<std::uint8_t, sizeof(kDATA)> b{};
+    std::array<std::uint8_t, sizeof(kData)> a{};
+    std::array<std::uint8_t, sizeof(kData)> b{};
 
-    for (std::size_t i = 0; i != sizeof(kDATA); ++i)
-        a[i] = b[i] = kDATA[i];
+    for (std::size_t i = 0; i != sizeof(kData); ++i)
+        a[i] = b[i] = kData[i];
 
     EXPECT_EQ(makeSlice(a), makeSlice(b));
     b[7]++;
@@ -68,23 +68,23 @@ TEST(Slice, equality_and_inequality)
 
 TEST(Slice, indexing)
 {
-    Slice const s{kDATA, sizeof(kDATA)};
+    Slice const s{kData, sizeof(kData)};
 
-    for (std::size_t i = 0; i != sizeof(kDATA); ++i)
-        EXPECT_EQ(s[i], kDATA[i]);
+    for (std::size_t i = 0; i != sizeof(kData); ++i)
+        EXPECT_EQ(s[i], kData[i]);
 }
 
 TEST(Slice, advancing)
 {
-    for (std::size_t i = 0; i < sizeof(kDATA); ++i)
+    for (std::size_t i = 0; i < sizeof(kData); ++i)
     {
-        for (std::size_t j = 0; i + j < sizeof(kDATA); ++j)
+        for (std::size_t j = 0; i + j < sizeof(kData); ++j)
         {
-            Slice s(kDATA + i, sizeof(kDATA) - i);
+            Slice s(kData + i, sizeof(kData) - i);
             s += j;
 
-            EXPECT_EQ(s.data(), kDATA + i + j);
-            EXPECT_EQ(s.size(), sizeof(kDATA) - i - j);
+            EXPECT_EQ(s.data(), kData + i + j);
+            EXPECT_EQ(s.size(), sizeof(kData) - i - j);
         }
     }
 }
diff --git a/src/tests/libxrpl/helpers/TestSink.cpp b/src/tests/libxrpl/helpers/TestSink.cpp
index af2c4bb280..428b7ad95b 100644
--- a/src/tests/libxrpl/helpers/TestSink.cpp
+++ b/src/tests/libxrpl/helpers/TestSink.cpp
@@ -112,11 +112,11 @@ TestSink::writeAlways(beast::Severity level, std::string const& text)
         }
     }();
 
-    constexpr auto kRESET = "\033[0m";
+    static constexpr auto kReset = "\033[0m";
 
     if (supportsColor)
     {
-        stream << color << prefix << " " << text << kRESET << std::endl;
+        stream << color << prefix << " " << text << kReset << std::endl;
     }
     else
     {
diff --git a/src/tests/libxrpl/helpers/TxTest.cpp b/src/tests/libxrpl/helpers/TxTest.cpp
index 29db311fce..32667ba13d 100644
--- a/src/tests/libxrpl/helpers/TxTest.cpp
+++ b/src/tests/libxrpl/helpers/TxTest.cpp
@@ -41,7 +41,7 @@ namespace xrpl::test {
 FeatureBitset
 allFeatures()
 {
-    static FeatureBitset const kFEATURES = [] {
+    static FeatureBitset const kFeatures = [] {
         auto const& sa = allAmendments();
         std::vector<uint256> feats;
         feats.reserve(sa.size());
@@ -52,7 +52,7 @@ allFeatures()
         }
         return FeatureBitset(feats);
     }();
-    return kFEATURES;
+    return kFeatures;
 }
 
 //------------------------------------------------------------------------------
@@ -73,7 +73,7 @@ TxTest::TxTest(std::optional<FeatureBitset> features)
 
     // Create a genesis ledger as the base
     closedLedger_ = std::make_shared<Ledger>(
-        kCREATE_GENESIS,
+        kCreateGenesis,
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
         *rules_,
         fees,
@@ -85,7 +85,7 @@ TxTest::TxTest(std::optional<FeatureBitset> features)
 
     // Create an open view on top of the genesis ledger
     openLedger_ =
-        std::make_shared<OpenView>(kOPEN_LEDGER, closedLedger_.get(), *rules_, closedLedger_);
+        std::make_shared<OpenView>(kOpenLedger, closedLedger_.get(), *rules_, closedLedger_);
 }
 
 bool
@@ -213,7 +213,7 @@ TxTest::close()
 
     openLedger_ =
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-        std::make_shared<OpenView>(kOPEN_LEDGER, closedLedger_.get(), *rules_, closedLedger_);
+        std::make_shared<OpenView>(kOpenLedger, closedLedger_.get(), *rules_, closedLedger_);
 }
 
 void
diff --git a/src/tests/libxrpl/helpers/TxTest.h b/src/tests/libxrpl/helpers/TxTest.h
index 8ba9898d99..0b578c7e7f 100644
--- a/src/tests/libxrpl/helpers/TxTest.h
+++ b/src/tests/libxrpl/helpers/TxTest.h
@@ -46,7 +46,7 @@ template <std::integral T>
 constexpr XRPAmount
 XRP(T xrp)
 {
-    return XRPAmount{static_cast<std::int64_t>(xrp) * kDROPS_PER_XRP.drops()};
+    return XRPAmount{static_cast<std::int64_t>(xrp) * kDropsPerXrp.drops()};
 }
 
 /**
@@ -58,7 +58,7 @@ template <std::floating_point T>
 XRPAmount
 XRP(T xrp)
 {
-    return XRPAmount{static_cast<std::int64_t>(std::round(xrp * kDROPS_PER_XRP.drops()))};
+    return XRPAmount{static_cast<std::int64_t>(std::round(xrp * kDropsPerXrp.drops()))};
 }
 
 /**
@@ -69,7 +69,7 @@ XRP(T xrp)
 inline XRPAmount
 XRP(Number const& xrp)
 {
-    return XRPAmount{static_cast<std::int64_t>(xrp * kDROPS_PER_XRP.drops())};
+    return XRPAmount{static_cast<std::int64_t>(xrp * kDropsPerXrp.drops())};
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/tests/libxrpl/json/Value.cpp b/src/tests/libxrpl/json/Value.cpp
index 809c2cf559..03f565dffb 100644
--- a/src/tests/libxrpl/json/Value.cpp
+++ b/src/tests/libxrpl/json/Value.cpp
@@ -23,38 +23,38 @@ namespace xrpl {
 TEST(json_value, limits)
 {
     using namespace json;
-    static_assert(Value::kMIN_INT == Int(~(UInt(-1) / 2)));
-    static_assert(Value::kMAX_INT == Int(UInt(-1) / 2));
-    static_assert(Value::kMAX_UINT == UInt(-1));
+    static_assert(Value::kMinInt == Int(~(UInt(-1) / 2)));
+    static_assert(Value::kMaxInt == Int(UInt(-1) / 2));
+    static_assert(Value::kMaxUInt == UInt(-1));
 }
 
 TEST(json_value, construct_and_compare_Json_StaticString)
 {
-    static constexpr char kSAMPLE[]{"Contents of a json::StaticString"};
+    static constexpr char kSample[]{"Contents of a json::StaticString"};
 
-    static constexpr json::StaticString kTEST1(kSAMPLE);
-    char const* addrTest1{kTEST1};
+    static constexpr json::StaticString kTest1(kSample);
+    char const* addrTest1{kTest1};
 
-    EXPECT_EQ(addrTest1, &kSAMPLE[0]);
-    EXPECT_EQ(kTEST1.cStr(), &kSAMPLE[0]);
+    EXPECT_EQ(addrTest1, &kSample[0]);
+    EXPECT_EQ(kTest1.cStr(), &kSample[0]);
 
-    static constexpr json::StaticString kTEST2{"Contents of a json::StaticString"};
-    static constexpr json::StaticString kTEST3{"Another StaticString"};
+    static constexpr json::StaticString kTest2{"Contents of a json::StaticString"};
+    static constexpr json::StaticString kTest3{"Another StaticString"};
 
-    EXPECT_EQ(kTEST1, kTEST2);
-    EXPECT_NE(kTEST1, kTEST3);
+    EXPECT_EQ(kTest1, kTest2);
+    EXPECT_NE(kTest1, kTest3);
 
-    std::string const str{kSAMPLE};
-    EXPECT_EQ(str, kTEST2);
-    EXPECT_NE(str, kTEST3);
-    EXPECT_EQ(kTEST2, str);
-    EXPECT_NE(kTEST3, str);
+    std::string const str{kSample};
+    EXPECT_EQ(str, kTest2);
+    EXPECT_NE(str, kTest3);
+    EXPECT_EQ(kTest2, str);
+    EXPECT_NE(kTest3, str);
 }
 
 TEST(json_value, different_types)
 {
     // Exercise ValueType constructor
-    static constexpr json::StaticString kSTATIC_STR{"staticStr"};
+    static constexpr json::StaticString kStaticStr{"staticStr"};
 
     auto testCopy = [](json::ValueType typ) {
         json::Value val{typ};
@@ -139,7 +139,7 @@ TEST(json_value, different_types)
         EXPECT_FALSE(stringV.isObjectOrNull());
     }
     {
-        json::Value const staticStrV{kSTATIC_STR};
+        json::Value const staticStrV{kStaticStr};
         {
             json::Value const cpy{staticStrV};
             EXPECT_EQ(staticStrV.type(), json::ValueType::String);
@@ -1124,23 +1124,23 @@ TEST(json_value, access_members)
     val = json::Value(json::ValueType::Object);
     EXPECT_EQ(val.type(), json::ValueType::Object);
     EXPECT_EQ(val.size(), 0);
-    static json::StaticString const kSTATIC_THREE("three");
-    val[kSTATIC_THREE] = 3;
+    static json::StaticString const kStaticThree("three");
+    val[kStaticThree] = 3;
     val["two"] = 2;
     EXPECT_EQ(val.size(), 2);
     EXPECT_TRUE(val.isValidIndex(1));
     EXPECT_FALSE(val.isValidIndex(2));
-    EXPECT_EQ(val[kSTATIC_THREE], 3);
+    EXPECT_EQ(val[kStaticThree], 3);
     EXPECT_TRUE(val.isMember("two"));
-    EXPECT_TRUE(val.isMember(kSTATIC_THREE));
+    EXPECT_TRUE(val.isMember(kStaticThree));
     EXPECT_FALSE(val.isMember("key"));
     {
         json::Value const constVal = val;
         EXPECT_EQ(constVal["two"], 2);
         EXPECT_EQ(constVal["four"].type(), json::ValueType::Null);
-        EXPECT_EQ(constVal[kSTATIC_THREE], 3);
+        EXPECT_EQ(constVal[kStaticThree], 3);
         EXPECT_TRUE(constVal.isMember("two"));
-        EXPECT_TRUE(constVal.isMember(kSTATIC_THREE));
+        EXPECT_TRUE(constVal.isMember(kStaticThree));
         EXPECT_FALSE(constVal.isMember("key"));
         EXPECT_EQ(val.get(std::string("two"), "backup"), 2);
         EXPECT_EQ(val.get("missing", "default2"), "default2");
@@ -1172,18 +1172,18 @@ TEST(json_value, remove_members)
     EXPECT_EQ(val.removeMember(std::string("member")).type(), json::ValueType::Null);
 
     val = json::Value(json::ValueType::Object);
-    static json::StaticString const kSTATIC_THREE("three");
-    val[kSTATIC_THREE] = 3;
+    static json::StaticString const kStaticThree("three");
+    val[kStaticThree] = 3;
     val["two"] = 2;
     EXPECT_EQ(val.size(), 2);
 
     EXPECT_EQ(val.removeMember(std::string("six")).type(), json::ValueType::Null);
     EXPECT_EQ(val.size(), 2);
 
-    EXPECT_EQ(val.removeMember(kSTATIC_THREE), 3);
+    EXPECT_EQ(val.removeMember(kStaticThree), 3);
     EXPECT_EQ(val.size(), 1);
 
-    EXPECT_EQ(val.removeMember(kSTATIC_THREE).type(), json::ValueType::Null);
+    EXPECT_EQ(val.removeMember(kStaticThree).type(), json::ValueType::Null);
     EXPECT_EQ(val.size(), 1);
 
     EXPECT_EQ(val.removeMember(std::string("two")), 2);
@@ -1295,14 +1295,14 @@ TEST(json_value, nest_limits)
 
         {
             // Within object nest limit
-            auto json{nest(std::min(10u, json::Reader::kNEST_LIMIT))};
+            auto json{nest(std::min(10u, json::Reader::kNestLimit))};
             json::Value j;
             EXPECT_TRUE(r.parse(json, j));
         }
 
         {
             // Exceed object nest limit
-            auto json{nest(json::Reader::kNEST_LIMIT + 1)};
+            auto json{nest(json::Reader::kNestLimit + 1)};
             json::Value j;
             EXPECT_FALSE(r.parse(json, j));
         }
@@ -1319,7 +1319,7 @@ TEST(json_value, nest_limits)
     };
     {
         // Exceed array nest limit
-        auto json{nest(json::Reader::kNEST_LIMIT + 1)};
+        auto json{nest(json::Reader::kNestLimit + 1)};
         json::Value j;
         EXPECT_FALSE(r.parse(json, j));
     }
diff --git a/src/tests/libxrpl/protocol_autogen/TestHelpers.h b/src/tests/libxrpl/protocol_autogen/TestHelpers.h
index 3cd5f298ea..b8449f2bca 100644
--- a/src/tests/libxrpl/protocol_autogen/TestHelpers.h
+++ b/src/tests/libxrpl/protocol_autogen/TestHelpers.h
@@ -159,7 +159,7 @@ canonical_ARRAY()
 inline STObject
 canonical_OBJECT()
 {
-    return STObject{kSF_GENERIC};
+    return STObject{kSfGeneric};
 }
 
 inline STPathSet
diff --git a/src/tests/libxrpl/tx/AccountSet.cpp b/src/tests/libxrpl/tx/AccountSet.cpp
index 4187ec1115..d00df152ae 100644
--- a/src/tests/libxrpl/tx/AccountSet.cpp
+++ b/src/tests/libxrpl/tx/AccountSet.cpp
@@ -382,7 +382,7 @@ TEST(AccountSet, WalletID)
 
     // Clear the wallet locator by setting to zero
     EXPECT_EQ(
-        env.submit(transactions::AccountSetBuilder{alice}.setWalletLocator(beast::kZERO), alice)
+        env.submit(transactions::AccountSetBuilder{alice}.setWalletLocator(beast::kZero), alice)
             .ter,
         tesSUCCESS);
     env.close();
@@ -414,7 +414,7 @@ TEST(AccountSet, EmailHash)
 
     // Clear the email hash by setting to zero
     EXPECT_EQ(
-        env.submit(transactions::AccountSetBuilder{alice}.setEmailHash(beast::kZERO), alice).ter,
+        env.submit(transactions::AccountSetBuilder{alice}.setEmailHash(beast::kZero), alice).ter,
         tesSUCCESS);
     env.close();
 
@@ -619,7 +619,7 @@ TEST(AccountSet, Ticket)
     // Verify alice has 1 owner object (the ticket)
     EXPECT_EQ(env.getAccountRoot(alice.id()).getOwnerCount(), 1u);
     // Verify ticket exists
-    EXPECT_TRUE(env.getClosedLedger().exists(keylet::kTICKET(alice.id(), ticketSeq)));
+    EXPECT_TRUE(env.getClosedLedger().exists(keylet::kTicket(alice.id(), ticketSeq)));
 
     // Try using a ticket that alice doesn't have
     EXPECT_EQ(
@@ -629,7 +629,7 @@ TEST(AccountSet, Ticket)
     env.close();
 
     // Verify ticket still exists
-    EXPECT_TRUE(env.getClosedLedger().exists(keylet::kTICKET(alice.id(), ticketSeq)));
+    EXPECT_TRUE(env.getClosedLedger().exists(keylet::kTicket(alice.id(), ticketSeq)));
 
     // Get alice's sequence before using the ticket
     std::uint32_t const aliceSeq = env.getAccountRoot(alice.id()).getSequence();
@@ -642,7 +642,7 @@ TEST(AccountSet, Ticket)
 
     // Verify ticket is consumed (no owner objects)
     EXPECT_EQ(env.getAccountRoot(alice.id()).getOwnerCount(), 0u);
-    EXPECT_FALSE(env.getClosedLedger().exists(keylet::kTICKET(alice.id(), ticketSeq)));
+    EXPECT_FALSE(env.getClosedLedger().exists(keylet::kTicket(alice.id(), ticketSeq)));
 
     // Verify alice's sequence did NOT advance (ticket use doesn't increment seq)
     EXPECT_EQ(env.getAccountRoot(alice.id()).getSequence(), aliceSeq);
diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp
index 77561f9f79..a474c9c339 100644
--- a/src/xrpld/app/consensus/RCLConsensus.cpp
+++ b/src/xrpld/app/consensus/RCLConsensus.cpp
@@ -130,7 +130,7 @@ RCLConsensus::Adaptor::Adaptor(
 
     JLOG(j_.info()) << "Consensus engine started (cookie: " + std::to_string(valCookie_) + ")";
 
-    if (validatorKeys_.nodeID != beast::kZERO && validatorKeys_.keys)
+    if (validatorKeys_.nodeID != beast::kZero && validatorKeys_.keys)
     {
         JLOG(j_.info()) << "Validator identity: "
                         << toBase58(TokenType::NodePublic, validatorKeys_.keys->masterPublicKey);
@@ -214,8 +214,8 @@ RCLConsensus::Adaptor::share(RCLCxTx const& tx)
         msg.set_rawtransaction(slice.data(), slice.size());
         msg.set_status(protocol::tsNEW);
         msg.set_receivetimestamp(app_.getTimeKeeper().now().time_since_epoch().count());
-        static std::set<Peer::id_t> const kSKIP{};
-        app_.getOverlay().relay(tx.id(), msg, kSKIP);
+        static std::set<Peer::id_t> const kSkip{};
+        app_.getOverlay().relay(tx.id(), msg, kSkip);
     }
     else
     {
@@ -406,7 +406,7 @@ RCLConsensus::Adaptor::onClose(
         std::move(initialSet),
         RCLCxPeerPos::Proposal{
             initialLedger->header().parentHash,
-            RCLCxPeerPos::Proposal::kSEQ_JOIN,
+            RCLCxPeerPos::Proposal::kSeqJoin,
             setHash,
             closeTime,
             app_.getTimeKeeper().closeTime(),
@@ -557,7 +557,7 @@ RCLConsensus::Adaptor::doAccept(
 
                 auto const wait = curr - seq;
 
-                if (wait && (wait % kCENSORSHIP_WARN_INTERNAL == 0))
+                if (wait && (wait % kCensorshipWarnInternal == 0))
                 {
                     std::ostringstream ss;
                     ss << "Potential Censorship: Eligible tx " << id
@@ -733,8 +733,8 @@ RCLConsensus::Adaptor::notify(
     s.set_ledgerseq(ledger.seq());
     s.set_networktime(app_.getTimeKeeper().now().time_since_epoch().count());
     s.set_ledgerhashprevious(
-        ledger.parentID().begin(), std::decay_t<decltype(ledger.parentID())>::kBYTES);
-    s.set_ledgerhash(ledger.id().begin(), std::decay_t<decltype(ledger.id())>::kBYTES);
+        ledger.parentID().begin(), std::decay_t<decltype(ledger.parentID())>::kBytes);
+    s.set_ledgerhash(ledger.id().begin(), std::decay_t<decltype(ledger.id())>::kBytes);
 
     std::uint32_t uMin = 0, uMax = 0;
     if (!ledgerMaster_.getFullValidatedRange(uMin, uMax))
@@ -831,7 +831,7 @@ RCLConsensus::Adaptor::validate(RCLCxLedger const& ledger, RCLTxSet const& txns,
             v.setFieldU32(sfLedgerSequence, ledger.seq());
 
             if (proposing)
-                v.setFlag(kVF_FULL_VALIDATION);
+                v.setFlag(kVfFullValidation);
 
             // Attest to the hash of what we consider to be the last fully
             // validated ledger. This may be the hash of the ledger we are
diff --git a/src/xrpld/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h
index 62a83d107e..32759300fa 100644
--- a/src/xrpld/app/consensus/RCLConsensus.h
+++ b/src/xrpld/app/consensus/RCLConsensus.h
@@ -33,7 +33,7 @@ class RCLConsensus
 {
     /** Warn for transactions that haven't been included every so many ledgers.
      */
-    constexpr static unsigned int kCENSORSHIP_WARN_INTERNAL = 15;
+    static constexpr unsigned int kCensorshipWarnInternal = 15;
 
     // Implements the Adaptor template interface required by Consensus.
     class Adaptor
diff --git a/src/xrpld/app/ledger/LedgerReplayer.h b/src/xrpld/app/ledger/LedgerReplayer.h
index 5d537bfd24..e2d256f597 100644
--- a/src/xrpld/app/ledger/LedgerReplayer.h
+++ b/src/xrpld/app/ledger/LedgerReplayer.h
@@ -17,33 +17,33 @@ class LedgerReplayClient;
 
 namespace LedgerReplayParameters {
 // timeout value for LedgerReplayTask
-auto constexpr kTASK_TIMEOUT = std::chrono::milliseconds{500};
+constexpr auto kTaskTimeout = std::chrono::milliseconds{500};
 
 // for LedgerReplayTask to calculate max allowed timeouts
-// = max( kTASK_MAX_TIMEOUTS_MINIMUM,
-//        (# of ledger to replay) * kTASK_MAX_TIMEOUTS_MULTIPLIER)
-std::uint32_t constexpr kTASK_MAX_TIMEOUTS_MULTIPLIER = 2;
-std::uint32_t constexpr kTASK_MAX_TIMEOUTS_MINIMUM = 10;
+// = max( kTaskMaxTimeoutsMinimum,
+//        (# of ledger to replay) * kTaskMaxTimeoutsMultiplier)
+constexpr std::uint32_t kTaskMaxTimeoutsMultiplier = 2;
+constexpr std::uint32_t kTaskMaxTimeoutsMinimum = 10;
 
 // timeout value for subtasks: LedgerDeltaAcquire and SkipListAcquire
-auto constexpr kSUB_TASK_TIMEOUT = std::chrono::milliseconds{250};
+constexpr auto kSubTaskTimeout = std::chrono::milliseconds{250};
 // max of allowed subtask timeouts
-std::uint32_t constexpr kSUB_TASK_MAX_TIMEOUTS = 10;
+constexpr std::uint32_t kSubTaskMaxTimeouts = 10;
 
 // max number of peers that do not support the ledger replay feature
 // returned by the PeerSet before switch to fallback
-auto constexpr kMAX_NO_FEATURE_PEER_COUNT = 2;
+constexpr auto kMaxNoFeaturePeerCount = 2;
 // subtask timeout value after fallback
-auto constexpr kSUB_TASK_FALLBACK_TIMEOUT = std::chrono::milliseconds{1000};
+constexpr auto kSubTaskFallbackTimeout = std::chrono::milliseconds{1000};
 
 // for LedgerReplayer to limit the number of LedgerReplayTask
-std::uint32_t constexpr kMAX_TASKS = 10;
+constexpr std::uint32_t kMaxTasks = 10;
 
 // for LedgerReplayer to limit the number of ledgers to replay in one task
-std::uint32_t constexpr kMAX_TASK_SIZE = 256;
+constexpr std::uint32_t kMaxTaskSize = 256;
 
 // to limit the number of LedgerReplay related jobs in JobQueue
-std::uint32_t constexpr kMAX_QUEUED_TASKS = 100;
+constexpr std::uint32_t kMaxQueuedTasks = 100;
 }  // namespace LedgerReplayParameters
 
 /**
diff --git a/src/xrpld/app/ledger/LocalTxs.h b/src/xrpld/app/ledger/LocalTxs.h
index 779dd4f02c..1575a18075 100644
--- a/src/xrpld/app/ledger/LocalTxs.h
+++ b/src/xrpld/app/ledger/LocalTxs.h
@@ -17,7 +17,7 @@ public:
     // The number of ledgers to hold a transaction is essentially
     // arbitrary. It should be sufficient to allow the transaction to
     // get into a fully-validated ledger.
-    static constexpr int kHOLD_LEDGERS = 5;
+    static constexpr int kHoldLedgers = 5;
 
     virtual ~LocalTxs() = default;
 
diff --git a/src/xrpld/app/ledger/detail/BuildLedger.cpp b/src/xrpld/app/ledger/detail/BuildLedger.cpp
index 5143769178..a77c1c9c50 100644
--- a/src/xrpld/app/ledger/detail/BuildLedger.cpp
+++ b/src/xrpld/app/ledger/detail/BuildLedger.cpp
@@ -73,7 +73,7 @@ buildLedgerImpl(
 
     // Accept ledger
     XRPL_ASSERT(
-        built->header().seq < kXRP_LEDGER_EARLIEST_FEES || built->read(keylet::fees()),
+        built->header().seq < kXrpLedgerEarliestFees || built->read(keylet::fees()),
         "xrpl::buildLedgerImpl : valid ledger fees");
     built->setAccepted(closeTime, closeResolution, closeTimeCorrect);
 
@@ -225,7 +225,7 @@ buildLedger(
     return buildLedgerImpl(
         replayData.parent(),
         replayLedger->header().closeTime,
-        ((replayLedger->header().closeFlags & kS_LCF_NO_CONSENSUS_TIME) == 0),
+        ((replayLedger->header().closeFlags & kSLcfNoConsensusTime) == 0),
         replayLedger->header().closeTimeResolution,
         app,
         j,
diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp
index 52cff26356..9ba7bdf22e 100644
--- a/src/xrpld/app/ledger/detail/InboundLedger.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp
@@ -55,17 +55,17 @@ namespace xrpl {
 
 using namespace std::chrono_literals;
 
-static constexpr auto kPEER_COUNT_START = 5;            // Number of peers to start with
-static constexpr auto kPEER_COUNT_ADD = 3;              // Number of peers to add on a timeout
-static constexpr auto kLEDGER_TIMEOUT_RETRIES_MAX = 6;  // how many timeouts before we give up
-static constexpr auto kLEDGER_BECOME_AGGRESSIVE_THRESHOLD =
-    4;                                            // how many timeouts before we get aggressive
-static constexpr auto kMISSING_NODES_FIND = 256;  // Number of nodes to find initially
-static constexpr auto kREQ_NODES_REPLY = 128;     // Number of nodes to request for a reply
-static constexpr auto kREQ_NODES = 12;            // Number of nodes to request blindly
+static constexpr auto kPeerCountStart = 5;           // Number of peers to start with
+static constexpr auto kPeerCountAdd = 3;             // Number of peers to add on a timeout
+static constexpr auto kLedgerTimeoutRetriesMax = 6;  // how many timeouts before we give up
+static constexpr auto kLedgerBecomeAggressiveThreshold =
+    4;                                          // how many timeouts before we get aggressive
+static constexpr auto kMissingNodesFind = 256;  // Number of nodes to find initially
+static constexpr auto kReqNodesReply = 128;     // Number of nodes to request for a reply
+static constexpr auto kReqNodes = 12;           // Number of nodes to request blindly
 
 // millisecond for each ledger timeout
-auto constexpr kLEDGER_ACQUIRE_TIMEOUT = 3000ms;
+constexpr auto kLedgerAcquireTimeout = 3000ms;
 
 InboundLedger::InboundLedger(
     Application& app,
@@ -77,7 +77,7 @@ InboundLedger::InboundLedger(
     : TimeoutCounter(
           app,
           hash,
-          kLEDGER_ACQUIRE_TIMEOUT,
+          kLedgerAcquireTimeout,
           {.jobType = JtLedgerData, .jobName = "InboundLedger", .jobLimit = 5},
           app.getJournal("InboundLedger"))
     , clock_(clock)
@@ -109,7 +109,7 @@ InboundLedger::init(ScopedLockType& collectionLock)
     JLOG(journal_.debug()) << "Acquiring ledger we already have in "
                            << " local store. " << hash_;
     XRPL_ASSERT(
-        ledger_->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger_->read(keylet::fees()),
+        ledger_->header().seq < kXrpLedgerEarliestFees || ledger_->read(keylet::fees()),
         "xrpl::InboundLedger::init : valid ledger fees");
     ledger_->setImmutable();
 
@@ -331,7 +331,7 @@ InboundLedger::tryDB(NodeStore::Database& srcDB)
         JLOG(journal_.debug()) << "Had everything locally";
         complete_ = true;
         XRPL_ASSERT(
-            ledger_->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger_->read(keylet::fees()),
+            ledger_->header().seq < kXrpLedgerEarliestFees || ledger_->read(keylet::fees()),
             "xrpl::InboundLedger::tryDB : valid ledger fees");
         ledger_->setImmutable();
     }
@@ -350,7 +350,7 @@ InboundLedger::onTimer(bool wasProgress, ScopedLockType&)
         return;
     }
 
-    if (timeouts_ > kLEDGER_TIMEOUT_RETRIES_MAX)
+    if (timeouts_ > kLedgerTimeoutRetriesMax)
     {
         if (seq_ != 0)
         {
@@ -391,7 +391,7 @@ void
 InboundLedger::addPeers()
 {
     peerSet_->addPeers(
-        (getPeerCount() == 0) ? kPEER_COUNT_START : kPEER_COUNT_ADD,
+        (getPeerCount() == 0) ? kPeerCountStart : kPeerCountAdd,
         [this](auto peer) { return peer->hasLedger(hash_, seq_); },
         [this](auto peer) {
             // For historical nodes, do not trigger too soon
@@ -427,7 +427,7 @@ InboundLedger::done()
     if (complete_ && !failed_ && ledger_)
     {
         XRPL_ASSERT(
-            ledger_->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger_->read(keylet::fees()),
+            ledger_->header().seq < kXrpLedgerEarliestFees || ledger_->read(keylet::fees()),
             "xrpl::InboundLedger::done : valid ledger fees");
         ledger_->setImmutable();
         switch (reason_)
@@ -505,7 +505,7 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
         // Be more aggressive if we've timed out at least once
         tmGL.set_querytype(protocol::qtINDIRECT);
 
-        if (!progress_ && !failed_ && byHash_ && (timeouts_ > kLEDGER_BECOME_AGGRESSIVE_THRESHOLD))
+        if (!progress_ && !failed_ && byHash_ && (timeouts_ > kLedgerBecomeAggressiveThreshold))
         {
             auto need = getNeededHashes();
 
@@ -615,7 +615,7 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
 
             // Release the lock while we process the large state map
             sl.unlock();
-            auto nodes = ledger_->stateMap().getMissingNodes(kMISSING_NODES_FIND, &filter);
+            auto nodes = ledger_->stateMap().getMissingNodes(kMissingNodesFind, &filter);
             sl.lock();
 
             // Make sure nothing happened while we released the lock
@@ -684,7 +684,7 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
         {
             TransactionStateSF filter(ledger_->txMap().family().db(), app_.getLedgerMaster());
 
-            auto nodes = ledger_->txMap().getMissingNodes(kMISSING_NODES_FIND, &filter);
+            auto nodes = ledger_->txMap().getMissingNodes(kMissingNodesFind, &filter);
 
             if (nodes.empty())
             {
@@ -761,7 +761,7 @@ InboundLedger::filterNodes(
         nodes.erase(dup.begin(), dup.end());
     }
 
-    std::size_t const limit = (reason == TriggerReason::Reply) ? kREQ_NODES_REPLY : kREQ_NODES;
+    std::size_t const limit = (reason == TriggerReason::Reply) ? kReqNodesReply : kReqNodes;
 
     if (nodes.size() > limit)
         nodes.resize(limit);
@@ -1033,7 +1033,7 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
         if (packet.nodes().empty())
         {
             JLOG(journal_.warn()) << peer->id() << ": empty header data";
-            peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data empty header");
+            peer->charge(Resource::kFeeMalformedRequest, "ledger_data empty header");
             return -1;
         }
 
@@ -1048,7 +1048,7 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
                 if (!takeHeader(packet.nodes(0).nodedata()))
                 {
                     JLOG(journal_.warn()) << "Got invalid header data";
-                    peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data invalid header");
+                    peer->charge(Resource::kFeeMalformedRequest, "ledger_data invalid header");
                     return -1;
                 }
 
@@ -1071,7 +1071,7 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
         {
             JLOG(journal_.warn()) << "Included AS/TX root invalid: " << ex.what();
             using namespace std::string_literals;
-            peer->charge(Resource::kFEE_INVALID_DATA, "ledger_data "s + ex.what());
+            peer->charge(Resource::kFeeInvalidData, "ledger_data "s + ex.what());
             return -1;
         }
 
@@ -1087,7 +1087,7 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
         if (packet.nodes().empty())
         {
             JLOG(journal_.info()) << peer->id() << ": response with no nodes";
-            peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data no nodes");
+            peer->charge(Resource::kFeeMalformedRequest, "ledger_data no nodes");
             return -1;
         }
 
@@ -1099,7 +1099,7 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
             if (!node.has_nodeid() || !node.has_nodedata())
             {
                 JLOG(journal_.warn()) << "Got bad node";
-                peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data bad node");
+                peer->charge(Resource::kFeeMalformedRequest, "ledger_data bad node");
                 return -1;
             }
         }
@@ -1201,7 +1201,7 @@ void
 InboundLedger::runData()
 {
     // Maximum number of peers to request data from
-    constexpr std::size_t kMAX_USEFUL_PEERS = 6;
+    static constexpr std::size_t kMaxUsefulPeers = 6;
 
     decltype(receivedData_) data;
 
@@ -1239,7 +1239,7 @@ InboundLedger::runData()
     // Select a random sample of the peers that gives us the most nodes that are
     // useful
     dataCounts.prune();
-    dataCounts.sampleN(kMAX_USEFUL_PEERS, [&](std::shared_ptr<Peer> const& peer) {
+    dataCounts.sampleN(kMaxUsefulPeers, [&](std::shared_ptr<Peer> const& peer) {
         trigger(peer, TriggerReason::Reply);
     });
 }
diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
index 86f5b1a50a..95e3e46f73 100644
--- a/src/xrpld/app/ledger/detail/InboundLedgers.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
@@ -53,7 +53,7 @@ private:
 
 public:
     // How long before we try again to acquire the same ledger
-    static constexpr std::chrono::minutes const kREACQUIRE_INTERVAL{5};
+    static constexpr std::chrono::minutes kReacquireInterval{5};
 
     InboundLedgersImp(
         Application& app,
@@ -232,7 +232,7 @@ public:
     {
         ScopedLockType const sl(lock_);
 
-        beast::expire(recentFailures_, kREACQUIRE_INTERVAL);
+        beast::expire(recentFailures_, kReacquireInterval);
         return recentFailures_.find(h) != recentFailures_.end();
     }
 
@@ -405,7 +405,7 @@ public:
                 }
             }
 
-            beast::expire(recentFailures_, kREACQUIRE_INTERVAL);
+            beast::expire(recentFailures_, kReacquireInterval);
         }
 
         JLOG(j_.debug())
diff --git a/src/xrpld/app/ledger/detail/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
index 0ae0b81820..d744075869 100644
--- a/src/xrpld/app/ledger/detail/InboundTransactions.cpp
+++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
@@ -28,8 +28,8 @@
 namespace xrpl {
 
 // Need to be named before converting
-static constexpr auto kSTART_PEERS = 2;      // ideal number of peers to start with
-static constexpr auto kSET_KEEP_ROUNDS = 3;  // how many rounds to keep a set
+static constexpr auto kStartPeers = 2;     // ideal number of peers to start with
+static constexpr auto kSetKeepRounds = 3;  // how many rounds to keep a set
 
 class InboundTransactionSet
 {
@@ -114,7 +114,7 @@ public:
             obj.seq = seq_;
         }
 
-        ta->init(kSTART_PEERS);
+        ta->init(kStartPeers);
 
         return {};
     }
@@ -136,7 +136,7 @@ public:
 
         if (ta == nullptr)
         {
-            peer->charge(Resource::kFEE_USELESS_DATA, "ledger_data");
+            peer->charge(Resource::kFeeUselessData, "ledger_data");
             return;
         }
 
@@ -147,7 +147,7 @@ public:
         {
             if (!node.has_nodeid() || !node.has_nodedata())
             {
-                peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data");
+                peer->charge(Resource::kFeeMalformedRequest, "ledger_data");
                 return;
             }
 
@@ -155,7 +155,7 @@ public:
 
             if (!id)
             {
-                peer->charge(Resource::kFEE_INVALID_DATA, "ledger_data");
+                peer->charge(Resource::kFeeInvalidData, "ledger_data");
                 return;
             }
 
@@ -163,7 +163,7 @@ public:
         }
 
         if (!ta->takeNodes(data, peer).isUseful())
-            peer->charge(Resource::kFEE_USELESS_DATA, "ledger_data not useful");
+            peer->charge(Resource::kFeeUselessData, "ledger_data not useful");
     }
 
     void
@@ -208,8 +208,8 @@ public:
 
             auto it = map_.begin();
 
-            std::uint32_t const minSeq = (seq < kSET_KEEP_ROUNDS) ? 0 : (seq - kSET_KEEP_ROUNDS);
-            std::uint32_t const maxSeq = seq + kSET_KEEP_ROUNDS;
+            std::uint32_t const minSeq = (seq < kSetKeepRounds) ? 0 : (seq - kSetKeepRounds);
+            std::uint32_t const maxSeq = seq + kSetKeepRounds;
 
             while (it != map_.end())
             {
diff --git a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
index 86201ca627..7613aab85a 100644
--- a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
@@ -257,7 +257,7 @@ private:
             app_.getInboundLedgers().acquire(
                 ledger->header().hash, ledger->header().seq, InboundLedger::Reason::GENERIC);
         }
-        return hash ? *hash : beast::kZERO;  // kludge
+        return hash ? *hash : beast::kZero;  // kludge
     }
 
     /** Process a single ledger
diff --git a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp
index 9ebe890ae1..4c79068bca 100644
--- a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp
@@ -41,10 +41,10 @@ LedgerDeltaAcquire::LedgerDeltaAcquire(
     : TimeoutCounter(
           app,
           ledgerHash,
-          LedgerReplayParameters::kSUB_TASK_TIMEOUT,
+          LedgerReplayParameters::kSubTaskTimeout,
           {.jobType = JtReplayTask,
            .jobName = "LedReplDelta",
-           .jobLimit = LedgerReplayParameters::kMAX_QUEUED_TASKS},
+           .jobLimit = LedgerReplayParameters::kMaxQueuedTasks},
           app.getJournal("LedgerReplayDelta"))
     , inboundLedgers_(inboundLedgers)
     , ledgerSeq_(ledgerSeq)
@@ -99,10 +99,10 @@ LedgerDeltaAcquire::trigger(std::size_t limit, ScopedLockType& sl)
                 }
                 else
                 {
-                    if (++noFeaturePeerCount_ >= LedgerReplayParameters::kMAX_NO_FEATURE_PEER_COUNT)
+                    if (++noFeaturePeerCount_ >= LedgerReplayParameters::kMaxNoFeaturePeerCount)
                     {
                         JLOG(journal_.debug()) << "Fall back for " << hash_;
-                        timerInterval_ = LedgerReplayParameters::kSUB_TASK_FALLBACK_TIMEOUT;
+                        timerInterval_ = LedgerReplayParameters::kSubTaskFallbackTimeout;
                         fallBack_ = true;
                     }
                 }
@@ -117,7 +117,7 @@ void
 LedgerDeltaAcquire::onTimer(bool progress, ScopedLockType& sl)
 {
     JLOG(journal_.trace()) << "timeouts_=" << timeouts_ << " for " << hash_;
-    if (timeouts_ > LedgerReplayParameters::kSUB_TASK_MAX_TIMEOUTS)
+    if (timeouts_ > LedgerReplayParameters::kSubTaskMaxTimeouts)
     {
         failed_ = true;
         JLOG(journal_.debug()) << "too many timeouts " << hash_;
diff --git a/src/xrpld/app/ledger/detail/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
index 78470eca22..50a3a6289c 100644
--- a/src/xrpld/app/ledger/detail/LedgerMaster.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
@@ -81,13 +81,13 @@
 namespace xrpl {
 
 // Don't catch up more than 100 ledgers (cannot exceed 256)
-static constexpr int kMAX_LEDGER_GAP{100};
+static constexpr int kMaxLedgerGap{100};
 
 // Don't acquire history if ledger is too old
-static constexpr std::chrono::minutes kMAX_LEDGER_AGE_ACQUIRE{1};
+static constexpr std::chrono::minutes kMaxLedgerAgeAcquire{1};
 
 // Don't acquire history if write load is too high
-static constexpr int kMAX_WRITE_LOAD_ACQUIRE{8192};
+static constexpr int kMaxWriteLoadAcquire{8192};
 
 // Helper function for LedgerMaster::doAdvance()
 // Return true if candidateLedger should be fetched from the network.
@@ -189,12 +189,12 @@ LedgerMaster::getPublishedLedgerAge()
     std::chrono::seconds ret = app_.getTimeKeeper().closeTime().time_since_epoch();
     ret -= pubClose;
     ret = (ret > 0s) ? ret : 0s;
-    static std::chrono::seconds kLAST_RET = -1s;
+    static std::chrono::seconds kLastRet = -1s;
 
-    if (ret != kLAST_RET)
+    if (ret != kLastRet)
     {
         JLOG(journal_.trace()) << "Published ledger age is " << ret.count();
-        kLAST_RET = ret;
+        kLastRet = ret;
     }
     return ret;
 }
@@ -214,12 +214,12 @@ LedgerMaster::getValidatedLedgerAge()
     std::chrono::seconds ret = app_.getTimeKeeper().closeTime().time_since_epoch();
     ret -= valClose;
     ret = (ret > 0s) ? ret : 0s;
-    static std::chrono::seconds kLAST_RET = -1s;
+    static std::chrono::seconds kLastRet = -1s;
 
-    if (ret != kLAST_RET)
+    if (ret != kLastRet)
     {
         JLOG(journal_.trace()) << "Validated ledger age is " << ret.count();
-        kLAST_RET = ret;
+        kLastRet = ret;
     }
     return ret;
 }
@@ -1047,12 +1047,12 @@ LedgerMaster::checkAccept(std::shared_ptr<Ledger const> const& ledger)
             // and (3) the calculation won't cause divide-by-zero.
             if (higherVersionCount > 0 && xrpldCount > 0)
             {
-                constexpr std::size_t kREPORTING_PERCENT = 90;
-                constexpr std::size_t kCUTOFF_PERCENT = 60;
+                static constexpr std::size_t kReportingPercent = 90;
+                static constexpr std::size_t kCutoffPercent = 60;
                 auto const unlSize{app_.getValidators().getQuorumKeys().second.size()};
                 needPrint = unlSize > 0 &&
-                    calculatePercent(vals.size(), unlSize) >= kREPORTING_PERCENT &&
-                    calculatePercent(higherVersionCount, xrpldCount) >= kCUTOFF_PERCENT;
+                    calculatePercent(vals.size(), unlSize) >= kReportingPercent &&
+                    calculatePercent(higherVersionCount, xrpldCount) >= kCutoffPercent;
             }
         }
         // To throttle the warning messages, instead of printing a warning
@@ -1219,7 +1219,7 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
         return {validLedger_.get()};
     }
 
-    if (validLedgerSeq_ > (pubLedgerSeq_ + kMAX_LEDGER_GAP))
+    if (validLedgerSeq_ > (pubLedgerSeq_ + kMaxLedgerGap))
     {
         JLOG(journal_.warn()) << "Gap in validated ledger stream " << pubLedgerSeq_ << " - "
                               << validLedgerSeq_ - 1;
@@ -1257,7 +1257,7 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
             // VFALCO TODO Restructure this code so that zero is not
             // used.
             if (!hash)
-                hash = beast::kZERO;  // kludge
+                hash = beast::kZero;  // kludge
             if (seq == valSeq)
             {
                 // We need to publish the ledger we just fully validated
@@ -1884,8 +1884,8 @@ LedgerMaster::doAdvance(std::unique_lock<std::recursive_mutex>& sl)
             if (!standalone_ && !app_.getFeeTrack().isLoadedLocal() &&
                 (app_.getJobQueue().getJobCount(JtPuboldledger) < 10) &&
                 (validLedgerSeq_ == pubLedgerSeq_) &&
-                (getValidatedLedgerAge() < kMAX_LEDGER_AGE_ACQUIRE) &&
-                (app_.getNodeStore().getWriteLoad() < kMAX_WRITE_LOAD_ACQUIRE))
+                (getValidatedLedgerAge() < kMaxLedgerAgeAcquire) &&
+                (app_.getNodeStore().getWriteLoad() < kMaxWriteLoadAcquire))
             {
                 // We are in sync, so can acquire
                 InboundLedger::Reason const reason = InboundLedger::Reason::HISTORY;
@@ -2076,21 +2076,21 @@ LedgerMaster::makeFetchPack(
     if (!have)
     {
         JLOG(journal_.info()) << "Peer requests fetch pack for ledger we don't have: " << have;
-        peer->charge(Resource::kFEE_REQUEST_NO_REPLY, "get_object ledger");
+        peer->charge(Resource::kFeeRequestNoReply, "get_object ledger");
         return;
     }
 
     if (have->open())
     {
         JLOG(journal_.warn()) << "Peer requests fetch pack from open ledger: " << have;
-        peer->charge(Resource::kFEE_MALFORMED_REQUEST, "get_object ledger open");
+        peer->charge(Resource::kFeeMalformedRequest, "get_object ledger open");
         return;
     }
 
     if (have->header().seq < getEarliestFetch())
     {
         JLOG(journal_.debug()) << "Peer requests fetch pack that is too early";
-        peer->charge(Resource::kFEE_MALFORMED_REQUEST, "get_object ledger early");
+        peer->charge(Resource::kFeeMalformedRequest, "get_object ledger early");
         return;
     }
 
@@ -2100,7 +2100,7 @@ LedgerMaster::makeFetchPack(
     {
         JLOG(journal_.info()) << "Peer requests fetch pack for ledger whose predecessor we "
                               << "don't have: " << have;
-        peer->charge(Resource::kFEE_REQUEST_NO_REPLY, "get_object ledger no parent");
+        peer->charge(Resource::kFeeRequestNoReply, "get_object ledger no parent");
         return;
     }
 
diff --git a/src/xrpld/app/ledger/detail/LedgerPersistence.cpp b/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
index 70e2684e1c..579f66063c 100644
--- a/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
@@ -122,7 +122,7 @@ finishLoadByIndexOrHash(std::shared_ptr<Ledger> const& ledger, beast::Journal j)
         return;
 
     XRPL_ASSERT(
-        ledger->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::fees()),
+        ledger->header().seq < kXrpLedgerEarliestFees || ledger->read(keylet::fees()),
         "xrpl::finishLoadByIndexOrHash : valid ledger fees");
     ledger->setImmutable();
 
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp b/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
index dcc09faa13..f9f1aa3188 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
@@ -86,18 +86,18 @@ LedgerReplayTask::LedgerReplayTask(
     : TimeoutCounter(
           app,
           parameter.finishHash,
-          LedgerReplayParameters::kTASK_TIMEOUT,
+          LedgerReplayParameters::kTaskTimeout,
           {.jobType = JtReplayTask,
            .jobName = "LedReplTask",
-           .jobLimit = LedgerReplayParameters::kMAX_QUEUED_TASKS},
+           .jobLimit = LedgerReplayParameters::kMaxQueuedTasks},
           app.getJournal("LedgerReplayTask"))
     , inboundLedgers_(inboundLedgers)
     , replayer_(replayer)
     , parameter_(parameter)
     , maxTimeouts_(
           std::max(
-              LedgerReplayParameters::kTASK_MAX_TIMEOUTS_MINIMUM,
-              parameter.totalLedgers * LedgerReplayParameters::kTASK_MAX_TIMEOUTS_MULTIPLIER))
+              LedgerReplayParameters::kTaskMaxTimeoutsMinimum,
+              parameter.totalLedgers * LedgerReplayParameters::kTaskMaxTimeoutsMultiplier))
     , skipListAcquirer_(skipListAcquirer)
 {
     JLOG(journal_.trace()) << "Create " << hash_;
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayer.cpp b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
index 132bf9ccaa..3bb5ca9434 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
@@ -51,7 +51,7 @@ LedgerReplayer::replay(
 {
     XRPL_ASSERT(
         finishLedgerHash.isNonZero() && totalNumLedgers > 0 &&
-            totalNumLedgers <= LedgerReplayParameters::kMAX_TASK_SIZE,
+            totalNumLedgers <= LedgerReplayParameters::kMaxTaskSize,
         "xrpl::LedgerReplayer::replay : valid inputs");
 
     // NOLINTNEXTLINE(misc-const-correctness)
@@ -64,7 +64,7 @@ LedgerReplayer::replay(
         std::scoped_lock const lock(mtx_);
         if (app_.isStopping())
             return;
-        if (tasks_.size() >= LedgerReplayParameters::kMAX_TASKS)
+        if (tasks_.size() >= LedgerReplayParameters::kMaxTasks)
         {
             JLOG(j_.info()) << "Too many replay tasks, dropping new task " << parameter.finishHash;
             return;
diff --git a/src/xrpld/app/ledger/detail/LedgerToJson.cpp b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
index 7c03e22580..7a581e2389 100644
--- a/src/xrpld/app/ledger/detail/LedgerToJson.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
@@ -337,7 +337,7 @@ fillJson(json::Value& json, LedgerFill const& fill)
             fill.ledger.header(),
             bFull,
             ((fill.context != nullptr) ? fill.context->apiVersion
-                                       : RPC::kAPI_MAXIMUM_SUPPORTED_VERSION));
+                                       : RPC::kApiMaximumSupportedVersion));
     }
 
     if (bFull || ((fill.options & static_cast<int>(LedgerFill::Options::DumpTxrp)) != 0))
diff --git a/src/xrpld/app/ledger/detail/LocalTxs.cpp b/src/xrpld/app/ledger/detail/LocalTxs.cpp
index 0f355367e5..d843acfe44 100644
--- a/src/xrpld/app/ledger/detail/LocalTxs.cpp
+++ b/src/xrpld/app/ledger/detail/LocalTxs.cpp
@@ -48,7 +48,7 @@ class LocalTx
 public:
     LocalTx(LedgerIndex index, std::shared_ptr<STTx const> const& txn)
         : txn_(txn)
-        , expire_(index + LocalTxs::kHOLD_LEDGERS)
+        , expire_(index + LocalTxs::kHoldLedgers)
         , id_(txn->getTransactionID())
         , account_(txn->getAccountID(sfAccount))
         , seqProxy_(txn->getSeqProxy())
@@ -163,7 +163,7 @@ public:
 
             // Ticket should have been created by now.  Remove if ticket
             // does not exist.
-            return !view.exists(keylet::kTICKET(acctID, seqProx));
+            return !view.exists(keylet::kTicket(acctID, seqProx));
         });
     }
 
diff --git a/src/xrpld/app/ledger/detail/OpenLedger.cpp b/src/xrpld/app/ledger/detail/OpenLedger.cpp
index 5774dd8863..0694e425e9 100644
--- a/src/xrpld/app/ledger/detail/OpenLedger.cpp
+++ b/src/xrpld/app/ledger/detail/OpenLedger.cpp
@@ -164,7 +164,7 @@ std::shared_ptr<OpenView>
 OpenLedger::create(Rules const& rules, std::shared_ptr<Ledger const> const& ledger)
 {
     return std::make_shared<OpenView>(
-        kOPEN_LEDGER, rules, std::make_shared<CachedLedger const>(ledger, cache_));
+        kOpenLedger, rules, std::make_shared<CachedLedger const>(ledger, cache_));
 }
 
 auto
diff --git a/src/xrpld/app/ledger/detail/SkipListAcquire.cpp b/src/xrpld/app/ledger/detail/SkipListAcquire.cpp
index e6b41198bb..6c6679ed87 100644
--- a/src/xrpld/app/ledger/detail/SkipListAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/SkipListAcquire.cpp
@@ -35,10 +35,10 @@ SkipListAcquire::SkipListAcquire(
     : TimeoutCounter(
           app,
           ledgerHash,
-          LedgerReplayParameters::kSUB_TASK_TIMEOUT,
+          LedgerReplayParameters::kSubTaskTimeout,
           {.jobType = JtReplayTask,
            .jobName = "SkipListAcq",
-           .jobLimit = LedgerReplayParameters::kMAX_QUEUED_TASKS},
+           .jobLimit = LedgerReplayParameters::kMaxQueuedTasks},
           app.getJournal("LedgerReplaySkipList"))
     , inboundLedgers_(inboundLedgers)
     , peerSet_(std::move(peerSet))
@@ -94,10 +94,10 @@ SkipListAcquire::trigger(std::size_t limit, ScopedLockType& sl)
                 {
                     JLOG(journal_.trace())
                         << "Add a no feature peer " << peer->id() << " for " << hash_;
-                    if (++noFeaturePeerCount_ >= LedgerReplayParameters::kMAX_NO_FEATURE_PEER_COUNT)
+                    if (++noFeaturePeerCount_ >= LedgerReplayParameters::kMaxNoFeaturePeerCount)
                     {
                         JLOG(journal_.debug()) << "Fall back for " << hash_;
-                        timerInterval_ = LedgerReplayParameters::kSUB_TASK_FALLBACK_TIMEOUT;
+                        timerInterval_ = LedgerReplayParameters::kSubTaskFallbackTimeout;
                         fallBack_ = true;
                     }
                 }
@@ -112,7 +112,7 @@ void
 SkipListAcquire::onTimer(bool progress, ScopedLockType& sl)
 {
     JLOG(journal_.trace()) << "timeouts_=" << timeouts_ << " for " << hash_;
-    if (timeouts_ > LedgerReplayParameters::kSUB_TASK_MAX_TIMEOUTS)
+    if (timeouts_ > LedgerReplayParameters::kSubTaskMaxTimeouts)
     {
         failed_ = true;
         JLOG(journal_.debug()) << "too many timeouts " << hash_;
diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
index e3104ffb5d..62312b04d2 100644
--- a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
@@ -29,10 +29,10 @@ namespace xrpl {
 using namespace std::chrono_literals;
 
 // Timeout interval in milliseconds
-auto constexpr kTX_ACQUIRE_TIMEOUT = 250ms;
+constexpr auto kTxAcquireTimeout = 250ms;
 
-static constexpr auto kNORM_TIMEOUTS = 4;
-static constexpr auto kMAX_TIMEOUTS = 20;
+static constexpr auto kNormTimeouts = 4;
+static constexpr auto kMaxTimeouts = 20;
 
 TransactionAcquire::TransactionAcquire(
     Application& app,
@@ -41,7 +41,7 @@ TransactionAcquire::TransactionAcquire(
     : TimeoutCounter(
           app,
           hash,
-          kTX_ACQUIRE_TIMEOUT,
+          kTxAcquireTimeout,
           {.jobType = JtTxnData, .jobName = "TxAcq", .jobLimit = {}},
           app.getJournal("TransactionAcquire"))
     , peerSet_(std::move(peerSet))
@@ -81,14 +81,14 @@ TransactionAcquire::done()
 void
 TransactionAcquire::onTimer(bool progress, ScopedLockType& psl)
 {
-    if (timeouts_ > kMAX_TIMEOUTS)
+    if (timeouts_ > kMaxTimeouts)
     {
         failed_ = true;
         done();
         return;
     }
 
-    if (timeouts_ >= kNORM_TIMEOUTS)
+    if (timeouts_ >= kNormTimeouts)
         trigger(nullptr);
 
     addPeers(1);
@@ -255,7 +255,7 @@ TransactionAcquire::stillNeed()
 {
     ScopedLockType const sl(mtx_);
 
-    timeouts_ = std::min<int>(timeouts_, kNORM_TIMEOUTS);
+    timeouts_ = std::min<int>(timeouts_, kNormTimeouts);
     failed_ = false;
 }
 
diff --git a/src/xrpld/app/ledger/detail/TransactionMaster.cpp b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
index 71a1ca629f..129681b906 100644
--- a/src/xrpld/app/ledger/detail/TransactionMaster.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
@@ -142,7 +142,7 @@ void
 TransactionMaster::canonicalize(std::shared_ptr<Transaction>* pTransaction)
 {
     uint256 const tid = (*pTransaction)->getID();
-    if (tid != beast::kZERO)
+    if (tid != beast::kZero)
     {
         auto txn = *pTransaction;
         // VFALCO NOTE canonicalize can change the value of txn!
diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp
index 20a81f6768..23fa9865ed 100644
--- a/src/xrpld/app/main/Application.cpp
+++ b/src/xrpld/app/main/Application.cpp
@@ -1451,7 +1451,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
             JLOG(journal_.fatal()) << "Startup RPC: " << jvCommand << std::endl;
         }
 
-        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
+        Resource::Charge loadType = Resource::kFeeReferenceRpc;
         Resource::Consumer c;
         RPC::JsonContext context{
             {.j = getJournal("RPCHandler"),
@@ -1463,7 +1463,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
              .role = Role::ADMIN,
              .coro = {},
              .infoSub = {},
-             .apiVersion = RPC::kAPI_MAXIMUM_SUPPORTED_VERSION},
+             .apiVersion = RPC::kApiMaximumSupportedVersion},
             jvCommand};
 
         json::Value jvResult;
@@ -1664,7 +1664,7 @@ ApplicationImp::startGenesisLedger()
         : std::vector<uint256>{};
 
     std::shared_ptr<Ledger> const genesis = std::make_shared<Ledger>(
-        kCREATE_GENESIS,
+        kCreateGenesis,
         Rules{config_->features},
         config_->FEES.toFees(),
         initialAmendments,
@@ -1674,7 +1674,7 @@ ApplicationImp::startGenesisLedger()
     auto const next = std::make_shared<Ledger>(*genesis, getTimeKeeper().closeTime());
     next->updateSkipList();
     XRPL_ASSERT(
-        next->header().seq < kXRP_LEDGER_EARLIEST_FEES || next->read(keylet::fees()),
+        next->header().seq < kXrpLedgerEarliestFees || next->read(keylet::fees()),
         "xrpl::ApplicationImp::startGenesisLedger : valid ledger fees");
     next->setImmutable();
     openLedger_.emplace(next, cachedSLEs_, logs_->journal("OpenLedger"));
@@ -1696,7 +1696,7 @@ ApplicationImp::getLastFullLedger()
             return ledger;
 
         XRPL_ASSERT(
-            ledger->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::fees()),
+            ledger->header().seq < kXrpLedgerEarliestFees || ledger->read(keylet::fees()),
             "xrpl::ApplicationImp::getLastFullLedger : valid ledger fees");
         ledger->setImmutable();
 
@@ -1847,8 +1847,7 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
         loadLedger->stateMap().flushDirty(NodeObjectType::AccountNode);
 
         XRPL_ASSERT(
-            loadLedger->header().seq < kXRP_LEDGER_EARLIEST_FEES ||
-                loadLedger->read(keylet::fees()),
+            loadLedger->header().seq < kXrpLedgerEarliestFees || loadLedger->read(keylet::fees()),
             "xrpl::ApplicationImp::loadLedgerFromFile : valid ledger fees");
         loadLedger->setAccepted(closeTime, closeTimeResolution, !closeTimeEstimated);
 
@@ -1964,13 +1963,13 @@ ApplicationImp::loadOldLedger(
         }
         using namespace std::chrono_literals;
         using namespace date;
-        static constexpr NetClock::time_point kLEDGER_WARN_TIME_POINT{
+        static constexpr NetClock::time_point kLedgerWarnTimePoint{
             sys_days{January / 1 / 2018} - sys_days{January / 1 / 2000}};
-        if (loadLedger->header().closeTime < kLEDGER_WARN_TIME_POINT)
+        if (loadLedger->header().closeTime < kLedgerWarnTimePoint)
         {
             JLOG(journal_.fatal()) << "\n\n***  WARNING   ***\n"
                                       "You are replaying a ledger from before "
-                                   << to_string(kLEDGER_WARN_TIME_POINT)
+                                   << to_string(kLedgerWarnTimePoint)
                                    << " UTC.\n"
                                       "This replay will not handle your ledger as it was "
                                       "originally "
diff --git a/src/xrpld/app/main/GRPCServer.cpp b/src/xrpld/app/main/GRPCServer.cpp
index e851a8f583..7a622f632f 100644
--- a/src/xrpld/app/main/GRPCServer.cpp
+++ b/src/xrpld/app/main/GRPCServer.cpp
@@ -204,7 +204,7 @@ GRPCServerImpl::CallData<Request, Response>::process(std::shared_ptr<JobQueue::C
                  role,
                  coro,
                  InfoSub::pointer(),
-                 kAPI_VERSION},
+                 kApiVersion},
                 request_};
 
             // Make sure we can currently handle the rpc
@@ -544,7 +544,7 @@ GRPCServerImpl::setupListeners()
                 doLedgerGrpc,
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::Stub::GetLedger,
                 Condition::NoCondition,
-                Resource::kFEE_MEDIUM_BURDEN_RPC,
+                Resource::kFeeMediumBurdenRpc,
                 secureGatewayIPs_));
     }
     {
@@ -561,7 +561,7 @@ GRPCServerImpl::setupListeners()
                 doLedgerDataGrpc,
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::Stub::GetLedgerData,
                 Condition::NoCondition,
-                Resource::kFEE_MEDIUM_BURDEN_RPC,
+                Resource::kFeeMediumBurdenRpc,
                 secureGatewayIPs_));
     }
     {
@@ -578,7 +578,7 @@ GRPCServerImpl::setupListeners()
                 doLedgerDiffGrpc,
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::Stub::GetLedgerDiff,
                 Condition::NoCondition,
-                Resource::kFEE_MEDIUM_BURDEN_RPC,
+                Resource::kFeeMediumBurdenRpc,
                 secureGatewayIPs_));
     }
     {
@@ -595,7 +595,7 @@ GRPCServerImpl::setupListeners()
                 doLedgerEntryGrpc,
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::Stub::GetLedgerEntry,
                 Condition::NoCondition,
-                Resource::kFEE_MEDIUM_BURDEN_RPC,
+                Resource::kFeeMediumBurdenRpc,
                 secureGatewayIPs_));
     }
     return requests;
diff --git a/src/xrpld/app/main/GRPCServer.h b/src/xrpld/app/main/GRPCServer.h
index 6d9af236dc..7d299474d9 100644
--- a/src/xrpld/app/main/GRPCServer.h
+++ b/src/xrpld/app/main/GRPCServer.h
@@ -93,7 +93,7 @@ private:
     template <class Request, class Response>
     using Handler = std::function<std::pair<Response, grpc::Status>(RPC::GRPCContext<Request>&)>;
     // This implementation is currently limited to v1 of the API
-    static unsigned constexpr kAPI_VERSION = 1;
+    static constexpr unsigned kApiVersion = 1;
 
     template <class Request, class Response>
     using Forward = std::function<grpc::Status(
diff --git a/src/xrpld/app/main/LoadManager.cpp b/src/xrpld/app/main/LoadManager.cpp
index 2b7bc27cd3..36f82e392b 100644
--- a/src/xrpld/app/main/LoadManager.cpp
+++ b/src/xrpld/app/main/LoadManager.cpp
@@ -111,16 +111,16 @@ LoadManager::run()
         using namespace std::chrono;
         auto const timeSpentStalled = duration_cast<seconds>(steady_clock::now() - lastHeartbeat);
 
-        constexpr auto kREPORTING_INTERVAL_SECONDS = 10s;
-        constexpr auto kSTALL_FATAL_LOG_MESSAGE_TIME_LIMIT = 90s;
-        constexpr auto kSTALL_LOGIC_ERROR_TIME_LIMIT = 600s;
+        static constexpr auto kReportingIntervalSeconds = 10s;
+        static constexpr auto kStallFatalLogMessageTimeLimit = 90s;
+        static constexpr auto kStallLogicErrorTimeLimit = 600s;
 
-        if (armed && (timeSpentStalled >= kREPORTING_INTERVAL_SECONDS))
+        if (armed && (timeSpentStalled >= kReportingIntervalSeconds))
         {
             // Report the stalled condition every reportingIntervalSeconds
-            if ((timeSpentStalled % kREPORTING_INTERVAL_SECONDS) == 0s)
+            if ((timeSpentStalled % kReportingIntervalSeconds) == 0s)
             {
-                if (timeSpentStalled < kSTALL_FATAL_LOG_MESSAGE_TIME_LIMIT)
+                if (timeSpentStalled < kStallFatalLogMessageTimeLimit)
                 {
                     JLOG(journal_.warn())
                         << "Server stalled for " << timeSpentStalled.count() << " seconds.";
@@ -141,7 +141,7 @@ LoadManager::run()
             // If we go over the stallLogicErrorTimeLimit spent stalled, it
             // means that the stall resolution code has failed, which qualifies
             // as a LogicError
-            if (timeSpentStalled >= kSTALL_LOGIC_ERROR_TIME_LIMIT)
+            if (timeSpentStalled >= kStallLogicErrorTimeLimit)
             {
                 JLOG(journal_.fatal()) << "LogicError: Fatal server stall detected. Stalled time: "
                                        << timeSpentStalled.count() << "s";
diff --git a/src/xrpld/app/main/Tuning.h b/src/xrpld/app/main/Tuning.h
index 4d2c4e01e7..d61f27ec03 100644
--- a/src/xrpld/app/main/Tuning.h
+++ b/src/xrpld/app/main/Tuning.h
@@ -4,9 +4,9 @@
 
 namespace xrpl {
 
-constexpr std::size_t kFULL_BELOW_TARGET_SIZE = 524288;
-constexpr std::chrono::seconds kFULL_BELOW_EXPIRATION = std::chrono::minutes{10};
+constexpr std::size_t kFullBelowTargetSize = 524288;
+constexpr std::chrono::seconds kFullBelowExpiration = std::chrono::minutes{10};
 
-constexpr std::size_t kMAX_POPPED_TRANSACTIONS = 10;
+constexpr std::size_t kMaxPoppedTransactions = 10;
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/misc/FeeVoteImpl.cpp b/src/xrpld/app/misc/FeeVoteImpl.cpp
index 4369a4642d..0a55c20d29 100644
--- a/src/xrpld/app/misc/FeeVoteImpl.cpp
+++ b/src/xrpld/app/misc/FeeVoteImpl.cpp
@@ -295,7 +295,7 @@ FeeVoteImpl::doVoting(
                     baseReserve.first.dropsAs<std::uint32_t>(baseReserveVote.current());
                 obj[sfReserveIncrement] =
                     incReserve.first.dropsAs<std::uint32_t>(incReserveVote.current());
-                obj[sfReferenceFeeUnits] = kFEE_UNITS_DEPRECATED;
+                obj[sfReferenceFeeUnits] = kFeeUnitsDeprecated;
             }
         });
 
diff --git a/src/xrpld/app/misc/NegativeUNLVote.cpp b/src/xrpld/app/misc/NegativeUNLVote.cpp
index 0da94ad75f..2ed440fba8 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.cpp
+++ b/src/xrpld/app/misc/NegativeUNLVote.cpp
@@ -141,7 +141,7 @@ NodeID
 NegativeUNLVote::choose(uint256 const& randomPadData, std::vector<NodeID> const& candidates)
 {
     XRPL_ASSERT(!candidates.empty(), "xrpl::NegativeUNLVote::choose : non-empty input");
-    static_assert(NodeID::kBYTES <= uint256::kBYTES);
+    static_assert(NodeID::kBytes <= uint256::kBytes);
     NodeID const randomPad = NodeID::fromVoid(randomPadData.data());
     NodeID txNodeID = candidates[0];
     for (int j = 1; j < candidates.size(); ++j)
@@ -167,7 +167,7 @@ NegativeUNLVote::buildScoreTable(
     // Ask the validation container to keep enough validation message history
     // for next time.
     auto const seq = prevLedger->header().seq + 1;
-    validations.setSeqToKeep(seq - 1, seq + kFLAG_LEDGER_INTERVAL);
+    validations.setSeqToKeep(seq - 1, seq + kFlagLedgerInterval);
 
     // Find FLAG_LEDGER_INTERVAL (i.e. 256) previous ledger hashes
     auto const hashIndex = prevLedger->read(keylet::skip());
@@ -178,7 +178,7 @@ NegativeUNLVote::buildScoreTable(
     }
     auto const ledgerAncestors = hashIndex->getFieldV256(sfHashes).value();
     auto const numAncestors = ledgerAncestors.size();
-    if (numAncestors < kFLAG_LEDGER_INTERVAL)
+    if (numAncestors < kFlagLedgerInterval)
     {
         JLOG(j_.debug()) << "N-UNL: ledger " << seq << " not enough history. Can trace back only "
                          << numAncestors << " ledgers.";
@@ -194,7 +194,7 @@ NegativeUNLVote::buildScoreTable(
 
     // Query the validation container for every ledger hash and fill
     // the score table.
-    for (int i = 0; i < kFLAG_LEDGER_INTERVAL; ++i)
+    for (int i = 0; i < kFlagLedgerInterval; ++i)
     {
         for (auto const& v :
              validations.getTrustedForLedger(ledgerAncestors[numAncestors - 1 - i], seq - 2 - i))
@@ -211,16 +211,16 @@ NegativeUNLVote::buildScoreTable(
             return it->second;
         return 0;
     }();
-    if (myValidationCount < kNEGATIVE_UNL_MIN_LOCAL_VALS_TO_VOTE)
+    if (myValidationCount < kNegativeUnlMinLocalValsToVote)
     {
         JLOG(j_.debug()) << "N-UNL: ledger " << seq << ". Local node only issued "
-                         << myValidationCount << " validations in last " << kFLAG_LEDGER_INTERVAL
+                         << myValidationCount << " validations in last " << kFlagLedgerInterval
                          << " ledgers."
                          << " The reliability measurement could be wrong.";
         return {};
     }
-    if (myValidationCount > kNEGATIVE_UNL_MIN_LOCAL_VALS_TO_VOTE &&
-        myValidationCount <= kFLAG_LEDGER_INTERVAL)
+    if (myValidationCount > kNegativeUnlMinLocalValsToVote &&
+        myValidationCount <= kFlagLedgerInterval)
     {
         return scoreTable;
     }
@@ -228,7 +228,7 @@ NegativeUNLVote::buildScoreTable(
     // cannot happen because validations.getTrustedForLedger does not
     // return multiple validations of the same ledger from a validator.
     JLOG(j_.error()) << "N-UNL: ledger " << seq << ". Local node issued " << myValidationCount
-                     << " validations in last " << kFLAG_LEDGER_INTERVAL << " ledgers. Too many!";
+                     << " validations in last " << kFlagLedgerInterval << " ledgers. Too many!";
     return {};
 }
 
@@ -241,7 +241,7 @@ NegativeUNLVote::findAllCandidates(
     // Compute if need to find more validators to disable
     auto const canAdd = [&]() -> bool {
         auto const maxNegativeListed =
-            static_cast<std::size_t>(std::ceil(unl.size() * kNEGATIVE_UNL_MAX_LISTED));
+            static_cast<std::size_t>(std::ceil(unl.size() * kNegativeUnlMaxListed));
         std::size_t negativeListed = 0;
         for (auto const& n : unl)
         {
@@ -250,10 +250,9 @@ NegativeUNLVote::findAllCandidates(
         }
         bool const result = negativeListed < maxNegativeListed;
         JLOG(j_.trace()) << "N-UNL: nodeId " << myId_ << " lowWaterMark "
-                         << kNEGATIVE_UNL_LOW_WATER_MARK << " highWaterMark "
-                         << kNEGATIVE_UNL_HIGH_WATER_MARK << " canAdd " << result
-                         << " negativeListed " << negativeListed << " maxNegativeListed "
-                         << maxNegativeListed;
+                         << kNegativeUnlLowWaterMark << " highWaterMark "
+                         << kNegativeUnlHighWaterMark << " canAdd " << result << " negativeListed "
+                         << negativeListed << " maxNegativeListed " << maxNegativeListed;
         return result;
     }();
 
@@ -267,7 +266,7 @@ NegativeUNLVote::findAllCandidates(
         //  (2) has less than negativeUNLLowWaterMark validations,
         //  (3) is not in negUnl, and
         //  (4) is not a new validator.
-        if (canAdd && score < kNEGATIVE_UNL_LOW_WATER_MARK && !negUnl.contains(nodeId) &&
+        if (canAdd && score < kNegativeUnlLowWaterMark && !negUnl.contains(nodeId) &&
             !newValidators_.contains(nodeId))
         {
             JLOG(j_.trace()) << "N-UNL: toDisable candidate " << nodeId;
@@ -277,7 +276,7 @@ NegativeUNLVote::findAllCandidates(
         // Find toReEnable Candidates: check if
         //  (1) has more than negativeUNLHighWaterMark validations,
         //  (2) is in negUnl
-        if (score > kNEGATIVE_UNL_HIGH_WATER_MARK && negUnl.contains(nodeId))
+        if (score > kNegativeUnlHighWaterMark && negUnl.contains(nodeId))
         {
             JLOG(j_.trace()) << "N-UNL: toReEnable candidate " << nodeId;
             candidates.toReEnableCandidates.push_back(nodeId);
@@ -328,7 +327,7 @@ NegativeUNLVote::purgeNewValidators(LedgerIndex seq)
     auto i = newValidators_.begin();
     while (i != newValidators_.end())
     {
-        if (seq - i->second > kNEW_VALIDATOR_DISABLE_SKIP)
+        if (seq - i->second > kNewValidatorDisableSkip)
         {
             i = newValidators_.erase(i);
         }
diff --git a/src/xrpld/app/misc/NegativeUNLVote.h b/src/xrpld/app/misc/NegativeUNLVote.h
index 4cedc4743f..5c2d3f8630 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.h
+++ b/src/xrpld/app/misc/NegativeUNLVote.h
@@ -32,26 +32,26 @@ public:
      * An unreliable validator is a candidate to be disabled by the NegativeUNL
      * protocol.
      */
-    static constexpr size_t kNEGATIVE_UNL_LOW_WATER_MARK = kFLAG_LEDGER_INTERVAL * 50 / 100;
+    static constexpr size_t kNegativeUnlLowWaterMark = kFlagLedgerInterval * 50 / 100;
     /**
      * An unreliable validator must have more than negativeUNLHighWaterMark
      * validations in the last flag ledger period to be re-enabled.
      */
-    static constexpr size_t kNEGATIVE_UNL_HIGH_WATER_MARK = kFLAG_LEDGER_INTERVAL * 80 / 100;
+    static constexpr size_t kNegativeUnlHighWaterMark = kFlagLedgerInterval * 80 / 100;
     /**
      * The minimum number of validations of the local node for it to
      * participate in the voting.
      */
-    static constexpr size_t kNEGATIVE_UNL_MIN_LOCAL_VALS_TO_VOTE = kFLAG_LEDGER_INTERVAL * 90 / 100;
+    static constexpr size_t kNegativeUnlMinLocalValsToVote = kFlagLedgerInterval * 90 / 100;
     /**
      * We don't want to disable new validators immediately after adding them.
      * So we skip voting for disabling them for 2 flag ledgers.
      */
-    static constexpr size_t kNEW_VALIDATOR_DISABLE_SKIP = kFLAG_LEDGER_INTERVAL * 2;
+    static constexpr size_t kNewValidatorDisableSkip = kFlagLedgerInterval * 2;
     /**
      * We only want to put 25% of the UNL on the NegativeUNL.
      */
-    static constexpr float kNEGATIVE_UNL_MAX_LISTED = 0.25;
+    static constexpr float kNegativeUnlMaxListed = 0.25;
 
     /**
      * A flag indicating whether a UNLModify Tx is to disable or to re-enable
diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp
index c1ce5b9803..343f5dff94 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -189,7 +189,7 @@ class NetworkOPsImp final : public NetworkOPs
         Running,
     };
 
-    static std::array<char const*, 5> const kSTATES;
+    static std::array<char const*, 5> const kStates;
 
     /**
      * State accounting records two attributes for each possible server state:
@@ -221,7 +221,7 @@ class NetworkOPsImp final : public NetworkOPs
         std::chrono::steady_clock::time_point start_ = std::chrono::steady_clock::now();
         std::chrono::steady_clock::time_point const processStart_ = start_;
         std::uint64_t initialSyncUs_{0};
-        static std::array<json::StaticString const, 5> const kSTATES;
+        static std::array<json::StaticString const, 5> const kStates;
 
     public:
         explicit StateAccounting()
@@ -893,19 +893,19 @@ private:
 
 //------------------------------------------------------------------------------
 
-static std::array<char const*, 5> const kSTATE_NAMES{
+static std::array<char const*, 5> const kStateNames{
     {"disconnected", "connected", "syncing", "tracking", "full"}};
 
-std::array<char const*, 5> const NetworkOPsImp::kSTATES = kSTATE_NAMES;
+std::array<char const*, 5> const NetworkOPsImp::kStates = kStateNames;
 
-std::array<json::StaticString const, 5> const NetworkOPsImp::StateAccounting::kSTATES = {
-    {json::StaticString(kSTATE_NAMES[0]),
-     json::StaticString(kSTATE_NAMES[1]),
-     json::StaticString(kSTATE_NAMES[2]),
-     json::StaticString(kSTATE_NAMES[3]),
-     json::StaticString(kSTATE_NAMES[4])}};
+std::array<json::StaticString const, 5> const NetworkOPsImp::StateAccounting::kStates = {
+    {json::StaticString(kStateNames[0]),
+     json::StaticString(kStateNames[1]),
+     json::StaticString(kStateNames[2]),
+     json::StaticString(kStateNames[3]),
+     json::StaticString(kStateNames[4])}};
 
-static auto const kGENESIS_ACCOUNT_ID =
+static auto const kGenesisAccountId =
     calcAccountID(generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase")).first);
 
 //------------------------------------------------------------------------------
@@ -954,20 +954,20 @@ NetworkOPsImp::isFull()
 std::string
 NetworkOPsImp::getHostId(bool forAdmin)
 {
-    static std::string const kHOSTNAME = boost::asio::ip::host_name();
+    static std::string const kHostname = boost::asio::ip::host_name();
 
     if (forAdmin)
-        return kHOSTNAME;
+        return kHostname;
 
     // For non-admin uses hash the node public key into a
     // single RFC1751 word:
-    static std::string const kSHROUDED_HOST_ID = [this]() {
+    static std::string const kShroudedHostId = [this]() {
         auto const& id = registry_.get().getApp().nodeIdentity();
 
         return RFC1751::getWordFromBlob(id.first.data(), id.first.size());
     }();
 
-    return kSHROUDED_HOST_ID;
+    return kShroudedHostId;
 }
 
 void
@@ -1194,7 +1194,7 @@ NetworkOPsImp::strOperatingMode(OperatingMode const mode, bool const admin) cons
         }
     }
 
-    return kSTATES[static_cast<std::size_t>(mode)];
+    return kStates[static_cast<std::size_t>(mode)];
 }
 
 void
@@ -1569,7 +1569,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
 
                 std::size_t count = 0;
                 for (auto txNext = ledgerMaster_.popAcctTransaction(txCur);
-                     txNext && count < kMAX_POPPED_TRANSACTIONS;
+                     txNext && count < kMaxPoppedTransactions;
                      txNext = ledgerMaster_.popAcctTransaction(txCur), ++count)
                 {
                     if (!batchLock.owns_lock())
@@ -1618,7 +1618,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
                     // 1. It was submitted locally. (Note that this flag is only
                     //    true on the initial submission.)
                     // 2. The transaction has a LastLedgerSequence, and the
-                    //    LastLedgerSequence is fewer than LocalTxs::kHOLD_LEDGERS
+                    //    LastLedgerSequence is fewer than LocalTxs::kHoldLedgers
                     //    (5) ledgers into the future. (Remember that an
                     //    unseated optional compares as less than all seated
                     //    values, so it has to be checked explicitly first.)
@@ -1629,7 +1629,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
                     //    the other conditions, so don't hold it again. Time's
                     //    up!)
                     //
-                    if (e.local || (ledgersLeft && ledgersLeft <= LocalTxs::kHOLD_LEDGERS) ||
+                    if (e.local || (ledgersLeft && ledgersLeft <= LocalTxs::kHoldLedgers) ||
                         registry_.get().getHashRouter().setFlags(
                             e.transaction->getID(), HashRouterFlags::HELD))
                     {
@@ -2258,9 +2258,9 @@ NetworkOPsImp::ServerFeeSummary::operator!=(NetworkOPsImp::ServerFeeSummary cons
 static std::uint32_t
 trunc32(std::uint64_t v)
 {
-    constexpr std::uint64_t kMAX32 = std::numeric_limits<std::uint32_t>::max();
+    constexpr std::uint64_t kMax32 = std::numeric_limits<std::uint32_t>::max();
 
-    return std::min(kMAX32, v);
+    return std::min(kMax32, v);
 };
 
 void
@@ -2292,7 +2292,7 @@ NetworkOPsImp::pubServer()
             auto const loadFactor = std::max(
                 safeCast<std::uint64_t>(f.loadFactorServer),
                 mulDiv(f.em->openLedgerFeeLevel, f.loadBaseServer, f.em->referenceFeeLevel)
-                    .value_or(xrpl::kMULDIV_MAX));
+                    .value_or(xrpl::kMuldivMax));
 
             jvObj[jss::load_factor] = trunc32(loadFactor);
             jvObj[jss::load_factor_fee_escalation] = f.em->openLedgerFeeLevel.jsonClipped();
@@ -2433,7 +2433,7 @@ NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
         // for consumers supporting different API versions
         MultiApiJson multiObj{jvObj};
         multiObj.visit(
-            RPC::kAPI_VERSION<1>,  //
+            RPC::kApiVersion<1>,  //
             [](json::Value& jvTx) {
                 // Type conversion for older API versions to string
                 if (jvTx.isMember(jss::ledger_index))
@@ -2804,7 +2804,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
                                              escalationMetrics.openLedgerFeeLevel,
                                              loadBaseServer,
                                              escalationMetrics.referenceFeeLevel)
-                                             .value_or(xrpl::kMULDIV_MAX);
+                                             .value_or(xrpl::kMuldivMax);
 
     auto const loadFactor =
         std::max(safeCast<std::uint64_t>(loadFactorServer), loadFactorFeeEscalation);
@@ -2895,11 +2895,11 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
                 std::abs(closeOffset.count()) >= 60)
                 l[jss::close_time_offset] = static_cast<std::uint32_t>(closeOffset.count());
 
-            constexpr std::chrono::seconds kHIGH_AGE_THRESHOLD{1000000};
+            static constexpr std::chrono::seconds kHighAgeThreshold{1000000};
             if (ledgerMaster_.haveValidated())
             {
                 auto const age = ledgerMaster_.getValidatedLedgerAge();
-                l[jss::age] = json::UInt(age < kHIGH_AGE_THRESHOLD ? age.count() : 0);
+                l[jss::age] = json::UInt(age < kHighAgeThreshold ? age.count() : 0);
             }
             else
             {
@@ -2909,7 +2909,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
                 {
                     using namespace std::chrono_literals;
                     auto age = closeTime - lCloseTime;
-                    l[jss::age] = json::UInt(age < kHIGH_AGE_THRESHOLD ? age.count() : 0);
+                    l[jss::age] = json::UInt(age < kHighAgeThreshold ? age.count() : 0);
                 }
             }
         }
@@ -2943,9 +2943,9 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
         std::to_string(registry_.get().getOverlay().getPeerDisconnectCharges());
 
     // This array must be sorted in increasing order.
-    static constexpr std::array<std::string_view, 7> kPROTOCOLS{
+    static constexpr std::array<std::string_view, 7> kProtocols{
         "http", "https", "peer", "ws", "ws2", "wss", "wss2"};
-    static_assert(std::ranges::is_sorted(kPROTOCOLS));
+    static_assert(std::ranges::is_sorted(kProtocols));
     {
         json::Value ports{json::ValueType::Array};
         for (auto const& port : registry_.get().getServerHandler().setup().ports)
@@ -2960,8 +2960,8 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
             std::set_intersection(
                 std::begin(port.protocol),
                 std::end(port.protocol),
-                std::begin(kPROTOCOLS),
-                std::end(kPROTOCOLS),
+                std::begin(kProtocols),
+                std::end(kProtocols),
                 std::back_inserter(proto));
             if (!proto.empty())
             {
@@ -3016,7 +3016,7 @@ NetworkOPsImp::pubProposedTransaction(
     if (transaction->isFlag(tfInnerBatchTxn))
         return;
 
-    MultiApiJson jvObj = transJson(transaction, result, false, ledger, std::nullopt);
+    MultiApiJson const jvObj = transJson(transaction, result, false, ledger, std::nullopt);
 
     {
         std::scoped_lock const sl(subLock_);
@@ -3081,7 +3081,7 @@ NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
             jvObj[jss::network_id] = registry_.get().getNetworkIDService().getNetworkID();
 
             if (!lpAccepted->rules().enabled(featureXRPFees))
-                jvObj[jss::fee_ref] = kFEE_UNITS_DEPRECATED;
+                jvObj[jss::fee_ref] = kFeeUnitsDeprecated;
             jvObj[jss::fee_base] = lpAccepted->fees().base.jsonClipped();
             jvObj[jss::reserve_base] = lpAccepted->fees().reserve.jsonClipped();
             jvObj[jss::reserve_inc] = lpAccepted->fees().increment.jsonClipped();
@@ -3131,11 +3131,11 @@ NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
         }
 
         {
-            static bool kFIRST_TIME = true;
-            if (kFIRST_TIME)
+            static bool kFirstTime = true;
+            if (kFirstTime)
             {
                 // First validated ledger, start delayed SubAccountHistory
-                kFIRST_TIME = false;
+                kFirstTime = false;
                 for (auto& outer : subAccountHistory_)
                 {
                     for (auto& inner : outer.second)
@@ -3308,7 +3308,7 @@ NetworkOPsImp::pubValidatedTransaction(
     // Create two different Json objects, for different API versions
     auto const metaRef = std::ref(transaction.getMeta());
     auto const trResult = transaction.getResult();
-    MultiApiJson jvObj = transJson(stTxn, trResult, true, ledger, metaRef);
+    MultiApiJson const jvObj = transJson(stTxn, trResult, true, ledger, metaRef);
 
     {
         std::scoped_lock const sl(subLock_);
@@ -3669,7 +3669,7 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
              * genesis account: first tx is the one with seq 1
              * other account: first tx is the one created the account
              */
-            if (accountId == kGENESIS_ACCOUNT_ID)
+            if (accountId == kGenesisAccountId)
             {
                 auto stx = tx->getSTransaction();
                 if (stx->getAccountID(sfAccount) == accountId && stx->getSeqValue() == 1)
@@ -3749,7 +3749,7 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
             int feeChargeCount = 0;
             if (auto sptr = subInfo.sinkWptr.lock(); sptr)
             {
-                sptr->getConsumer().charge(Resource::kFEE_MEDIUM_BURDEN_RPC);
+                sptr->getConsumer().charge(Resource::kFeeMediumBurdenRpc);
                 ++feeChargeCount;
             }
             else
@@ -3894,7 +3894,7 @@ NetworkOPsImp::subAccountHistoryStart(
                                << ", no need to add AccountHistory job.";
         return;
     }
-    if (accountId == kGENESIS_ACCOUNT_ID)
+    if (accountId == kGenesisAccountId)
     {
         if (auto const sleAcct = ledger->read(accountKeylet); sleAcct)
         {
@@ -4060,7 +4060,7 @@ NetworkOPsImp::subLedger(InfoSub::ref isrListener, json::Value& jvResult)
         jvResult[jss::ledger_time] =
             json::Value::UInt(lpClosed->header().closeTime.time_since_epoch().count());
         if (!lpClosed->rules().enabled(featureXRPFees))
-            jvResult[jss::fee_ref] = kFEE_UNITS_DEPRECATED;
+            jvResult[jss::fee_ref] = kFeeUnitsDeprecated;
         jvResult[jss::fee_base] = lpClosed->fees().base.jsonClipped();
         jvResult[jss::reserve_base] = lpClosed->fees().reserve.jsonClipped();
         jvResult[jss::reserve_inc] = lpClosed->fees().increment.jsonClipped();
@@ -4405,7 +4405,7 @@ NetworkOPsImp::getBookPage(
                             AuthHandling::ZeroIfUnauthorized,
                             viewJ);
 
-                        if (saOwnerFunds < beast::kZERO)
+                        if (saOwnerFunds < beast::kZero)
                         {
                             // Treat negative funds as zero.
 
@@ -4418,9 +4418,9 @@ NetworkOPsImp::getBookPage(
 
                 STAmount saTakerGetsFunded;
                 STAmount saOwnerFundsLimit = saOwnerFunds;
-                Rate offerRate = kPARITY_RATE;
+                Rate offerRate = kParityRate;
 
-                if (rate != kPARITY_RATE
+                if (rate != kParityRate
                     // Have a transfer fee.
                     && uTakerID != book.out.getIssuer()
                     // Not taking offers of own IOUs.
@@ -4449,7 +4449,7 @@ NetworkOPsImp::getBookPage(
                         .setJson(jvOffer[jss::taker_pays_funded]);
                 }
 
-                STAmount const saOwnerPays = (kPARITY_RATE == offerRate)
+                STAmount const saOwnerPays = (kParityRate == offerRate)
                     ? saTakerGetsFunded
                     : std::min(saOwnerFunds, multiply(saTakerGetsFunded, offerRate));
 
@@ -4680,8 +4680,8 @@ NetworkOPsImp::StateAccounting::json(json::Value& obj) const
          i <= static_cast<std::size_t>(OperatingMode::FULL);
          ++i)
     {
-        obj[jss::state_accounting][kSTATES[i]] = json::ValueType::Object;
-        auto& state = obj[jss::state_accounting][kSTATES[i]];
+        obj[jss::state_accounting][kStates[i]] = json::ValueType::Object;
+        auto& state = obj[jss::state_accounting][kStates[i]];
         state[jss::transitions] = std::to_string(counters[i].transitions);
         state[jss::duration_us] = std::to_string(counters[i].dur.count());
     }
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp
index 1fa7558d21..556c6f9239 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.cpp
+++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp
@@ -141,7 +141,7 @@ SHAMapStoreImp::SHAMapStoreImp(
         getIfExists(section, "advisory_delete", advisoryDelete_);
 
         auto const minInterval =
-            config.standalone() ? kMINIMUM_DELETION_INTERVAL_SA : kMINIMUM_DELETION_INTERVAL;
+            config.standalone() ? kMinimumDeletionIntervalSa : kMinimumDeletionInterval;
         if (deleteInterval_ < minInterval)
         {
             Throw<std::runtime_error>(
@@ -187,7 +187,7 @@ SHAMapStoreImp::makeNodeStore(int readThreads)
             std::move(writableBackend),
             std::move(archiveBackend),
             nscfg,
-            app_.getJournal(kNODE_STORE_NAME));
+            app_.getJournal(kNodeStoreName));
         fdRequired_ += dbr->fdRequired();
         dbRotating_ = dbr.get();
         db.reset(dynamic_cast<NodeStore::Database*>(dbr.release()));
@@ -199,7 +199,7 @@ SHAMapStoreImp::makeNodeStore(int readThreads)
             scheduler_,
             readThreads,
             nscfg,
-            app_.getJournal(kNODE_STORE_NAME));
+            app_.getJournal(kNodeStoreName));
         fdRequired_ += db->fdRequired();
     }
     return db;
@@ -482,7 +482,7 @@ SHAMapStoreImp::makeBackendRotating(std::string path)
         section,
         megabytes(app_.config().getValueFor(SizedItem::BurstSize, std::nullopt)),
         scheduler_,
-        app_.getJournal(kNODE_STORE_NAME))};
+        app_.getJournal(kNodeStoreName))};
     backend->open();
     return backend;
 }
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.h b/src/xrpld/app/misc/SHAMapStoreImp.h
index c205d2dd90..1eb2beb561 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.h
+++ b/src/xrpld/app/misc/SHAMapStoreImp.h
@@ -57,9 +57,9 @@ private:
     // check health/stop status as records are copied
     std::uint64_t const checkHealthInterval_ = 1000;
     // minimum # of ledgers to maintain for health of network
-    static std::uint32_t const kMINIMUM_DELETION_INTERVAL = 256;
+    static std::uint32_t const kMinimumDeletionInterval = 256;
     // minimum # of ledgers required for standalone mode.
-    static std::uint32_t const kMINIMUM_DELETION_INTERVAL_SA = 8;
+    static std::uint32_t const kMinimumDeletionIntervalSa = 8;
     // minimum ledger to maintain online.
     std::atomic<LedgerIndex> minimumOnline_;
 
@@ -94,7 +94,7 @@ private:
     NetworkOPs* netOPs_ = nullptr;
     LedgerMaster* ledgerMaster_ = nullptr;
 
-    static constexpr auto kNODE_STORE_NAME = "NodeStore";
+    static constexpr auto kNodeStoreName = "NodeStore";
 
 public:
     SHAMapStoreImp(Application& app, NodeStore::Scheduler& scheduler, beast::Journal journal);
diff --git a/src/xrpld/app/misc/TxQ.h b/src/xrpld/app/misc/TxQ.h
index 4cd73acaec..ad689abed4 100644
--- a/src/xrpld/app/misc/TxQ.h
+++ b/src/xrpld/app/misc/TxQ.h
@@ -40,7 +40,7 @@ class TxQ
 {
 public:
     /// Fee level for single-signed reference transaction.
-    static constexpr FeeLevel64 kBASE_LEVEL{256};
+    static constexpr FeeLevel64 kBaseLevel{256};
 
     /**
         Structure used to customize @ref TxQ behavior.
@@ -76,7 +76,7 @@ public:
         std::uint32_t retrySequencePercent = 25;
         /// Minimum value of the escalation multiplier, regardless
         /// of the prior ledger's median fee level.
-        FeeLevel64 minimumEscalationMultiplier = kBASE_LEVEL * 500;
+        FeeLevel64 minimumEscalationMultiplier = kBaseLevel * 500;
         /// Minimum number of transactions to allow into the ledger
         /// before escalation, regardless of the prior ledger's size.
         std::uint32_t minimumTxnInLedger = 32;
@@ -512,7 +512,7 @@ private:
             their `retriesRemaining` forced down as part of the
             penalty.
         */
-        int retriesRemaining{kRETRIES_ALLOWED};
+        int retriesRemaining{kRetriesAllowed};
         /// Flags provided to `apply`. If the transaction is later
         /// attempted with different flags, it will need to be
         /// `preflight`ed again.
@@ -548,7 +548,7 @@ private:
             that the queue doesn't fill up with stale transactions
             which prevent lower fee level transactions from queuing.
         */
-        static constexpr int kRETRIES_ALLOWED = 10;
+        static constexpr int kRetriesAllowed = 10;
 
         /** The hash of the parent ledger.
 
@@ -761,7 +761,7 @@ private:
     /**
         parentHash_ used for logging only
     */
-    LedgerHash parentHash_{beast::kZERO};
+    LedgerHash parentHash_{beast::kZero};
 
     /** Most queue operations are done under the master lock,
         but use this mutex for the RPC "fee" command, which isn't.
@@ -831,13 +831,13 @@ template <class T>
 XRPAmount
 toDrops(FeeLevel<T> const& level, XRPAmount baseFee)
 {
-    return mulDiv(level, baseFee, TxQ::kBASE_LEVEL).value_or(XRPAmount(STAmount::kMAX_NATIVE_N));
+    return mulDiv(level, baseFee, TxQ::kBaseLevel).value_or(XRPAmount(STAmount::kMaxNativeN));
 }
 
 inline FeeLevel64
 toFeeLevel(XRPAmount const& drops, XRPAmount const& baseFee)
 {
-    return mulDiv(drops, TxQ::kBASE_LEVEL, baseFee)
+    return mulDiv(drops, TxQ::kBaseLevel, baseFee)
         .value_or(FeeLevel64(std::numeric_limits<std::uint64_t>::max()));
 }
 
diff --git a/src/xrpld/app/misc/ValidatorList.h b/src/xrpld/app/misc/ValidatorList.h
index 5f051fe527..dcd7a24499 100644
--- a/src/xrpld/app/misc/ValidatorList.h
+++ b/src/xrpld/app/misc/ValidatorList.h
@@ -246,12 +246,12 @@ class ValidatorList
     hash_set<PublicKey> negativeUNL_;
 
     // Currently supported versions of publisher list format
-    static constexpr std::uint32_t kSUPPORTED_LIST_VERSIONS[]{1, 2};
+    static constexpr std::uint32_t kSupportedListVersions[]{1, 2};
     // In the initial release, to prevent potential abuse and attacks, any VL
     // collection with more than 5 entries will be considered malformed.
-    static constexpr std::size_t kMAX_SUPPORTED_BLOBS = 5;
+    static constexpr std::size_t kMaxSupportedBlobs = 5;
     // Prefix of the file name used to store cache files.
-    static std::string const kFILE_PREFIX;
+    static std::string const kFilePrefix;
 
 public:
     ValidatorList(
@@ -360,7 +360,7 @@ public:
         std::string const& rawManifest,
         std::map<std::size_t, ValidatorBlobInfo> const& blobInfos,
         std::vector<MessageWithHash>& messages,
-        std::size_t maxSize = kMAXIMUM_MESSAGE_SIZE);
+        std::size_t maxSize = kMaximumMessageSize);
 
     /** Apply multiple published lists of public keys, then broadcast it to all
         peers that have not seen it or sent it.
diff --git a/src/xrpld/app/misc/detail/AmendmentTable.cpp b/src/xrpld/app/misc/detail/AmendmentTable.cpp
index 30fea32373..65771f6aa3 100644
--- a/src/xrpld/app/misc/detail/AmendmentTable.cpp
+++ b/src/xrpld/app/misc/detail/AmendmentTable.cpp
@@ -49,7 +49,7 @@ namespace xrpl {
 static std::vector<std::pair<uint256, std::string>>
 parseSection(Section const& section)
 {
-    static boost::regex const kRE1(
+    static boost::regex const kRe1(
         "^"                        // start of line
         "(?:\\s*)"                 // whitespace (optional)
         "([abcdefABCDEF0-9]{64})"  // <hexadecimal amendment ID>
@@ -64,7 +64,7 @@ parseSection(Section const& section)
     {
         boost::smatch match;
 
-        if (!boost::regex_match(line, match, kRE1))
+        if (!boost::regex_match(line, match, kRe1))
             Throw<std::runtime_error>("Invalid entry '" + line + "' in [" + section.name() + "]");
 
         uint256 id;
@@ -176,9 +176,9 @@ public:
         // from that validator.  So flapping due to that validator being off
         // line will happen less frequently than every 24 hours.
         using namespace std::chrono_literals;
-        static constexpr NetClock::duration kEXPIRES_AFTER = 24h;
+        static constexpr NetClock::duration kExpiresAfter = 24h;
 
-        auto const newTimeout = closeTime + kEXPIRES_AFTER;
+        auto const newTimeout = closeTime + kExpiresAfter;
 
         // Walk all validations and replace previous votes from trusted
         // validators with these newest votes.
@@ -330,8 +330,8 @@ public:
         threshold_ = std::max(
             1L,
             static_cast<long>(
-                (trustedValidations_ * kAMENDMENT_MAJORITY_CALC_THRESHOLD.num) /
-                kAMENDMENT_MAJORITY_CALC_THRESHOLD.den));
+                (trustedValidations_ * kAmendmentMajorityCalcThreshold.num) /
+                kAmendmentMajorityCalcThreshold.den));
     }
 
     [[nodiscard]] bool
diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp
index c270ddbe2d..d23aca8744 100644
--- a/src/xrpld/app/misc/detail/TxQ.cpp
+++ b/src/xrpld/app/misc/detail/TxQ.cpp
@@ -77,7 +77,7 @@ getFeeLevelPaid(ReadView const& view, STTx const& tx)
         return FeeLevel64(0);
     }
 
-    return mulDiv(effectiveFeePaid, TxQ::kBASE_LEVEL, baseFee)
+    return mulDiv(effectiveFeePaid, TxQ::kBaseLevel, baseFee)
         .value_or(FeeLevel64(std::numeric_limits<std::uint64_t>::max()));
 }
 
@@ -93,7 +93,7 @@ static FeeLevel64
 increase(FeeLevel64 level, std::uint32_t increasePercent)
 {
     return mulDiv(level, 100 + increasePercent, 100)
-        .value_or(static_cast<FeeLevel64>(xrpl::kMULDIV_MAX));
+        .value_or(static_cast<FeeLevel64>(xrpl::kMuldivMax));
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -130,15 +130,15 @@ TxQ::FeeMetrics::update(
         // upperLimit must be >= minimumTxnCount_ or std::clamp can give
         // unexpected results
         auto const upperLimit = std::max<std::uint64_t>(
-            mulDiv(txnsExpected_, cutPct, 100).value_or(xrpl::kMULDIV_MAX), minimumTxnCount_);
+            mulDiv(txnsExpected_, cutPct, 100).value_or(xrpl::kMuldivMax), minimumTxnCount_);
         txnsExpected_ = std::clamp<std::uint64_t>(
-            mulDiv(size, cutPct, 100).value_or(xrpl::kMULDIV_MAX), minimumTxnCount_, upperLimit);
+            mulDiv(size, cutPct, 100).value_or(xrpl::kMuldivMax), minimumTxnCount_, upperLimit);
         recentTxnCounts_.clear();
     }
     else if (size > txnsExpected_ || size > targetTxnCount_)
     {
         recentTxnCounts_.push_back(mulDiv(size, 100 + setup.normalConsensusIncreasePercent, 100)
-                                       .value_or(xrpl::kMULDIV_MAX));
+                                       .value_or(xrpl::kMuldivMax));
         auto const iter = std::ranges::max_element(recentTxnCounts_);
         BOOST_ASSERT(iter != recentTxnCounts_.end());
         auto const next = [&] {
@@ -194,15 +194,15 @@ TxQ::FeeMetrics::scaleFeeLevel(Snapshot const& snapshot, OpenView const& view)
         // Compute escalated fee level
         // Don't care about the overflow flag
         return mulDiv(multiplier, current * current, target * target)
-            .value_or(static_cast<FeeLevel64>(xrpl::kMULDIV_MAX));
+            .value_or(static_cast<FeeLevel64>(xrpl::kMuldivMax));
     }
 
-    return kBASE_LEVEL;
+    return kBaseLevel;
 }
 
 namespace detail {
 
-constexpr static std::pair<bool, std::uint64_t>
+static constexpr std::pair<bool, std::uint64_t>
 sumOfFirstSquares(std::size_t xIn)
 {
     // sum(n = 1->x) : n * n = x(x + 1)(2x + 1) / 6
@@ -764,7 +764,7 @@ TxQ::apply(
     // If the transaction needs a Ticket is that Ticket in the ledger?
     SeqProxy const acctSeqProx = SeqProxy::sequence((*sleAccount)[sfSequence]);
     SeqProxy const txSeqProx = tx->getSeqProxy();
-    if (txSeqProx.isTicket() && !view.exists(keylet::kTICKET(account, txSeqProx)))
+    if (txSeqProx.isTicket() && !view.exists(keylet::kTicket(account, txSeqProx)))
     {
         if (txSeqProx.value() < acctSeqProx.value())
         {
@@ -1030,8 +1030,8 @@ TxQ::apply(
             // Sum fees and spending for all of the queued transactions
             // so we know how much to remove from the account balance
             // for the trial preclaim.
-            XRPAmount potentialSpend = beast::kZERO;
-            XRPAmount totalFee = beast::kZERO;
+            XRPAmount potentialSpend = beast::kZero;
+            XRPAmount totalFee = beast::kZero;
             for (auto iter = txIter->first; iter != txIter->end; ++iter)
             {
                 // If we're replacing this transaction don't include
@@ -1154,7 +1154,7 @@ TxQ::apply(
         return {pcresult.ter, false};
 
     // Too low of a fee should get caught by preclaim
-    XRPL_ASSERT(feeLevelPaid >= kBASE_LEVEL, "xrpl::TxQ::apply : minimum fee");
+    XRPL_ASSERT(feeLevelPaid >= kBaseLevel, "xrpl::TxQ::apply : minimum fee");
 
     JLOG(j_.trace()) << "Transaction " << transactionID << " from account " << account
                      << " has fee level of " << feeLevelPaid << " needs at least "
@@ -1179,10 +1179,10 @@ TxQ::apply(
             conditions change, but don't waste the effort to clear).
     */
     if (txSeqProx.isSeq() && txIter && multiTxn.has_value() &&
-        txIter->first->second.retriesRemaining == MaybeTx::kRETRIES_ALLOWED &&
-        feeLevelPaid > requiredFeeLevel && requiredFeeLevel > kBASE_LEVEL)
+        txIter->first->second.retriesRemaining == MaybeTx::kRetriesAllowed &&
+        feeLevelPaid > requiredFeeLevel && requiredFeeLevel > kBaseLevel)
     {
-        OpenView sandbox(kOPEN_LEDGER, &view, view.rules());
+        OpenView sandbox(kOpenLedger, &view, view.rules());
 
         auto result = tryClearAccountQueueUpThruTx(
             app,
@@ -1249,7 +1249,7 @@ TxQ::apply(
             if (lastRIter->feeLevel > feeLevelPaid || endAccount.transactions.size() == 1)
                 return lastRIter->feeLevel;
 
-            constexpr FeeLevel64 kMAX{std::numeric_limits<std::uint64_t>::max()};
+            constexpr FeeLevel64 kMax{std::numeric_limits<std::uint64_t>::max()};
             auto endTotal = std::accumulate(
                 endAccount.transactions.begin(),
                 endAccount.transactions.end(),
@@ -1258,8 +1258,8 @@ TxQ::apply(
                     // Check for overflow.
                     auto next = txn.second.feeLevel / endAccount.transactions.size();
                     auto mod = txn.second.feeLevel % endAccount.transactions.size();
-                    if (total.first >= kMAX - next || total.second >= kMAX - mod)
-                        return {kMAX, FeeLevel64{0}};
+                    if (total.first >= kMax - next || total.second >= kMax - mod)
+                        return {kMax, FeeLevel64{0}};
 
                     return {total.first + next, total.second + mod};
                 });
@@ -1750,9 +1750,9 @@ TxQ::getMetrics(OpenView const& view) const
     result.txQMaxSize = maxSize_;
     result.txInLedger = view.txCount();
     result.txPerLedger = snapshot.txnsExpected;
-    result.referenceFeeLevel = kBASE_LEVEL;
+    result.referenceFeeLevel = kBaseLevel;
     result.minProcessingFeeLevel =
-        isFull() ? byFee_.rbegin()->feeLevel + FeeLevel64{1} : kBASE_LEVEL;
+        isFull() ? byFee_.rbegin()->feeLevel + FeeLevel64{1} : kBaseLevel;
     result.medFeeLevel = snapshot.escalationMultiplier;
     result.openLedgerFeeLevel = FeeMetrics::scaleFeeLevel(snapshot, view);
 
@@ -1775,7 +1775,7 @@ TxQ::getTxRequiredFeeAndSeq(OpenView const& view, std::shared_ptr<STTx const> co
     std::uint32_t const accountSeq = sle ? (*sle)[sfSequence] : 0;
     std::uint32_t const availableSeq = nextQueuableSeqImpl(sle, lock).value();
     return {
-        .fee = mulDiv(fee, baseFee, kBASE_LEVEL)
+        .fee = mulDiv(fee, baseFee, kBaseLevel)
                    .value_or(XRPAmount(std::numeric_limits<std::int64_t>::max())),
         .accountSeq = accountSeq,
         .availableSeq = availableSeq};
diff --git a/src/xrpld/app/misc/detail/ValidatorList.cpp b/src/xrpld/app/misc/detail/ValidatorList.cpp
index 415557ae48..57b65814e1 100644
--- a/src/xrpld/app/misc/detail/ValidatorList.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorList.cpp
@@ -130,7 +130,7 @@ ValidatorList::MessageWithHash::MessageWithHash(
 {
 }
 
-std::string const ValidatorList::kFILE_PREFIX = "cache.";
+std::string const ValidatorList::kFilePrefix = "cache.";
 
 ValidatorList::ValidatorList(
     ManifestCache& validatorManifests,
@@ -291,7 +291,7 @@ ValidatorList::load(
 boost::filesystem::path
 ValidatorList::getCacheFileName(ValidatorList::scoped_lock const&, PublicKey const& pubKey) const
 {
-    return dataPath_ / (kFILE_PREFIX + strHex(pubKey));
+    return dataPath_ / (kFilePrefix + strHex(pubKey));
 }
 
 // static
@@ -420,7 +420,7 @@ ValidatorList::parseBlobs(std::uint32_t version, json::Value const& body)
         case 2:
         default: {
             if (!body.isMember(jss::blobs_v2) || !body[jss::blobs_v2].isArray() ||
-                body[jss::blobs_v2].size() > kMAX_SUPPORTED_BLOBS ||
+                body[jss::blobs_v2].size() > kMaxSupportedBlobs ||
                 // If any of the v1 fields are present, the VL is malformed
                 body.isMember(jss::blob) || body.isMember(jss::signature))
                 return {};
@@ -462,7 +462,7 @@ ValidatorList::parseBlobs(protocol::TMValidatorList const& body)
 std::vector<ValidatorBlobInfo>
 ValidatorList::parseBlobs(protocol::TMValidatorListCollection const& body)
 {
-    if (body.blobs_size() > kMAX_SUPPORTED_BLOBS)
+    if (body.blobs_size() > kMaxSupportedBlobs)
         return {};
     std::vector<ValidatorBlobInfo> result;
     result.reserve(body.blobs_size());
@@ -536,7 +536,7 @@ splitMessageParts(
             smallMsg.set_manifest(blob.manifest());
 
         XRPL_ASSERT(
-            Message::totalSize(smallMsg) <= kMAXIMUM_MESSAGE_SIZE,
+            Message::totalSize(smallMsg) <= kMaximumMessageSize,
             "xrpl::splitMessageParts : maximum message size");
 
         messages.emplace_back(
@@ -593,7 +593,7 @@ buildValidatorListMessage(
     msg.set_version(version);
 
     XRPL_ASSERT(
-        Message::totalSize(msg) <= kMAXIMUM_MESSAGE_SIZE,
+        Message::totalSize(msg) <= kMaximumMessageSize,
         "xrpl::buildValidatorListMessage(ValidatorBlobInfo) : maximum "
         "message size");
     messages.emplace_back(
@@ -659,7 +659,7 @@ ValidatorList::buildValidatorListMessages(
     std::string const& rawManifest,
     std::map<std::size_t, ValidatorBlobInfo> const& blobInfos,
     std::vector<ValidatorList::MessageWithHash>& messages,
-    std::size_t maxSize /*= kMAXIMUM_MESSAGE_SIZE*/)
+    std::size_t maxSize /*= kMaximumMessageSize*/)
 {
     XRPL_ASSERT(
         !blobInfos.empty(),
@@ -978,8 +978,8 @@ ValidatorList::applyLists(
     std::string siteUri,
     std::optional<uint256> const& hash /* = {} */)
 {
-    if (std::count(
-            std::begin(kSUPPORTED_LIST_VERSIONS), std::end(kSUPPORTED_LIST_VERSIONS), version) != 1)
+    if (std::count(std::begin(kSupportedListVersions), std::end(kSupportedListVersions), version) !=
+        1)
         return PublisherListStats{ListDisposition::UnsupportedVersion};
 
     std::scoped_lock const lock{mutex_};
diff --git a/src/xrpld/app/misc/detail/ValidatorSite.cpp b/src/xrpld/app/misc/detail/ValidatorSite.cpp
index 534429307a..7b5d7ee951 100644
--- a/src/xrpld/app/misc/detail/ValidatorSite.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorSite.cpp
@@ -44,9 +44,9 @@
 
 namespace xrpl {
 
-auto constexpr kDEFAULT_REFRESH_INTERVAL = std::chrono::minutes{5};
-auto constexpr kERROR_RETRY_INTERVAL = std::chrono::seconds{30};
-unsigned short constexpr kMAX_REDIRECTS = 3;
+constexpr auto kDefaultRefreshInterval = std::chrono::minutes{5};
+constexpr auto kErrorRetryInterval = std::chrono::seconds{30};
+unsigned constexpr short kMaxRedirects = 3;
 
 ValidatorSite::Site::Resource::Resource(std::string inUri) : uri{std::move(inUri)}
 {
@@ -92,7 +92,7 @@ ValidatorSite::Site::Resource::Resource(std::string inUri) : uri{std::move(inUri
 ValidatorSite::Site::Site(std::string uri)
     : loadedResource{std::make_shared<Resource>(std::move(uri))}
     , startingResource{loadedResource}
-    , refreshInterval{kDEFAULT_REFRESH_INTERVAL}
+    , refreshInterval{kDefaultRefreshInterval}
     , nextRefresh{clock_type::now()}
 
 {
@@ -512,7 +512,7 @@ ValidatorSite::processRedirect(
         throw std::runtime_error{"missing location"};
     }
 
-    if (sites_[siteIdx].redirCount == kMAX_REDIRECTS)
+    if (sites_[siteIdx].redirCount == kMaxRedirects)
     {
         JLOG(j_.warn()) << "Exceeded max redirects for validator list at "
                         << sites_[siteIdx].loadedResource->uri;
@@ -558,7 +558,7 @@ ValidatorSite::onSiteFetch(
                     .disposition = ListDisposition::Invalid,
                     .message = errMsg});
             if (retry)
-                sites_[siteIdx].nextRefresh = clock_type::now() + kERROR_RETRY_INTERVAL;
+                sites_[siteIdx].nextRefresh = clock_type::now() + kErrorRetryInterval;
 
             // See if there's a copy saved locally from last time we
             // saw the list.
diff --git a/src/xrpld/app/rdb/backend/detail/Node.cpp b/src/xrpld/app/rdb/backend/detail/Node.cpp
index ad7f44c98d..1fd3136420 100644
--- a/src/xrpld/app/rdb/backend/detail/Node.cpp
+++ b/src/xrpld/app/rdb/backend/detail/Node.cpp
@@ -75,7 +75,7 @@ namespace xrpl::detail {
 static std::string
 toString(TableType type)
 {
-    static_assert(kTABLE_TYPE_COUNT == 3, "Need to modify switch statement if enum is modified");
+    static_assert(kTableTypeCount == 3, "Need to modify switch statement if enum is modified");
 
     switch (type)
     {
@@ -102,7 +102,7 @@ makeLedgerDBs(
 {
     // ledger database
     auto lgr{std::make_unique<DatabaseCon>(
-        setup, kLGR_DB_NAME, setup.lgrPragma, kLGR_DB_INIT, checkpointerSetup, j)};
+        setup, kLgrDbName, setup.lgrPragma, kLgrDbInit, checkpointerSetup, j)};
     lgr->getSession() << boost::str(
         boost::format("PRAGMA cache_size=-%d;") %
         kilobytes(config.getValueFor(SizedItem::LgrDbCache)));
@@ -111,7 +111,7 @@ makeLedgerDBs(
     {
         // transaction database
         auto tx{std::make_unique<DatabaseCon>(
-            setup, kTX_DB_NAME, setup.txPragma, kTX_DB_INIT, checkpointerSetup, j)};
+            setup, kTxDbName, setup.txPragma, kTxDbInit, checkpointerSetup, j)};
         tx->getSession() << boost::str(
             boost::format("PRAGMA cache_size=-%d;") %
             kilobytes(config.getValueFor(SizedItem::TxnDbCache)));
@@ -274,16 +274,15 @@ saveValidatedLedger(
     }
 
     {
-        static boost::format kDELETE_LEDGER("DELETE FROM Ledgers WHERE LedgerSeq = %u;");
-        static boost::format kDELETE_TRANS1("DELETE FROM Transactions WHERE LedgerSeq = %u;");
-        static boost::format kDELETE_TRANS2(
-            "DELETE FROM AccountTransactions WHERE LedgerSeq = %u;");
-        static boost::format kDELETE_ACCT_TRANS(
+        static boost::format kDeleteLedger("DELETE FROM Ledgers WHERE LedgerSeq = %u;");
+        static boost::format kDeleteTranS1("DELETE FROM Transactions WHERE LedgerSeq = %u;");
+        static boost::format kDeleteTranS2("DELETE FROM AccountTransactions WHERE LedgerSeq = %u;");
+        static boost::format kDeleteAcctTrans(
             "DELETE FROM AccountTransactions WHERE TransID = '%s';");
 
         {
             auto db = ldgDB.checkoutDb();
-            *db << boost::str(kDELETE_LEDGER % seq);
+            *db << boost::str(kDeleteLedger % seq);
         }
 
         if (app.config().useTxTables())
@@ -300,8 +299,8 @@ saveValidatedLedger(
 
             soci::transaction tr(*db);
 
-            *db << boost::str(kDELETE_TRANS1 % seq);
-            *db << boost::str(kDELETE_TRANS2 % seq);
+            *db << boost::str(kDeleteTranS1 % seq);
+            *db << boost::str(kDeleteTranS2 % seq);
 
             std::string const ledgerSeq(std::to_string(seq));
 
@@ -312,7 +311,7 @@ saveValidatedLedger(
                 std::string const txnId(to_string(transactionID));
                 std::string const txnSeq(std::to_string(acceptedLedgerTx->getTxnSeq()));
 
-                *db << boost::str(kDELETE_ACCT_TRANS % transactionID);
+                *db << boost::str(kDeleteAcctTrans % transactionID);
 
                 auto const& accts = acceptedLedgerTx->getAffected();
 
@@ -378,7 +377,7 @@ saveValidatedLedger(
         }
 
         {
-            static std::string const kADD_LEDGER(
+            static std::string const kAddLedger(
                 R"sql(INSERT OR REPLACE INTO Ledgers
                 (LedgerHash,LedgerSeq,PrevHash,TotalCoins,ClosingTime,PrevClosingTime,
                 CloseTimeRes,CloseFlags,AccountSetHash,TransSetHash)
@@ -401,7 +400,7 @@ saveValidatedLedger(
             auto const accountHash = to_string(ledger->header().accountHash);
             auto const txHash = to_string(ledger->header().txHash);
 
-            *db << kADD_LEDGER, soci::use(hash), soci::use(seq), soci::use(parentHash),
+            *db << kAddLedger, soci::use(hash), soci::use(seq), soci::use(parentHash),
                 soci::use(drops), soci::use(closeTime), soci::use(parentCloseTime),
                 soci::use(closeTimeResolution), soci::use(closeFlags), soci::use(accountHash),
                 soci::use(txHash);
@@ -697,8 +696,8 @@ transactionsSQL(
     bool count,
     beast::Journal j)
 {
-    constexpr std::uint32_t kNONBINARY_PAGE_LENGTH = 200;
-    constexpr std::uint32_t kBINARY_PAGE_LENGTH = 500;
+    static constexpr std::uint32_t kNonbinaryPageLength = 200;
+    static constexpr std::uint32_t kBinaryPageLength = 500;
 
     std::uint32_t numberOfResults = 0;
 
@@ -708,12 +707,12 @@ transactionsSQL(
     }
     else if (options.limit == UINT32_MAX)
     {
-        numberOfResults = binary ? kBINARY_PAGE_LENGTH : kNONBINARY_PAGE_LENGTH;
+        numberOfResults = binary ? kBinaryPageLength : kNonbinaryPageLength;
     }
     else if (!options.bUnlimited)
     {
         numberOfResults =
-            std::min(binary ? kBINARY_PAGE_LENGTH : kNONBINARY_PAGE_LENGTH, options.limit);
+            std::min(binary ? kBinaryPageLength : kNonbinaryPageLength, options.limit);
     }
     else
     {
@@ -1048,7 +1047,7 @@ accountTxPage(
 
     std::optional<RelationalDatabase::AccountTxMarker> newmarker;
 
-    static std::string const kPREFIX(
+    static std::string const kPrefix(
         R"(SELECT AccountTransactions.LedgerSeq,AccountTransactions.TxnSeq,
           Status,RawTxn,TxnMeta
           FROM AccountTransactions INNER JOIN Transactions
@@ -1065,7 +1064,7 @@ accountTxPage(
     if (findLedger == 0)
     {
         sql = boost::str(
-            boost::format(kPREFIX + (R"(AccountTransactions.LedgerSeq BETWEEN %u AND %u
+            boost::format(kPrefix + (R"(AccountTransactions.LedgerSeq BETWEEN %u AND %u
              ORDER BY AccountTransactions.LedgerSeq %s,
              AccountTransactions.TxnSeq %s
              LIMIT %u;)")) %
@@ -1303,7 +1302,7 @@ dbHasSpace(soci::session& session, Config const& config, beast::Journal j)
     if (config.useTxTables())
     {
         DatabaseCon::Setup const dbSetup = setupDatabaseCon(config);
-        boost::filesystem::path const dbPath = dbSetup.dataDir / kTX_DB_NAME;
+        boost::filesystem::path const dbPath = dbSetup.dataDir / kTxDbName;
         boost::system::error_code ec;
         std::optional<std::uint64_t> dbSize = boost::filesystem::file_size(dbPath, ec);
         if (ec)
@@ -1312,23 +1311,23 @@ dbHasSpace(soci::session& session, Config const& config, beast::Journal j)
             dbSize.reset();
         }
 
-        static auto const kPAGE_SIZE = [&] {
+        static auto const kPageSize = [&] {
             std::uint32_t ps = 0;
             session << "PRAGMA page_size;", soci::into(ps);
             return ps;
         }();
-        static auto const kMAX_PAGES = [&] {
+        static auto const kMaxPages = [&] {
             std::uint32_t mp = 0;
             session << "PRAGMA max_page_count;", soci::into(mp);
             return mp;
         }();
         std::uint32_t pageCount = 0;
         session << "PRAGMA page_count;", soci::into(pageCount);
-        std::uint32_t const freePages = kMAX_PAGES - pageCount;
-        std::uint64_t const freeSpace = safeCast<std::uint64_t>(freePages) * kPAGE_SIZE;
+        std::uint32_t const freePages = kMaxPages - pageCount;
+        std::uint64_t const freeSpace = safeCast<std::uint64_t>(freePages) * kPageSize;
         JLOG(j.info()) << "Transaction DB pathname: " << dbPath.string()
                        << "; file size: " << dbSize.value_or(-1) << " bytes"
-                       << "; SQLite page size: " << kPAGE_SIZE << " bytes"
+                       << "; SQLite page size: " << kPageSize << " bytes"
                        << "; Free pages: " << freePages << "; Free space: " << freeSpace
                        << " bytes; "
                        << "Note that this does not take into account available disk "
diff --git a/src/xrpld/app/rdb/backend/detail/Node.h b/src/xrpld/app/rdb/backend/detail/Node.h
index f5beb230b1..8267bb1a82 100644
--- a/src/xrpld/app/rdb/backend/detail/Node.h
+++ b/src/xrpld/app/rdb/backend/detail/Node.h
@@ -9,7 +9,7 @@ namespace xrpl::detail {
 
 /* Need to change TableTypeCount if TableType is modified. */
 enum class TableType { Ledgers, Transactions, AccountTransactions };
-constexpr int kTABLE_TYPE_COUNT = 3;
+constexpr int kTableTypeCount = 3;
 
 struct DatabasePairValid
 {
diff --git a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
index a50d17bf2b..fd1298516f 100644
--- a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
+++ b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
@@ -420,7 +420,7 @@ SQLiteDatabase::oldestAccountTxPage(AccountTxPageOptions const& options)
     if (!useTxTables_)
         return {};
 
-    static std::uint32_t const kPAGE_LENGTH(200);
+    static std::uint32_t const kPageLength(200);
     auto onUnsavedLedger =
         std::bind(saveLedgerAsync, std::ref(registry_.get().getApp()), std::placeholders::_1);
     AccountTxs ret;
@@ -436,7 +436,7 @@ SQLiteDatabase::oldestAccountTxPage(AccountTxPageOptions const& options)
     {
         auto db = checkoutTransaction();
         auto newmarker =
-            detail::oldestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPAGE_LENGTH)
+            detail::oldestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPageLength)
                 .first;
         return {ret, newmarker};
     }
@@ -450,7 +450,7 @@ SQLiteDatabase::newestAccountTxPage(AccountTxPageOptions const& options)
     if (!useTxTables_)
         return {};
 
-    static std::uint32_t const kPAGE_LENGTH(200);
+    static std::uint32_t const kPageLength(200);
     auto onUnsavedLedger =
         std::bind(saveLedgerAsync, std::ref(registry_.get().getApp()), std::placeholders::_1);
     AccountTxs ret;
@@ -466,7 +466,7 @@ SQLiteDatabase::newestAccountTxPage(AccountTxPageOptions const& options)
     {
         auto db = checkoutTransaction();
         auto newmarker =
-            detail::newestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPAGE_LENGTH)
+            detail::newestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPageLength)
                 .first;
         return {ret, newmarker};
     }
@@ -480,7 +480,7 @@ SQLiteDatabase::oldestAccountTxPageB(AccountTxPageOptions const& options)
     if (!useTxTables_)
         return {};
 
-    static std::uint32_t const kPAGE_LENGTH(500);
+    static std::uint32_t const kPageLength(500);
     auto onUnsavedLedger =
         std::bind(saveLedgerAsync, std::ref(registry_.get().getApp()), std::placeholders::_1);
     MetaTxsList ret;
@@ -494,7 +494,7 @@ SQLiteDatabase::oldestAccountTxPageB(AccountTxPageOptions const& options)
     {
         auto db = checkoutTransaction();
         auto newmarker =
-            detail::oldestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPAGE_LENGTH)
+            detail::oldestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPageLength)
                 .first;
         return {ret, newmarker};
     }
@@ -508,7 +508,7 @@ SQLiteDatabase::newestAccountTxPageB(AccountTxPageOptions const& options)
     if (!useTxTables_)
         return {};
 
-    static std::uint32_t const kPAGE_LENGTH(500);
+    static std::uint32_t const kPageLength(500);
     auto onUnsavedLedger =
         std::bind(saveLedgerAsync, std::ref(registry_.get().getApp()), std::placeholders::_1);
     MetaTxsList ret;
@@ -522,7 +522,7 @@ SQLiteDatabase::newestAccountTxPageB(AccountTxPageOptions const& options)
     {
         auto db = checkoutTransaction();
         auto newmarker =
-            detail::newestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPAGE_LENGTH)
+            detail::newestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPageLength)
                 .first;
         return {ret, newmarker};
     }
@@ -641,10 +641,10 @@ SQLiteDatabase::SQLiteDatabase(ServiceRegistry& registry, Config const& config,
             setup,
             DatabaseCon::CheckpointerSetup{.jobQueue = &jobQueue, .registry = registry_}))
     {
-        std::string_view constexpr kERROR = "Failed to create ledger databases";
+        static constexpr std::string_view kError = "Failed to create ledger databases";
 
-        JLOG(j_.fatal()) << kERROR;
-        Throw<std::runtime_error>(kERROR.data());
+        JLOG(j_.fatal()) << kError;
+        Throw<std::runtime_error>(kError.data());
     }
 }
 
diff --git a/src/xrpld/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h
index d2c5faca22..8b4e971440 100644
--- a/src/xrpld/consensus/Consensus.h
+++ b/src/xrpld/consensus/Consensus.h
@@ -549,7 +549,7 @@ private:
     // How long has this round been open
     ConsensusTimer openTime_;
 
-    NetClock::duration closeResolution_ = kLEDGER_DEFAULT_TIME_RESOLUTION;
+    NetClock::duration closeResolution_ = kLedgerDefaultTimeResolution;
 
     ConsensusParms::AvalancheState closeTimeAvalancheState_ = ConsensusParms::AvalancheState::Init;
 
@@ -1249,7 +1249,7 @@ Consensus<Adaptor>::shouldPause(std::unique_ptr<std::stringstream> const& clog)
      *  3: >=95%
      *  4: =100%
      */
-    constexpr static std::size_t kMAX_PAUSE_PHASE = 4;
+    static constexpr std::size_t kMaxPausePhase = 4;
 
     /**
      * No particular threshold guarantees consensus. Lower thresholds
@@ -1270,7 +1270,7 @@ Consensus<Adaptor>::shouldPause(std::unique_ptr<std::stringstream> const& clog)
      * else out of the scope of this delay mechanism is wrong with the
      * network.
      */
-    std::size_t const phase = (ahead - 1) % (kMAX_PAUSE_PHASE + 1);
+    std::size_t const phase = (ahead - 1) % (kMaxPausePhase + 1);
 
     // validators that remain after the laggards() function are considered
     // offline, and should be considered as laggards for purposes of
@@ -1282,7 +1282,7 @@ Consensus<Adaptor>::shouldPause(std::unique_ptr<std::stringstream> const& clog)
             if (laggards + offline > totalValidators - quorum)
                 willPause = true;
             break;
-        case kMAX_PAUSE_PHASE:
+        case kMaxPausePhase:
             // No tolerance.
             willPause = true;
             break;
@@ -1297,7 +1297,7 @@ Consensus<Adaptor>::shouldPause(std::unique_ptr<std::stringstream> const& clog)
             float const nonLaggards = totalValidators - (laggards + offline);
             float const quorumRatio = static_cast<float>(quorum) / totalValidators;
             float const allowedDissent = 1.0f - quorumRatio;
-            float const phaseFactor = static_cast<float>(phase) / kMAX_PAUSE_PHASE;
+            float const phaseFactor = static_cast<float>(phase) / kMaxPausePhase;
 
             if (nonLaggards / totalValidators < quorumRatio + (allowedDissent * phaseFactor))
             {
@@ -1696,9 +1696,9 @@ Consensus<Adaptor>::haveConsensus(std::unique_ptr<std::stringstream> const& clog
     // Consensus has taken far too long. Drop out of the round.
     if (result_->state == ConsensusState::Expired)
     {
-        static auto const kMINIMUM_COUNTER = parms.avalancheCutoffs.size() * parms.avMIN_ROUNDS;
+        static auto const kMinimumCounter = parms.avalancheCutoffs.size() * parms.avMIN_ROUNDS;
         std::stringstream ss;
-        if (establishCounter_ < kMINIMUM_COUNTER)
+        if (establishCounter_ < kMinimumCounter)
         {
             // If each round of phaseEstablish takes a very long time, we may
             // "expire" before we've given consensus enough time at each
@@ -1708,7 +1708,7 @@ Consensus<Adaptor>::haveConsensus(std::unique_ptr<std::stringstream> const& clog
             // amount of time.
 
             ss << "Consensus time has expired in round " << establishCounter_
-               << "; continue until round " << kMINIMUM_COUNTER << ". "
+               << "; continue until round " << kMinimumCounter << ". "
                << json::Compact{getJson(false)};
             JLOG(j_.error()) << ss.str();
             CLOG(clog) << ss.str() << ". ";
diff --git a/src/xrpld/consensus/ConsensusProposal.h b/src/xrpld/consensus/ConsensusProposal.h
index 24a31b3820..d16679bfb5 100644
--- a/src/xrpld/consensus/ConsensusProposal.h
+++ b/src/xrpld/consensus/ConsensusProposal.h
@@ -26,7 +26,7 @@ namespace xrpl {
     As consensus proceeds, peers may change their position on the transaction,
     or choose to abstain. Each successive proposal includes a strictly
     monotonically increasing number (or, if a peer is choosing to abstain,
-    the special value `kSEQ_LEAVE`).
+    the special value `kSeqLeave`).
 
     Refer to @ref Consensus for requirements of the template arguments.
 
@@ -42,10 +42,10 @@ public:
     using NodeID = NodeId;
 
     //< Sequence value when a peer initially joins consensus
-    static std::uint32_t const kSEQ_JOIN = 0;
+    static std::uint32_t const kSeqJoin = 0;
 
     //< Sequence number when  a peer wants to bow out and leave consensus
-    static std::uint32_t const kSEQ_LEAVE = 0xffffffff;
+    static std::uint32_t const kSeqLeave = 0xffffffff;
 
     /** Constructor
 
@@ -95,7 +95,7 @@ public:
 
     /** Get the sequence number of this proposal
 
-        Starting with an initial sequence number of `kSEQ_JOIN`, successive
+        Starting with an initial sequence number of `kSeqJoin`, successive
         proposals from a peer will increase the sequence number.
 
         @return the sequence number
@@ -126,14 +126,14 @@ public:
     bool
     isInitial() const
     {
-        return proposeSeq_ == kSEQ_JOIN;
+        return proposeSeq_ == kSeqJoin;
     }
 
     //! Get whether this node left the consensus process
     bool
     isBowOut() const
     {
-        return proposeSeq_ == kSEQ_LEAVE;
+        return proposeSeq_ == kSeqLeave;
     }
 
     //! Get whether this position is stale relative to the provided cutoff
@@ -160,7 +160,7 @@ public:
         position_ = newPosition;
         closeTime_ = newCloseTime;
         time_ = now;
-        if (proposeSeq_ != kSEQ_LEAVE)
+        if (proposeSeq_ != kSeqLeave)
             ++proposeSeq_;
     }
 
@@ -175,7 +175,7 @@ public:
     {
         signingHash_.reset();
         time_ = now;
-        proposeSeq_ = kSEQ_LEAVE;
+        proposeSeq_ = kSeqLeave;
     }
 
     std::string
diff --git a/src/xrpld/consensus/Validations.h b/src/xrpld/consensus/Validations.h
index 825d0f6076..fd32b52518 100644
--- a/src/xrpld/consensus/Validations.h
+++ b/src/xrpld/consensus/Validations.h
@@ -702,12 +702,12 @@ public:
             {
                 // We only need to refresh the keep range when it's just about
                 // to expire. Track the next time we need to refresh.
-                static std::chrono::steady_clock::time_point kREFRESH_TIME;
-                if (auto const now = byLedger_.clock().now(); kREFRESH_TIME <= now)
+                static std::chrono::steady_clock::time_point kRefreshTime;
+                if (auto const now = byLedger_.clock().now(); kRefreshTime <= now)
                 {
                     // The next refresh time is shortly before the expiration
                     // time from now.
-                    kREFRESH_TIME = now + parms_.validationSET_EXPIRES - parms_.validationFRESHNESS;
+                    kRefreshTime = now + parms_.validationSET_EXPIRES - parms_.validationFRESHNESS;
 
                     for (auto i = byLedger_.begin(); i != byLedger_.end(); ++i)
                     {
diff --git a/src/xrpld/core/Config.h b/src/xrpld/core/Config.h
index 4936906a9a..322683e119 100644
--- a/src/xrpld/core/Config.h
+++ b/src/xrpld/core/Config.h
@@ -51,10 +51,10 @@ struct FeeSetup
     XRPAmount reference_fee{10};
 
     /** The account reserve requirement in drops. */
-    XRPAmount account_reserve{1'000'000};  // 1 XRP
+    XRPAmount account_reserve{10 * kDropsPerXrp};
 
     /** The per-owned item reserve requirement in drops. */
-    XRPAmount owner_reserve{200'000};  // 0.2 XRP
+    XRPAmount owner_reserve{2 * kDropsPerXrp};
 
     /* (Remember to update the example cfg files when changing any of these
      * values.) */
@@ -76,10 +76,10 @@ class Config : public BasicConfig
 {
 public:
     // Settings related to the configuration file location and directories
-    static char const* const kCONFIG_FILE_NAME;
-    static char const* const kCONFIG_LEGACY_NAME;
-    static char const* const kDATABASE_DIR_NAME;
-    static char const* const kVALIDATORS_FILE_NAME;
+    static char const* const kConfigFileName;
+    static char const* const kConfigLegacyName;
+    static char const* const kDatabaseDirName;
+    static char const* const kValidatorsFileName;
 
     /** Returns the full path and filename of the debug log file. */
     [[nodiscard]] boost::filesystem::path
@@ -209,11 +209,11 @@ public:
 
     // Work queue limits
     int MAX_TRANSACTIONS = 250;
-    static constexpr int kMAX_JOB_QUEUE_TX = 1000;
-    static constexpr int kMIN_JOB_QUEUE_TX = 100;
+    static constexpr int kMaxJobQueueTx = 1000;
+    static constexpr int kMinJobQueueTx = 100;
 
     // Amendment majority time
-    std::chrono::seconds AMENDMENT_MAJORITY_TIME = kDEFAULT_AMENDMENT_MAJORITY_TIME;
+    std::chrono::seconds AMENDMENT_MAJORITY_TIME = kDefaultAmendmentMajorityTime;
 
     // Thread pool configuration (0 = choose for me)
     int WORKERS = 0;           // jobqueue thread count. default: upto 6
diff --git a/src/xrpld/core/TimeKeeper.h b/src/xrpld/core/TimeKeeper.h
index a21f5aa6e8..8eb13e75c0 100644
--- a/src/xrpld/core/TimeKeeper.h
+++ b/src/xrpld/core/TimeKeeper.h
@@ -18,7 +18,7 @@ private:
     adjust(std::chrono::system_clock::time_point when)
     {
         return time_point(
-            std::chrono::duration_cast<duration>(when.time_since_epoch() - kEPOCH_OFFSET));
+            std::chrono::duration_cast<duration>(when.time_since_epoch() - kEpochOffset));
     }
 
 public:
diff --git a/src/xrpld/core/detail/Config.cpp b/src/xrpld/core/detail/Config.cpp
index 11ee43e9cc..7830ad9c56 100644
--- a/src/xrpld/core/detail/Config.cpp
+++ b/src/xrpld/core/detail/Config.cpp
@@ -114,7 +114,7 @@ namespace xrpl {
 // clang-format off
 // The configurable node sizes are "tiny", "small", "medium", "large", "huge"
 inline constexpr std::array<std::pair<SizedItem, std::array<int, 5>>, 13>
-kSIZED_ITEMS
+kSizedItems
 {{
     // FIXME: We should document each of these items, explaining exactly
     //        what they control and whether there exists an explicit
@@ -143,7 +143,7 @@ static_assert(
     []() constexpr -> bool {
         std::underlying_type_t<SizedItem> idx = 0;
 
-        for (auto const& i : kSIZED_ITEMS)
+        for (auto const& i : kSizedItems)
         {
             if (static_cast<std::underlying_type_t<SizedItem>>(i.first) != idx)
                 return false;
@@ -248,10 +248,10 @@ getSingleSection(
 //
 //------------------------------------------------------------------------------
 
-char const* const Config::kCONFIG_FILE_NAME = "xrpld.cfg";
-char const* const Config::kCONFIG_LEGACY_NAME = "rippled.cfg";
-char const* const Config::kDATABASE_DIR_NAME = "db";
-char const* const Config::kVALIDATORS_FILE_NAME = "validators.txt";
+char const* const Config::kConfigFileName = "xrpld.cfg";
+char const* const Config::kConfigLegacyName = "rippled.cfg";
+char const* const Config::kDatabaseDirName = "db";
+char const* const Config::kValidatorsFileName = "validators.txt";
 
 [[nodiscard]] static std::string
 getEnvVar(char const* name)
@@ -284,7 +284,7 @@ Config::setupControl(bool bQuiet, bool bSilent, bool bStandalone)
     {
         // First, check against 'minimum' RAM requirements per node size:
         auto const& threshold =
-            kSIZED_ITEMS[std::underlying_type_t<SizedItem>(SizedItem::RamSizeGb)];
+            kSizedItems[std::underlying_type_t<SizedItem>(SizedItem::RamSizeGb)];
 
         auto ns = std::ranges::find_if(threshold.second, [this](std::size_t limit) {
             return (limit == 0) || (ramSize_ < limit);
@@ -322,7 +322,7 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
         CONFIG_FILE_ = strConf;
         CONFIG_DIR = boost::filesystem::absolute(CONFIG_FILE_);
         CONFIG_DIR.remove_filename();
-        dataDir = CONFIG_DIR / kDATABASE_DIR_NAME;
+        dataDir = CONFIG_DIR / kDatabaseDirName;
     }
     else
     {
@@ -332,11 +332,11 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
             // directory, in which case the databases will be stored in a
             // subdirectory.
             CONFIG_DIR = boost::filesystem::current_path();
-            dataDir = CONFIG_DIR / kDATABASE_DIR_NAME;
-            CONFIG_FILE_ = CONFIG_DIR / kCONFIG_FILE_NAME;
+            dataDir = CONFIG_DIR / kDatabaseDirName;
+            CONFIG_FILE_ = CONFIG_DIR / kConfigFileName;
             if (boost::filesystem::exists(CONFIG_FILE_))
                 break;
-            CONFIG_FILE_ = CONFIG_DIR / kCONFIG_LEGACY_NAME;
+            CONFIG_FILE_ = CONFIG_DIR / kConfigLegacyName;
             if (boost::filesystem::exists(CONFIG_FILE_))
                 break;
 
@@ -363,10 +363,10 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
                 // dir.
                 dataDir = strXdgDataHome + "/" + systemName();
                 CONFIG_DIR = strXdgConfigHome + "/" + systemName();
-                CONFIG_FILE_ = CONFIG_DIR / kCONFIG_FILE_NAME;
+                CONFIG_FILE_ = CONFIG_DIR / kConfigFileName;
                 if (boost::filesystem::exists(CONFIG_FILE_))
                     break;
-                CONFIG_FILE_ = CONFIG_DIR / kCONFIG_LEGACY_NAME;
+                CONFIG_FILE_ = CONFIG_DIR / kConfigLegacyName;
                 if (boost::filesystem::exists(CONFIG_FILE_))
                     break;
             }
@@ -374,10 +374,10 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
             // As a last resort, check the system config directory.
             dataDir = "/var/opt/" + systemName();
             CONFIG_DIR = "/etc/opt/" + systemName();
-            CONFIG_FILE_ = CONFIG_DIR / kCONFIG_FILE_NAME;
+            CONFIG_FILE_ = CONFIG_DIR / kConfigFileName;
             if (boost::filesystem::exists(CONFIG_FILE_))
                 break;
-            CONFIG_FILE_ = CONFIG_DIR / kCONFIG_LEGACY_NAME;
+            CONFIG_FILE_ = CONFIG_DIR / kConfigLegacyName;
         } while (false);
     }
 
@@ -845,7 +845,7 @@ Config::loadFromString(std::string const& fileContents)
     if (getSingleSection(secConfig, SECTION_MAX_TRANSACTIONS, strTemp, j_))
     {
         MAX_TRANSACTIONS =
-            std::clamp(beast::lexicalCastThrow<int>(strTemp), kMIN_JOB_QUEUE_TX, kMAX_JOB_QUEUE_TX);
+            std::clamp(beast::lexicalCastThrow<int>(strTemp), kMinJobQueueTx, kMaxJobQueueTx);
     }
 
     if (getSingleSection(secConfig, SECTION_SERVER_DOMAIN, strTemp, j_))
@@ -988,7 +988,7 @@ Config::loadFromString(std::string const& fileContents)
         }
         else if (!CONFIG_DIR.empty())
         {
-            validatorsFile = CONFIG_DIR / kVALIDATORS_FILE_NAME;
+            validatorsFile = CONFIG_DIR / kValidatorsFileName;
 
             if (!validatorsFile.empty())
             {
@@ -1173,9 +1173,9 @@ int
 Config::getValueFor(SizedItem item, std::optional<std::size_t> node) const
 {
     auto const index = static_cast<std::underlying_type_t<SizedItem>>(item);
-    XRPL_ASSERT(index < kSIZED_ITEMS.size(), "xrpl::Config::getValueFor : valid index input");
+    XRPL_ASSERT(index < kSizedItems.size(), "xrpl::Config::getValueFor : valid index input");
     XRPL_ASSERT(!node || *node <= 4, "xrpl::Config::getValueFor : unset or valid node");
-    return kSIZED_ITEMS.at(index).second.at(node.value_or(NODE_SIZE));
+    return kSizedItems.at(index).second.at(node.value_or(NODE_SIZE));
 }
 
 FeeSetup
@@ -1257,7 +1257,7 @@ setupDatabaseCon(Config const& c, std::optional<beast::Journal> j)
                 boost::iequals(journalMode, "wal"))
             {
                 result->emplace_back(
-                    boost::str(boost::format(kCOMMON_DB_PRAGMA_JOURNAL) % journalMode));
+                    boost::str(boost::format(kCommonDbPragmaJournal) % journalMode));
             }
             else
             {
@@ -1278,8 +1278,7 @@ setupDatabaseCon(Config const& c, std::optional<beast::Journal> j)
             if (higherRisk || boost::iequals(synchronous, "normal") ||
                 boost::iequals(synchronous, "full") || boost::iequals(synchronous, "extra"))
             {
-                result->emplace_back(
-                    boost::str(boost::format(kCOMMON_DB_PRAGMA_SYNC) % synchronous));
+                result->emplace_back(boost::str(boost::format(kCommonDbPragmaSync) % synchronous));
             }
             else
             {
@@ -1300,7 +1299,7 @@ setupDatabaseCon(Config const& c, std::optional<beast::Journal> j)
             if (higherRisk || boost::iequals(tempStore, "default") ||
                 boost::iequals(tempStore, "file"))
             {
-                result->emplace_back(boost::str(boost::format(kCOMMON_DB_PRAGMA_TEMP) % tempStore));
+                result->emplace_back(boost::str(boost::format(kCommonDbPragmaTemp) % tempStore));
             }
             else
             {
@@ -1308,7 +1307,7 @@ setupDatabaseCon(Config const& c, std::optional<beast::Journal> j)
             }
         }
 
-        if (showRiskWarning && j && c.LEDGER_HISTORY > kSQLITE_TUNING_CUTOFF)
+        if (showRiskWarning && j && c.LEDGER_HISTORY > kSqliteTuningCutoff)
         {
             JLOG(j->warn()) << "reducing the data integrity guarantees from the "
                                "default [sqlite] behavior is not recommended for "
diff --git a/src/xrpld/overlay/Compression.h b/src/xrpld/overlay/Compression.h
index 91417913e3..fb58bd128a 100644
--- a/src/xrpld/overlay/Compression.h
+++ b/src/xrpld/overlay/Compression.h
@@ -5,8 +5,8 @@
 
 namespace xrpl::compression {
 
-std::size_t constexpr kHEADER_BYTES = 6;
-std::size_t constexpr kHEADER_BYTES_COMPRESSED = 10;
+constexpr std::size_t kHeaderBytes = 6;
+constexpr std::size_t kHeaderBytesCompressed = 10;
 
 // All values other than 'none' must have the high bit. The low order four bits
 // must be 0.
diff --git a/src/xrpld/overlay/Message.h b/src/xrpld/overlay/Message.h
index 7c2701d443..30d4b01cda 100644
--- a/src/xrpld/overlay/Message.h
+++ b/src/xrpld/overlay/Message.h
@@ -11,7 +11,7 @@
 
 namespace xrpl {
 
-constexpr std::size_t kMAXIMUM_MESSAGE_SIZE = megabytes(64);
+constexpr std::size_t kMaximumMessageSize = megabytes(64);
 
 // VFALCO NOTE If we forward declare Message and write out shared_ptr
 //             instead of using the in-class type alias, we can remove the
diff --git a/src/xrpld/overlay/ReduceRelayCommon.h b/src/xrpld/overlay/ReduceRelayCommon.h
index 4105003315..2389c21f0e 100644
--- a/src/xrpld/overlay/ReduceRelayCommon.h
+++ b/src/xrpld/overlay/ReduceRelayCommon.h
@@ -13,27 +13,27 @@ namespace xrpl::reduce_relay {
 // where max_squelch is
 // min(max(MAX_UNSQUELCH_EXPIRE_DEFAULT, SQUELCH_PER_PEER * number_of_peers),
 //     MAX_UNSQUELCH_EXPIRE_PEERS)
-static constexpr auto kMIN_UNSQUELCH_EXPIRE = std::chrono::seconds{300};
-static constexpr auto kMAX_UNSQUELCH_EXPIRE_DEFAULT = std::chrono::seconds{600};
-static constexpr auto kSQUELCH_PER_PEER = std::chrono::seconds(10);
-static constexpr auto kMAX_UNSQUELCH_EXPIRE_PEERS = std::chrono::seconds{3600};
+static constexpr auto kMinUnsquelchExpire = std::chrono::seconds{300};
+static constexpr auto kMaxUnsquelchExpireDefault = std::chrono::seconds{600};
+static constexpr auto kSquelchPerPeer = std::chrono::seconds(10);
+static constexpr auto kMaxUnsquelchExpirePeers = std::chrono::seconds{3600};
 // No message received threshold before identifying a peer as idled
-static constexpr auto kIDLED = std::chrono::seconds{8};
+static constexpr auto kIdled = std::chrono::seconds{8};
 // Message count threshold to start selecting peers as the source
 // of messages from the validator. We add peers who reach
-// kMIN_MESSAGE_THRESHOLD to considered pool once kMAX_SELECTED_PEERS
-// reach kMAX_MESSAGE_THRESHOLD.
-static constexpr uint16_t kMIN_MESSAGE_THRESHOLD = 19;
-static constexpr uint16_t kMAX_MESSAGE_THRESHOLD = 20;
+// kMinMessageThreshold to considered pool once kMaxSelectedPeers
+// reach kMaxMessageThreshold.
+static constexpr uint16_t kMinMessageThreshold = 19;
+static constexpr uint16_t kMaxMessageThreshold = 20;
 // Max selected peers to choose as the source of messages from validator
-static constexpr uint16_t kMAX_SELECTED_PEERS = 5;
+static constexpr uint16_t kMaxSelectedPeers = 5;
 // Wait before reduce-relay feature is enabled on boot up to let
 // the server establish peer connections
-static constexpr auto kWAIT_ON_BOOTUP = std::chrono::minutes{10};
+static constexpr auto kWaitOnBootup = std::chrono::minutes{10};
 // Maximum size of the aggregated transaction hashes per peer.
 // Once we get to high tps throughput, this cap will prevent
 // TMTransactions from exceeding the current protocol message
 // size limit of 64MB.
-static constexpr std::size_t kMAX_TX_QUEUE_SIZE = 10000;
+static constexpr std::size_t kMaxTxQueueSize = 10000;
 
 }  // namespace xrpl::reduce_relay
diff --git a/src/xrpld/overlay/Slot.h b/src/xrpld/overlay/Slot.h
index 26be3946c1..12fecbbf42 100644
--- a/src/xrpld/overlay/Slot.h
+++ b/src/xrpld/overlay/Slot.h
@@ -104,10 +104,10 @@ private:
     /** Update peer info. If the message is from a new
      * peer or from a previously expired squelched peer then switch
      * the peer's and slot's state to Counting. If time of last
-     * selection round is > 2 * kMAX_UNSQUELCH_EXPIRE_DEFAULT then switch the
+     * selection round is > 2 * kMaxUnsquelchExpireDefault then switch the
      * slot's state to Counting. If the number of messages for the peer is >
-     * kMIN_MESSAGE_THRESHOLD then add peer to considered peers pool. If the
-     * number of considered peers who reached kMAX_MESSAGE_THRESHOLD is
+     * kMinMessageThreshold then add peer to considered peers pool. If the
+     * number of considered peers who reached kMaxMessageThreshold is
      * maxSelectedPeers_ then randomly select maxSelectedPeers_ from
      * considered peers, and call squelch handler for each peer, which is not
      * selected and not already in Squelched state. Set the state for those
@@ -181,9 +181,9 @@ private:
     void
     deleteIdlePeer(PublicKey const& validator);
 
-    /** Get random squelch duration between kMIN_UNSQUELCH_EXPIRE and
-     * min(max(kMAX_UNSQUELCH_EXPIRE_DEFAULT, kSQUELCH_PER_PEER * npeers),
-     *     kMAX_UNSQUELCH_EXPIRE_PEERS)
+    /** Get random squelch duration between kMinUnsquelchExpire and
+     * min(max(kMaxUnsquelchExpireDefault, kSquelchPerPeer * npeers),
+     *     kMaxUnsquelchExpirePeers)
      * @param npeers number of peers that can be squelched in the Slot
      */
     std::chrono::seconds
@@ -210,10 +210,10 @@ private:
     std::unordered_map<id_t, PeerInfo> peers_;  // peer's data
 
     // pool of peers considered as the source of messages
-    // from validator - peers that reached kMIN_MESSAGE_THRESHOLD
+    // from validator - peers that reached kMinMessageThreshold
     std::unordered_set<id_t> considered_;
 
-    // number of peers that reached kMAX_MESSAGE_THRESHOLD
+    // number of peers that reached kMaxMessageThreshold
     std::uint16_t reachedThreshold_{0};
 
     // last time peers were selected, used to age the slot
@@ -239,7 +239,7 @@ Slot<ClockType>::deleteIdlePeer(PublicKey const& validator)
         auto& peer = it->second;
         auto id = it->first;
         ++it;
-        if (now - peer.lastMessage > kIDLED)
+        if (now - peer.lastMessage > kIdled)
         {
             JLOG(journal_.trace())
                 << "deleteIdlePeer: " << Slice(validator) << " " << id << " idled "
@@ -297,12 +297,12 @@ Slot<ClockType>::update(
     if (state_ != SlotState::Counting || peer.state == PeerState::Squelched)
         return;
 
-    if (++peer.count > kMIN_MESSAGE_THRESHOLD)
+    if (++peer.count > kMinMessageThreshold)
         considered_.insert(id);
-    if (peer.count == (kMAX_MESSAGE_THRESHOLD + 1))
+    if (peer.count == (kMaxMessageThreshold + 1))
         ++reachedThreshold_;
 
-    if (now - lastSelected_ > 2 * kMAX_UNSQUELCH_EXPIRE_DEFAULT)
+    if (now - lastSelected_ > 2 * kMaxUnsquelchExpireDefault)
     {
         JLOG(journal_.trace()) << "update: resetting due to inactivity " << Slice(validator) << " "
                                << id << " " << duration_cast<seconds>(now - lastSelected_).count();
@@ -333,7 +333,7 @@ Slot<ClockType>::update(
                     << "update: peer not found " << Slice(validator) << " " << id;
                 continue;
             }
-            if (now - itPeers->second.lastMessage < kIDLED)
+            if (now - itPeers->second.lastMessage < kIdled)
                 selected.insert(id);
         }
 
@@ -389,13 +389,13 @@ std::chrono::seconds
 Slot<ClockType>::getSquelchDuration(std::size_t npeers)
 {
     using namespace std::chrono;
-    auto m = std::max(kMAX_UNSQUELCH_EXPIRE_DEFAULT, seconds{kSQUELCH_PER_PEER * npeers});
-    if (m > kMAX_UNSQUELCH_EXPIRE_PEERS)
+    auto m = std::max(kMaxUnsquelchExpireDefault, seconds{kSquelchPerPeer * npeers});
+    if (m > kMaxUnsquelchExpirePeers)
     {
-        m = kMAX_UNSQUELCH_EXPIRE_PEERS;
+        m = kMaxUnsquelchExpirePeers;
         JLOG(journal_.warn()) << "getSquelchDuration: unexpected squelch duration " << npeers;
     }
-    return seconds{xrpl::randInt(kMIN_UNSQUELCH_EXPIRE / 1s, m / 1s)};
+    return seconds{xrpl::randInt(kMinUnsquelchExpire / 1s, m / 1s)};
 }
 
 template <typename ClockType>
@@ -428,7 +428,7 @@ Slot<ClockType>::deletePeer(PublicKey const& validator, id_t id, bool erase)
         }
         else if (considered_.contains(id))
         {
-            if (it->second.count > kMAX_MESSAGE_THRESHOLD)
+            if (it->second.count > kMaxMessageThreshold)
                 --reachedThreshold_;
             considered_.erase(id);
         }
@@ -557,14 +557,14 @@ public:
         return baseSquelchEnabled_ && reduceRelayReady();
     }
 
-    /** Check if reduce_relay::kWAIT_ON_BOOTUP time passed since startup */
+    /** Check if reduce_relay::kWaitOnBootup time passed since startup */
     bool
     reduceRelayReady()
     {
         if (!reduceRelayReady_)
         {
             reduceRelayReady_ = reduce_relay::epoch<std::chrono::minutes>(ClockType::now()) >
-                reduce_relay::kWAIT_ON_BOOTUP;
+                reduce_relay::kWaitOnBootup;
         }
 
         return reduceRelayReady_;
@@ -708,7 +708,7 @@ template <typename ClockType>
 bool
 Slots<ClockType>::addPeerMessage(uint256 const& key, id_t id)
 {
-    beast::expire(peersWithMessage, reduce_relay::kIDLED);
+    beast::expire(peersWithMessage, reduce_relay::kIdled);
 
     if (key.isNonZero())
     {
@@ -782,7 +782,7 @@ Slots<ClockType>::deleteIdlePeers()
     for (auto it = slots_.begin(); it != slots_.end();)
     {
         it->second.deleteIdlePeer(it->first);
-        if (now - it->second.getLastSelected() > kMAX_UNSQUELCH_EXPIRE_DEFAULT)
+        if (now - it->second.getLastSelected() > kMaxUnsquelchExpireDefault)
         {
             JLOG(journal_.trace()) << "deleteIdlePeers: deleting idle slot " << Slice(it->first);
             it = slots_.erase(it);
diff --git a/src/xrpld/overlay/Squelch.h b/src/xrpld/overlay/Squelch.h
index 21a1b228a1..b509f293c2 100644
--- a/src/xrpld/overlay/Squelch.h
+++ b/src/xrpld/overlay/Squelch.h
@@ -56,7 +56,7 @@ Squelch<ClockType>::addSquelch(
     PublicKey const& validator,
     std::chrono::seconds const& squelchDuration)
 {
-    if (squelchDuration >= kMIN_UNSQUELCH_EXPIRE && squelchDuration <= kMAX_UNSQUELCH_EXPIRE_PEERS)
+    if (squelchDuration >= kMinUnsquelchExpire && squelchDuration <= kMaxUnsquelchExpirePeers)
     {
         squelched_[validator] = ClockType::now() + squelchDuration;
         return true;
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.cpp b/src/xrpld/overlay/detail/ConnectAttempt.cpp
index c83478ce1e..ad58cc0d2c 100644
--- a/src/xrpld/overlay/detail/ConnectAttempt.cpp
+++ b/src/xrpld/overlay/detail/ConnectAttempt.cpp
@@ -231,7 +231,7 @@ ConnectAttempt::setTimer(ConnectionStep step)
     {
         try
         {
-            timer_.expires_after(kCONNECT_TIMEOUT);
+            timer_.expires_after(kConnectTimeout);
             timer_.async_wait(
                 boost::asio::bind_executor(
                     strand_,
@@ -253,19 +253,19 @@ ConnectAttempt::setTimer(ConnectionStep step)
         switch (step)
         {
             case ConnectionStep::TcpConnect:
-                stepTimeout = StepTimeouts::kTCP_CONNECT;
+                stepTimeout = StepTimeouts::kTcpConnect;
                 break;
             case ConnectionStep::TlsHandshake:
-                stepTimeout = StepTimeouts::kTLS_HANDSHAKE;
+                stepTimeout = StepTimeouts::kTlsHandshake;
                 break;
             case ConnectionStep::HttpWrite:
-                stepTimeout = StepTimeouts::kHTTP_WRITE;
+                stepTimeout = StepTimeouts::kHttpWrite;
                 break;
             case ConnectionStep::HttpRead:
-                stepTimeout = StepTimeouts::kHTTP_READ;
+                stepTimeout = StepTimeouts::kHttpRead;
                 break;
             case ConnectionStep::ShutdownStarted:
-                stepTimeout = StepTimeouts::kTLS_SHUTDOWN;
+                stepTimeout = StepTimeouts::kTlsShutdown;
                 break;
             case ConnectionStep::Complete:
             case ConnectionStep::Init:
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.h b/src/xrpld/overlay/detail/ConnectAttempt.h
index 70ce7912ba..949e6accbf 100644
--- a/src/xrpld/overlay/detail/ConnectAttempt.h
+++ b/src/xrpld/overlay/detail/ConnectAttempt.h
@@ -69,7 +69,7 @@ private:
     };
 
     // A timeout for connection process, greater than all step timeouts
-    static constexpr std::chrono::seconds kCONNECT_TIMEOUT{25};
+    static constexpr std::chrono::seconds kConnectTimeout{25};
 
     /**
      * @struct StepTimeouts
@@ -81,15 +81,15 @@ private:
     struct StepTimeouts
     {
         // TCP connection timeout
-        static constexpr std::chrono::seconds kTCP_CONNECT{8};
+        static constexpr std::chrono::seconds kTcpConnect{8};
         // SSL handshake timeout
-        static constexpr std::chrono::seconds kTLS_HANDSHAKE{8};
+        static constexpr std::chrono::seconds kTlsHandshake{8};
         // HTTP write timeout
-        static constexpr std::chrono::seconds kHTTP_WRITE{3};
+        static constexpr std::chrono::seconds kHttpWrite{3};
         // HTTP read timeout
-        static constexpr std::chrono::seconds kHTTP_READ{3};
+        static constexpr std::chrono::seconds kHttpRead{3};
         // SSL shutdown timeout
-        static constexpr std::chrono::seconds kTLS_SHUTDOWN{2};
+        static constexpr std::chrono::seconds kTlsShutdown{2};
     };
 
     // Core application and networking components
diff --git a/src/xrpld/overlay/detail/Handshake.cpp b/src/xrpld/overlay/detail/Handshake.cpp
index b32d5280e2..3465dbb816 100644
--- a/src/xrpld/overlay/detail/Handshake.cpp
+++ b/src/xrpld/overlay/detail/Handshake.cpp
@@ -88,13 +88,13 @@ makeFeaturesRequestHeader(
 {
     std::stringstream str;
     if (comprEnabled)
-        str << kFEATURE_COMPR << "=lz4" << kDELIM_FEATURE;
+        str << kFeatureCompr << "=lz4" << kDelimFeature;
     if (ledgerReplayEnabled)
-        str << kFEATURE_LEDGER_REPLAY << "=1" << kDELIM_FEATURE;
+        str << kFeatureLedgerReplay << "=1" << kDelimFeature;
     if (txReduceRelayEnabled)
-        str << kFEATURE_TXRR << "=1" << kDELIM_FEATURE;
+        str << kFeatureTxrr << "=1" << kDelimFeature;
     if (vpReduceRelayEnabled)
-        str << kFEATURE_VPRR << "=1" << kDELIM_FEATURE;
+        str << kFeatureVprr << "=1" << kDelimFeature;
     return str.str();
 }
 
@@ -107,14 +107,14 @@ makeFeaturesResponseHeader(
     bool vpReduceRelayEnabled)
 {
     std::stringstream str;
-    if (comprEnabled && isFeatureValue(headers, kFEATURE_COMPR, "lz4"))
-        str << kFEATURE_COMPR << "=lz4" << kDELIM_FEATURE;
-    if (ledgerReplayEnabled && featureEnabled(headers, kFEATURE_LEDGER_REPLAY))
-        str << kFEATURE_LEDGER_REPLAY << "=1" << kDELIM_FEATURE;
-    if (txReduceRelayEnabled && featureEnabled(headers, kFEATURE_TXRR))
-        str << kFEATURE_TXRR << "=1" << kDELIM_FEATURE;
-    if (vpReduceRelayEnabled && featureEnabled(headers, kFEATURE_VPRR))
-        str << kFEATURE_VPRR << "=1" << kDELIM_FEATURE;
+    if (comprEnabled && isFeatureValue(headers, kFeatureCompr, "lz4"))
+        str << kFeatureCompr << "=lz4" << kDelimFeature;
+    if (ledgerReplayEnabled && featureEnabled(headers, kFeatureLedgerReplay))
+        str << kFeatureLedgerReplay << "=1" << kDelimFeature;
+    if (txReduceRelayEnabled && featureEnabled(headers, kFeatureTxrr))
+        str << kFeatureTxrr << "=1" << kDelimFeature;
+    if (vpReduceRelayEnabled && featureEnabled(headers, kFeatureVprr))
+        str << kFeatureVprr << "=1" << kDelimFeature;
     return str.str();
 }
 
@@ -135,12 +135,12 @@ makeFeaturesResponseHeader(
 static std::optional<BaseUInt<512>>
 hashLastMessage(SSL const* ssl, size_t (*get)(const SSL*, void*, size_t))
 {
-    constexpr std::size_t kSSL_MINIMUM_FINISHED_LENGTH = 12;
+    static constexpr std::size_t kSslMinimumFinishedLength = 12;
 
     unsigned char buf[1024];
     size_t const len = get(ssl, buf, sizeof(buf));
 
-    if (len < kSSL_MINIMUM_FINISHED_LENGTH)
+    if (len < kSslMinimumFinishedLength)
         return std::nullopt;
 
     sha512_hasher const h;
@@ -171,7 +171,7 @@ makeSharedValue(stream_type& ssl, beast::Journal journal)
 
     // Both messages hash to the same value and the cookie
     // is 0. Don't allow this.
-    if (result == beast::kZERO)
+    if (result == beast::kZero)
     {
         JLOG(journal.error()) << "Cookie generation: identical finished messages";
         return std::nullopt;
diff --git a/src/xrpld/overlay/detail/Handshake.h b/src/xrpld/overlay/detail/Handshake.h
index 77a346477f..3cbaa118da 100644
--- a/src/xrpld/overlay/detail/Handshake.h
+++ b/src/xrpld/overlay/detail/Handshake.h
@@ -115,15 +115,15 @@ makeResponse(
 // value: \S+
 
 // compression feature
-static constexpr char kFEATURE_COMPR[] = "compr";
+static constexpr char kFeatureCompr[] = "compr";
 // validation/proposal reduce-relay base squelch feature
-static constexpr char kFEATURE_VPRR[] = "vprr";
+static constexpr char kFeatureVprr[] = "vprr";
 // transaction reduce-relay feature
-static constexpr char kFEATURE_TXRR[] = "txrr";
+static constexpr char kFeatureTxrr[] = "txrr";
 // ledger replay
-static constexpr char kFEATURE_LEDGER_REPLAY[] = "ledgerreplay";
-static constexpr char kDELIM_FEATURE[] = ";";
-static constexpr char kDELIM_VALUE[] = ",";
+static constexpr char kFeatureLedgerReplay[] = "ledgerreplay";
+static constexpr char kDelimFeature[] = ";";
+static constexpr char kDelimValue[] = ",";
 
 /** Get feature's header value
    @param headers request/response header
diff --git a/src/xrpld/overlay/detail/Message.cpp b/src/xrpld/overlay/detail/Message.cpp
index 30f4c281ed..68629ce9a4 100644
--- a/src/xrpld/overlay/detail/Message.cpp
+++ b/src/xrpld/overlay/detail/Message.cpp
@@ -31,12 +31,12 @@ Message::Message(
 
     XRPL_ASSERT(messageBytes, "xrpl::Message::Message : non-empty message input");
 
-    buffer_.resize(kHEADER_BYTES + messageBytes);
+    buffer_.resize(kHeaderBytes + messageBytes);
 
     setHeader(buffer_.data(), messageBytes, type, Algorithm::None, 0);
 
     if (messageBytes != 0)
-        message.SerializeToArray(buffer_.data() + kHEADER_BYTES, messageBytes);
+        message.SerializeToArray(buffer_.data() + kHeaderBytes, messageBytes);
 
     XRPL_ASSERT(
         getBufferSize() == totalSize(message),
@@ -58,14 +58,14 @@ Message::messageSize(::google::protobuf::Message const& message)
 std::size_t
 Message::totalSize(::google::protobuf::Message const& message)
 {
-    return messageSize(message) + compression::kHEADER_BYTES;
+    return messageSize(message) + compression::kHeaderBytes;
 }
 
 void
 Message::compress()
 {
     using namespace xrpl::compression;
-    auto const messageBytes = buffer_.size() - kHEADER_BYTES;
+    auto const messageBytes = buffer_.size() - kHeaderBytes;
 
     auto type = getType(buffer_.data());
 
@@ -104,19 +104,19 @@ Message::compress()
 
     if (compressible)
     {
-        auto payload = static_cast<void const*>(buffer_.data() + kHEADER_BYTES);
+        auto payload = static_cast<void const*>(buffer_.data() + kHeaderBytes);
 
         auto compressedSize = xrpl::compression::compress(
             payload,
             messageBytes,
             [&](std::size_t inSize) {  // size of required compressed buffer
-                bufferCompressed_.resize(inSize + kHEADER_BYTES_COMPRESSED);
-                return (bufferCompressed_.data() + kHEADER_BYTES_COMPRESSED);
+                bufferCompressed_.resize(inSize + kHeaderBytesCompressed);
+                return (bufferCompressed_.data() + kHeaderBytesCompressed);
             });
 
-        if (compressedSize < (messageBytes - (kHEADER_BYTES_COMPRESSED - kHEADER_BYTES)))
+        if (compressedSize < (messageBytes - (kHeaderBytesCompressed - kHeaderBytes)))
         {
-            bufferCompressed_.resize(kHEADER_BYTES_COMPRESSED + compressedSize);
+            bufferCompressed_.resize(kHeaderBytesCompressed + compressedSize);
             // NOLINTNEXTLINE(readability-suspicious-call-argument)
             setHeader(bufferCompressed_.data(), compressedSize, type, Algorithm::LZ4, messageBytes);
         }
diff --git a/src/xrpld/overlay/detail/OverlayImpl.cpp b/src/xrpld/overlay/detail/OverlayImpl.cpp
index 770df6e43a..a39002bd51 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.cpp
+++ b/src/xrpld/overlay/detail/OverlayImpl.cpp
@@ -92,10 +92,10 @@
 namespace xrpl {
 
 namespace CrawlOptions {
-static constexpr auto kDISABLED = 0;
-static constexpr auto kOVERLAY = (1 << 0);
-static constexpr auto kSERVER_INFO = (1 << 1);
-static constexpr auto kSERVER_COUNTS = (1 << 2);
+static constexpr auto kDisabled = 0;
+static constexpr auto kOverlay = (1 << 0);
+static constexpr auto kServerInfo = (1 << 1);
+static constexpr auto kServerCounts = (1 << 2);
 static constexpr auto kUNL = (1 << 3);
 }  // namespace CrawlOptions
 
@@ -153,7 +153,7 @@ OverlayImpl::Timer::onTimer(error_code ec)
     if (overlay_.app_.config().TX_REDUCE_RELAY_ENABLE)
         overlay_.sendTxQueue();
 
-    if ((++overlay_.timer_count_ % Tuning::kCHECK_IDLE_PEERS) == 0)
+    if ((++overlay_.timer_count_ % Tuning::kCheckIdlePeers) == 0)
         overlay_.deleteIdlePeers();
 
     asyncWait();
@@ -544,7 +544,7 @@ OverlayImpl::start()
             {
                 if (addr.port() == 0)
                 {
-                    ips.push_back(to_string(addr.atPort(kDEFAULT_PEER_PORT)));
+                    ips.push_back(to_string(addr.atPort(kDefaultPeerPort)));
                 }
                 else
                 {
@@ -570,7 +570,7 @@ OverlayImpl::start()
                 {
                     if (addr.port() == 0)
                     {
-                        ips.emplace_back(addr.address(), kDEFAULT_PEER_PORT);
+                        ips.emplace_back(addr.address(), kDefaultPeerPort);
                     }
                     else
                     {
@@ -862,7 +862,7 @@ OverlayImpl::json()
 bool
 OverlayImpl::processCrawl(http_request_type const& req, Handoff& handoff)
 {
-    if (req.target() != "/crawl" || setup_.crawlOptions == CrawlOptions::kDISABLED)
+    if (req.target() != "/crawl" || setup_.crawlOptions == CrawlOptions::kDisabled)
         return false;
 
     boost::beast::http::response<JsonBody> msg;
@@ -873,15 +873,15 @@ OverlayImpl::processCrawl(http_request_type const& req, Handoff& handoff)
     msg.insert("Connection", "close");
     msg.body()["version"] = json::Value(2u);
 
-    if ((setup_.crawlOptions & CrawlOptions::kOVERLAY) != 0u)
+    if ((setup_.crawlOptions & CrawlOptions::kOverlay) != 0u)
     {
         msg.body()["overlay"] = getOverlayInfo();
     }
-    if ((setup_.crawlOptions & CrawlOptions::kSERVER_INFO) != 0u)
+    if ((setup_.crawlOptions & CrawlOptions::kServerInfo) != 0u)
     {
         msg.body()["server"] = getServerInfo();
     }
-    if ((setup_.crawlOptions & CrawlOptions::kSERVER_COUNTS) != 0u)
+    if ((setup_.crawlOptions & CrawlOptions::kServerCounts) != 0u)
     {
         msg.body()["counts"] = getServerCounts();
     }
@@ -900,9 +900,9 @@ OverlayImpl::processValidatorList(http_request_type const& req, Handoff& handoff
 {
     // If the target is in the form "/vl/<validator_list_public_key>",
     // return the most recent validator list for that key.
-    constexpr std::string_view kPREFIX("/vl/");
+    constexpr std::string_view kPrefix("/vl/");
 
-    if (!req.target().starts_with(kPREFIX) || !setup_.vlEnabled)
+    if (!req.target().starts_with(kPrefix) || !setup_.vlEnabled)
         return false;
 
     std::uint32_t version = 1;
@@ -924,7 +924,7 @@ OverlayImpl::processValidatorList(http_request_type const& req, Handoff& handoff
         return true;
     };
 
-    std::string_view key = req.target().substr(kPREFIX.size());
+    std::string_view key = req.target().substr(kPrefix.size());
 
     if (auto slash = key.find('/'); slash != std::string_view::npos)
     {
@@ -1571,15 +1571,15 @@ setupOverlay(BasicConfig const& config, beast::Journal j)
         {
             if (get<bool>(section, "overlay", true))
             {
-                setup.crawlOptions |= CrawlOptions::kOVERLAY;
+                setup.crawlOptions |= CrawlOptions::kOverlay;
             }
             if (get<bool>(section, "server", true))
             {
-                setup.crawlOptions |= CrawlOptions::kSERVER_INFO;
+                setup.crawlOptions |= CrawlOptions::kServerInfo;
             }
             if (get<bool>(section, "counts", false))
             {
-                setup.crawlOptions |= CrawlOptions::kSERVER_COUNTS;
+                setup.crawlOptions |= CrawlOptions::kServerCounts;
             }
             if (get<bool>(section, "unl", true))
             {
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 7d1dd27528..070f91c0bf 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -105,13 +105,13 @@ namespace xrpl {
 
 namespace {
 /** The threshold above which we treat a peer connection as high latency */
-std::chrono::milliseconds constexpr kPEER_HIGH_LATENCY{300};
+constexpr std::chrono::milliseconds kPeerHighLatency{300};
 
 /** How often we PING the peer to check for latency and sendq probe */
-std::chrono::seconds constexpr kPEER_TIMER_INTERVAL{60};
+constexpr std::chrono::seconds kPeerTimerInterval{60};
 
 /** The timeout for a shutdown timer */
-std::chrono::seconds constexpr kSHUTDOWN_TIMER_INTERVAL{5};
+constexpr std::chrono::seconds kShutdownTimerInterval{5};
 
 }  // namespace
 
@@ -153,25 +153,25 @@ PeerImp::PeerImp(
     , creationTime_(clock_type::now())
     , squelch_(app_.getJournal("Squelch"))
     , usage_(consumer)
-    , fee_{.fee = Resource::kFEE_TRIVIAL_PEER, .context = ""}
+    , fee_{.fee = Resource::kFeeTrivialPeer, .context = ""}
     , slot_(slot)
     , request_(std::move(request))
     , headers_(request_)
     , compressionEnabled_(
-          peerFeatureEnabled(headers_, kFEATURE_COMPR, "lz4", app_.config().COMPRESSION)
+          peerFeatureEnabled(headers_, kFeatureCompr, "lz4", app_.config().COMPRESSION)
               ? Compressed::On
               : Compressed::Off)
     , txReduceRelayEnabled_(
-          peerFeatureEnabled(headers_, kFEATURE_TXRR, app_.config().TX_REDUCE_RELAY_ENABLE))
+          peerFeatureEnabled(headers_, kFeatureTxrr, app_.config().TX_REDUCE_RELAY_ENABLE))
     , ledgerReplayEnabled_(
-          peerFeatureEnabled(headers_, kFEATURE_LEDGER_REPLAY, app_.config().LEDGER_REPLAY))
+          peerFeatureEnabled(headers_, kFeatureLedgerReplay, app_.config().LEDGER_REPLAY))
     , ledgerReplayMsgHandler_(app, app.getLedgerReplayer())
 {
     JLOG(journal_.info()) << "compression enabled " << (compressionEnabled_ == Compressed::On)
                           << " vp reduce-relay base squelch enabled "
                           << peerFeatureEnabled(
                                  headers_,
-                                 kFEATURE_VPRR,
+                                 kFeatureVprr,
                                  app_.config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE)
                           << " tx reduce-relay enabled " << txReduceRelayEnabled_;
 }
@@ -322,14 +322,14 @@ PeerImp::send(std::shared_ptr<Message> const& m)
 
     auto sendqSize = sendQueue_.size();
 
-    if (sendqSize < Tuning::kTARGET_SEND_QUEUE)
+    if (sendqSize < Tuning::kTargetSendQueue)
     {
         // To detect a peer that does not read from their
         // side of the connection, we expect a peer to have
         // a small senq periodically
         largeSendq_ = 0;
     }
-    else if (auto sink = journal_.debug(); sink && (sendqSize % Tuning::kSEND_QUEUE_LOG_FREQ) == 0)
+    else if (auto sink = journal_.debug(); sink && (sendqSize % Tuning::kSendQueueLogFreq) == 0)
     {
         std::string const n = name();
         sink << n << " sendq: " << sendqSize;
@@ -382,7 +382,7 @@ PeerImp::addTxQueue(uint256 const& hash)
         return;
     }
 
-    if (txQueue_.size() == reduce_relay::kMAX_TX_QUEUE_SIZE)
+    if (txQueue_.size() == reduce_relay::kMaxTxQueueSize)
     {
         JLOG(pJournal_.warn()) << "addTxQueue exceeds the cap";
         sendTxQueue();
@@ -515,7 +515,7 @@ PeerImp::json()
         lastStatus = lastStatus_;
     }
 
-    if (closedLedgerHash != beast::kZERO)
+    if (closedLedgerHash != beast::kZero)
         ret[jss::ledger] = to_string(closedLedgerHash);
 
     if (lastStatus.has_newstatus())
@@ -675,7 +675,7 @@ PeerImp::tryAsyncShutdown()
 
     shutdownStarted_ = true;
 
-    setTimer(kSHUTDOWN_TIMER_INTERVAL);
+    setTimer(kShutdownTimerInterval);
 
     // gracefully shutdown the SSL socket, performing a shutdown handshake
     stream_.async_shutdown(bind_executor(
@@ -802,7 +802,7 @@ PeerImp::onTimer(error_code const& ec)
         return;
     }
 
-    if (largeSendq_++ >= Tuning::kSENDQ_INTERVALS)
+    if (largeSendq_++ >= Tuning::kSendqIntervals)
     {
         fail("Large send queue");
         return;
@@ -842,7 +842,7 @@ PeerImp::onTimer(error_code const& ec)
 
     send(std::make_shared<Message>(message, protocol::mtPING));
 
-    setTimer(kPEER_TIMER_INTERVAL);
+    setTimer(kPeerTimerInterval);
 }
 
 void
@@ -1001,7 +1001,7 @@ PeerImp::doProtocolStart()
     if (auto m = overlay_.getManifestsMessage())
         send(m);
 
-    setTimer(kPEER_TIMER_INTERVAL);
+    setTimer(kPeerTimerInterval);
 }
 
 // Called repeatedly with protocol message data
@@ -1051,7 +1051,7 @@ PeerImp::onReadMessage(error_code ec, std::size_t bytesTransferred)
 
     readBuffer_.commit(bytesTransferred);
 
-    auto hint = Tuning::kREAD_BUFFER_BYTES;
+    auto hint = Tuning::kReadBufferBytes;
 
     while (readBuffer_.size() > 0)
     {
@@ -1094,7 +1094,7 @@ PeerImp::onReadMessage(error_code ec, std::size_t bytesTransferred)
 
     // Timeout on writes only
     stream_.async_read_some(
-        readBuffer_.prepare(std::max(Tuning::kREAD_BUFFER_BYTES, hint)),
+        readBuffer_.prepare(std::max(Tuning::kReadBufferBytes, hint)),
         bind_executor(
             strand_,
             std::bind(
@@ -1186,7 +1186,7 @@ PeerImp::onMessageBegin(
 {
     auto const name = protocolMessageName(type);
     loadEvent_ = app_.getJobQueue().makeLoadEvent(JtPeer, name);
-    fee_ = {.fee = Resource::kFEE_TRIVIAL_PEER, .context = name};
+    fee_ = {.fee = Resource::kFeeTrivialPeer, .context = name};
 
     auto const category =
         TrafficCount::categorize(*m, static_cast<protocol::MessageType>(type), true);
@@ -1230,12 +1230,12 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMManifests> const& m)
 
     if (s == 0)
     {
-        fee_.update(Resource::kFEE_USELESS_DATA, "empty");
+        fee_.update(Resource::kFeeUselessData, "empty");
         return;
     }
 
     if (s > 100)
-        fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, "oversize");
+        fee_.update(Resource::kFeeModerateBurdenPeer, "oversize");
 
     app_.getJobQueue().addJob(JtManifest, "RcvManifests", [this, that = shared_from_this(), m]() {
         overlay_.onManifests(m, that);
@@ -1248,7 +1248,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMPing> const& m)
     if (m->type() == protocol::TMPing::ptPING)
     {
         // We have received a ping request, reply with a pong
-        fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, "ping request");
+        fee_.update(Resource::kFeeModerateBurdenPeer, "ping request");
         m->set_type(protocol::TMPing::ptPONG);
         send(std::make_shared<Message>(*m, protocol::mtPING));
         return;
@@ -1289,7 +1289,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMCluster> const& m)
     // VFALCO NOTE I think we should drop the peer immediately
     if (!cluster())
     {
-        fee_.update(Resource::kFEE_USELESS_DATA, "unknown cluster");
+        fee_.update(Resource::kFeeUselessData, "unknown cluster");
         return;
     }
 
@@ -1364,7 +1364,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMEndpoints> const& m)
     // implication for the protocol.
     if (m->endpoints_v2().size() >= 1024)
     {
-        fee_.update(Resource::kFEE_USELESS_DATA, "endpoints too large");
+        fee_.update(Resource::kFeeUselessData, "endpoints too large");
         return;
     }
 
@@ -1401,7 +1401,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMEndpoints> const& m)
     if (malformed > 0)
     {
         fee_.update(
-            Resource::kFEE_INVALID_DATA * malformed,
+            Resource::kFeeInvalidData * malformed,
             std::to_string(malformed) + " malformed endpoints");
     }
 
@@ -1462,20 +1462,20 @@ PeerImp::handleTransaction(
         {
             JLOG(pJournal_.warn()) << "Ignoring Network relayed Tx containing "
                                       "tfInnerBatchTxn (handleTransaction).";
-            fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, "inner batch txn");
+            fee_.update(Resource::kFeeModerateBurdenPeer, "inner batch txn");
             return;
         }
         // LCOV_EXCL_STOP
 
         HashRouterFlags flags = HashRouterFlags::UNDEFINED;
-        constexpr std::chrono::seconds kTX_INTERVAL = 10s;
+        static constexpr std::chrono::seconds kTxInterval = 10s;
 
-        if (!app_.getHashRouter().shouldProcess(txID, id_, flags, kTX_INTERVAL))
+        if (!app_.getHashRouter().shouldProcess(txID, id_, flags, kTxInterval))
         {
             // we have seen this transaction recently
             if (any(flags & HashRouterFlags::BAD))
             {
-                fee_.update(Resource::kFEE_USELESS_DATA, "known bad");
+                fee_.update(Resource::kFeeUselessData, "known bad");
                 JLOG(pJournal_.debug()) << "Ignoring known bad tx " << txID;
             }
 
@@ -1549,7 +1549,7 @@ void
 PeerImp::onMessage(std::shared_ptr<protocol::TMGetLedger> const& m)
 {
     auto badData = [&](std::string const& msg) {
-        fee_.update(Resource::kFEE_INVALID_DATA, "get_ledger " + msg);
+        fee_.update(Resource::kFeeInvalidData, "get_ledger " + msg);
         JLOG(pJournal_.warn()) << "TMGetLedger: " << msg;
     };
     auto const itype{m->itype()};
@@ -1640,7 +1640,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetLedger> const& m)
     // Verify query depth
     if (m->has_querydepth())
     {
-        if (m->querydepth() > Tuning::kMAX_QUERY_DEPTH || itype == protocol::liBASE)
+        if (m->querydepth() > Tuning::kMaxQueryDepth || itype == protocol::liBASE)
         {
             badData("Invalid query depth");
             return;
@@ -1661,11 +1661,11 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProofPathRequest> const& m)
     JLOG(pJournal_.trace()) << "onMessage, TMProofPathRequest";
     if (!ledgerReplayEnabled_)
     {
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "proof_path_request disabled");
+        fee_.update(Resource::kFeeMalformedRequest, "proof_path_request disabled");
         return;
     }
 
-    fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, "received a proof path request");
+    fee_.update(Resource::kFeeModerateBurdenPeer, "received a proof path request");
     std::weak_ptr<PeerImp> const weak = shared_from_this();
     app_.getJobQueue().addJob(JtReplayReq, "RcvProofPReq", [weak, m]() {
         if (auto peer = weak.lock())
@@ -1675,11 +1675,11 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProofPathRequest> const& m)
             {
                 if (reply.error() == protocol::TMReplyError::reBAD_REQUEST)
                 {
-                    peer->charge(Resource::kFEE_MALFORMED_REQUEST, "proof_path_request");
+                    peer->charge(Resource::kFeeMalformedRequest, "proof_path_request");
                 }
                 else
                 {
-                    peer->charge(Resource::kFEE_REQUEST_NO_REPLY, "proof_path_request");
+                    peer->charge(Resource::kFeeRequestNoReply, "proof_path_request");
                 }
             }
             else
@@ -1695,13 +1695,13 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProofPathResponse> const& m)
 {
     if (!ledgerReplayEnabled_)
     {
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "proof_path_response disabled");
+        fee_.update(Resource::kFeeMalformedRequest, "proof_path_response disabled");
         return;
     }
 
     if (!ledgerReplayMsgHandler_.processProofPathResponse(m))
     {
-        fee_.update(Resource::kFEE_INVALID_DATA, "proof_path_response");
+        fee_.update(Resource::kFeeInvalidData, "proof_path_response");
     }
 }
 
@@ -1711,11 +1711,11 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMReplayDeltaRequest> const& m)
     JLOG(pJournal_.trace()) << "onMessage, TMReplayDeltaRequest";
     if (!ledgerReplayEnabled_)
     {
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "replay_delta_request disabled");
+        fee_.update(Resource::kFeeMalformedRequest, "replay_delta_request disabled");
         return;
     }
 
-    fee_.fee = Resource::kFEE_MODERATE_BURDEN_PEER;
+    fee_.fee = Resource::kFeeModerateBurdenPeer;
     std::weak_ptr<PeerImp> const weak = shared_from_this();
     app_.getJobQueue().addJob(JtReplayReq, "RcvReplDReq", [weak, m]() {
         if (auto peer = weak.lock())
@@ -1725,11 +1725,11 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMReplayDeltaRequest> const& m)
             {
                 if (reply.error() == protocol::TMReplyError::reBAD_REQUEST)
                 {
-                    peer->charge(Resource::kFEE_MALFORMED_REQUEST, "replay_delta_request");
+                    peer->charge(Resource::kFeeMalformedRequest, "replay_delta_request");
                 }
                 else
                 {
-                    peer->charge(Resource::kFEE_REQUEST_NO_REPLY, "replay_delta_request");
+                    peer->charge(Resource::kFeeRequestNoReply, "replay_delta_request");
                 }
             }
             else
@@ -1745,13 +1745,13 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMReplayDeltaResponse> const& m)
 {
     if (!ledgerReplayEnabled_)
     {
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "replay_delta_response disabled");
+        fee_.update(Resource::kFeeMalformedRequest, "replay_delta_response disabled");
         return;
     }
 
     if (!ledgerReplayMsgHandler_.processReplayDeltaResponse(m))
     {
-        fee_.update(Resource::kFEE_INVALID_DATA, "replay_delta_response");
+        fee_.update(Resource::kFeeInvalidData, "replay_delta_response");
     }
 }
 
@@ -1759,7 +1759,7 @@ void
 PeerImp::onMessage(std::shared_ptr<protocol::TMLedgerData> const& m)
 {
     auto badData = [&](std::string const& msg) {
-        fee_.update(Resource::kFEE_INVALID_DATA, msg);
+        fee_.update(Resource::kFeeInvalidData, msg);
         JLOG(pJournal_.warn()) << "TMLedgerData: " << msg;
     };
 
@@ -1810,7 +1810,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMLedgerData> const& m)
     }
 
     // Verify ledger nodes.
-    if (m->nodes_size() <= 0 || m->nodes_size() > Tuning::kHARD_MAX_REPLY_NODES)
+    if (m->nodes_size() <= 0 || m->nodes_size() > Tuning::kHardMaxReplyNodes)
     {
         badData("Invalid Ledger/TXset nodes " + std::to_string(m->nodes_size()));
         return;
@@ -1863,14 +1863,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProposeSet> const& m)
         (publicKeyType(makeSlice(set.nodepubkey())) != KeyType::Secp256k1))
     {
         JLOG(pJournal_.warn()) << "Proposal: malformed";
-        fee_.update(Resource::kFEE_INVALID_SIGNATURE, " signature can't be longer than 72 bytes");
+        fee_.update(Resource::kFeeInvalidSignature, " signature can't be longer than 72 bytes");
         return;
     }
 
     if (!stringIsUInt256Sized(set.currenttxhash()) || !stringIsUInt256Sized(set.previousledger()))
     {
         JLOG(pJournal_.warn()) << "Proposal: malformed";
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "bad hashes");
+        fee_.update(Resource::kFeeMalformedRequest, "bad hashes");
         return;
     }
 
@@ -1906,7 +1906,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProposeSet> const& m)
     {
         // Count unique messages (Slots has it's own 'HashRouter'), which a peer
         // receives within IDLED seconds since the message has been relayed.
-        if (relayed && (stopwatch().now() - *relayed) < reduce_relay::kIDLED)
+        if (relayed && (stopwatch().now() - *relayed) < reduce_relay::kIdled)
             overlay_.updateSlotAndSquelch(suppression, publicKey, id_, protocol::mtPROPOSE_LEDGER);
 
         // report duplicate proposal messages
@@ -2152,13 +2152,13 @@ PeerImp::checkTracking(std::uint32_t seq1, std::uint32_t seq2)
 {
     int const diff = std::max(seq1, seq2) - std::min(seq1, seq2);
 
-    if (diff < Tuning::kCONVERGED_LEDGER_LIMIT)
+    if (diff < Tuning::kConvergedLedgerLimit)
     {
         // The peer's ledger sequence is close to the validation's
         tracking_ = Tracking::Converged;
     }
 
-    if ((diff > Tuning::kDIVERGED_LEDGER_LIMIT) && (tracking_.load() != Tracking::Diverged))
+    if ((diff > Tuning::kDivergedLedgerLimit) && (tracking_.load() != Tracking::Diverged))
     {
         // The peer's ledger sequence is way off the validation's
         std::scoped_lock const sl(recentLock_);
@@ -2173,7 +2173,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMHaveTransactionSet> const& m)
 {
     if (!stringIsUInt256Sized(m->hash()))
     {
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "bad hash");
+        fee_.update(Resource::kFeeMalformedRequest, "bad hash");
         return;
     }
 
@@ -2185,7 +2185,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMHaveTransactionSet> const& m)
 
         if (std::ranges::find(recentTxSets_, hash) != recentTxSets_.end())
         {
-            fee_.update(Resource::kFEE_USELESS_DATA, "duplicate (tsHAVE)");
+            fee_.update(Resource::kFeeUselessData, "duplicate (tsHAVE)");
             return;
         }
 
@@ -2206,7 +2206,7 @@ PeerImp::onValidatorListMessage(
     {
         JLOG(pJournal_.warn()) << "Ignored malformed " << messageType;
         // This shouldn't ever happen with a well-behaved peer
-        fee_.update(Resource::kFEE_HEAVY_BURDEN_PEER, "no blobs");
+        fee_.update(Resource::kFeeHeavyBurdenPeer, "no blobs");
         return;
     }
 
@@ -2220,7 +2220,7 @@ PeerImp::onValidatorListMessage(
         // Charging this fee here won't hurt the peer in the normal
         // course of operation (ie. refresh every 5 minutes), but
         // will add up if the peer is misbehaving.
-        fee_.update(Resource::kFEE_USELESS_DATA, "duplicate");
+        fee_.update(Resource::kFeeUselessData, "duplicate");
         return;
     }
 
@@ -2310,28 +2310,27 @@ PeerImp::onValidatorListMessage(
             // Charging this fee here won't hurt the peer in the normal
             // course of operation (ie. refresh every 5 minutes), but
             // will add up if the peer is misbehaving.
-            fee_.update(
-                Resource::kFEE_USELESS_DATA, " duplicate (same_sequence or known_sequence)");
+            fee_.update(Resource::kFeeUselessData, " duplicate (same_sequence or known_sequence)");
             break;
         case ListDisposition::Stale:
             // There are very few good reasons for a peer to send an
             // old list, particularly more than once.
-            fee_.update(Resource::kFEE_INVALID_DATA, "expired");
+            fee_.update(Resource::kFeeInvalidData, "expired");
             break;
         case ListDisposition::Untrusted:
             // Charging this fee here won't hurt the peer in the normal
             // course of operation (ie. refresh every 5 minutes), but
             // will add up if the peer is misbehaving.
-            fee_.update(Resource::kFEE_USELESS_DATA, "untrusted");
+            fee_.update(Resource::kFeeUselessData, "untrusted");
             break;
         case ListDisposition::Invalid:
             // This shouldn't ever happen with a well-behaved peer
-            fee_.update(Resource::kFEE_INVALID_SIGNATURE, "invalid list disposition");
+            fee_.update(Resource::kFeeInvalidSignature, "invalid list disposition");
             break;
         case ListDisposition::UnsupportedVersion:
             // During a version transition, this may be legitimate.
             // If it happens frequently, that's probably bad.
-            fee_.update(Resource::kFEE_INVALID_DATA, "version");
+            fee_.update(Resource::kFeeInvalidData, "version");
             break;
         // LCOV_EXCL_START
         default:
@@ -2399,7 +2398,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorList> const& m)
             JLOG(pJournal_.debug()) << "ValidatorList: received validator list from peer using "
                                     << "protocol version " << to_string(protocol_)
                                     << " which shouldn't support this feature.";
-            fee_.update(Resource::kFEE_USELESS_DATA, "unsupported peer");
+            fee_.update(Resource::kFeeUselessData, "unsupported peer");
             return;
         }
         onValidatorListMessage(
@@ -2409,7 +2408,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorList> const& m)
     {
         JLOG(pJournal_.warn()) << "ValidatorList: Exception, " << e.what();
         using namespace std::string_literals;
-        fee_.update(Resource::kFEE_INVALID_DATA, e.what());
+        fee_.update(Resource::kFeeInvalidData, e.what());
     }
 }
 
@@ -2423,7 +2422,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorListCollection> const& m
             JLOG(pJournal_.debug()) << "ValidatorListCollection: received validator list from peer "
                                     << "using protocol version " << to_string(protocol_)
                                     << " which shouldn't support this feature.";
-            fee_.update(Resource::kFEE_USELESS_DATA, "unsupported peer");
+            fee_.update(Resource::kFeeUselessData, "unsupported peer");
             return;
         }
         if (m->version() < 2)
@@ -2432,7 +2431,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorListCollection> const& m
                 << "ValidatorListCollection: received invalid validator list "
                    "version "
                 << m->version() << " from peer using protocol version " << to_string(protocol_);
-            fee_.update(Resource::kFEE_INVALID_DATA, "wrong version");
+            fee_.update(Resource::kFeeInvalidData, "wrong version");
             return;
         }
         onValidatorListMessage(
@@ -2442,7 +2441,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorListCollection> const& m
     {
         JLOG(pJournal_.warn()) << "ValidatorListCollection: Exception, " << e.what();
         using namespace std::string_literals;
-        fee_.update(Resource::kFEE_INVALID_DATA, e.what());
+        fee_.update(Resource::kFeeInvalidData, e.what());
     }
 }
 
@@ -2452,7 +2451,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
     if (m->validation().size() < 50)
     {
         JLOG(pJournal_.warn()) << "Validation: Too small";
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "too small");
+        fee_.update(Resource::kFeeMalformedRequest, "too small");
         return;
     }
 
@@ -2479,7 +2478,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
                 val->getSeenTime()))
         {
             JLOG(pJournal_.trace()) << "Validation: Not current";
-            fee_.update(Resource::kFEE_USELESS_DATA, "not current");
+            fee_.update(Resource::kFeeUselessData, "not current");
             return;
         }
 
@@ -2510,7 +2509,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
             // Count unique messages (Slots has it's own 'HashRouter'), which a
             // peer receives within IDLED seconds since the message has been
             // relayed.
-            if (relayed && (stopwatch().now() - *relayed) < reduce_relay::kIDLED)
+            if (relayed && (stopwatch().now() - *relayed) < reduce_relay::kIdled)
             {
                 overlay_.updateSlotAndSquelch(
                     key, val->getSignerPublic(), id_, protocol::mtVALIDATION);
@@ -2548,7 +2547,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
     {
         JLOG(pJournal_.warn()) << "Exception processing validation: " << e.what();
         using namespace std::string_literals;
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, e.what());
+        fee_.update(Resource::kFeeMalformedRequest, e.what());
     }
 }
 
@@ -2563,7 +2562,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
     if (packet.query())
     {
         // this is a query
-        if (sendQueue_.size() >= Tuning::kDROP_SEND_QUEUE)
+        if (sendQueue_.size() >= Tuning::kDropSendQueue)
         {
             JLOG(pJournal_.debug()) << "GetObject: Large send queue";
             return;
@@ -2580,7 +2579,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
             if (!txReduceRelayEnabled())
             {
                 JLOG(pJournal_.error()) << "TMGetObjectByHash: tx reduce-relay is disabled";
-                fee_.update(Resource::kFEE_MALFORMED_REQUEST, "disabled");
+                fee_.update(Resource::kFeeMalformedRequest, "disabled");
                 return;
             }
 
@@ -2602,14 +2601,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
         {
             if (!stringIsUInt256Sized(packet.ledgerhash()))
             {
-                fee_.update(Resource::kFEE_MALFORMED_REQUEST, "ledger hash");
+                fee_.update(Resource::kFeeMalformedRequest, "ledger hash");
                 return;
             }
 
             reply.set_ledgerhash(packet.ledgerhash());
         }
 
-        fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, " received a get object by hash request");
+        fee_.update(Resource::kFeeModerateBurdenPeer, " received a get object by hash request");
 
         // This is a very minimal implementation
         for (int i = 0; i < packet.objects_size(); ++i)
@@ -2635,10 +2634,10 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
 
                     // Check if by adding this object, reply has reached its
                     // limit
-                    if (reply.objects_size() >= Tuning::kHARD_MAX_REPLY_NODES)
+                    if (reply.objects_size() >= Tuning::kHardMaxReplyNodes)
                     {
                         fee_.update(
-                            Resource::kFEE_MODERATE_BURDEN_PEER,
+                            Resource::kFeeModerateBurdenPeer,
                             "Reply limit reached. Truncating reply.");
                         break;
                     }
@@ -2710,7 +2709,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMHaveTransactions> const& m)
     if (!txReduceRelayEnabled())
     {
         JLOG(pJournal_.error()) << "TMHaveTransactions: tx reduce-relay is disabled";
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "disabled");
+        fee_.update(Resource::kFeeMalformedRequest, "disabled");
         return;
     }
 
@@ -2735,7 +2734,7 @@ PeerImp::handleHaveTransactions(std::shared_ptr<protocol::TMHaveTransactions> co
         if (!stringIsUInt256Sized(m->hashes(i)))
         {
             JLOG(pJournal_.error()) << "TMHaveTransactions with invalid hash size";
-            fee_.update(Resource::kFEE_MALFORMED_REQUEST, "hash size");
+            fee_.update(Resource::kFeeMalformedRequest, "hash size");
             return;
         }
 
@@ -2773,7 +2772,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMTransactions> const& m)
     if (!txReduceRelayEnabled())
     {
         JLOG(pJournal_.error()) << "TMTransactions: tx reduce-relay is disabled";
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "disabled");
+        fee_.update(Resource::kFeeMalformedRequest, "disabled");
         return;
     }
 
@@ -2803,14 +2802,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMSquelch> const& m)
 
     if (!m->has_validatorpubkey())
     {
-        fee_.update(Resource::kFEE_INVALID_DATA, "squelch no pubkey");
+        fee_.update(Resource::kFeeInvalidData, "squelch no pubkey");
         return;
     }
     auto validator = m->validatorpubkey();
     auto const slice{makeSlice(validator)};
     if (!publicKeyType(slice))
     {
-        fee_.update(Resource::kFEE_INVALID_DATA, "squelch bad pubkey");
+        fee_.update(Resource::kFeeInvalidData, "squelch bad pubkey");
         return;
     }
     PublicKey const key(slice);
@@ -2829,7 +2828,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMSquelch> const& m)
     }
     else if (!squelch_.addSquelch(key, std::chrono::seconds{duration}))
     {
-        fee_.update(Resource::kFEE_INVALID_DATA, "squelch duration");
+        fee_.update(Resource::kFeeInvalidData, "squelch duration");
     }
 
     JLOG(pJournal_.debug()) << "onMessage: TMSquelch " << slice << " " << id() << " " << duration;
@@ -2867,11 +2866,11 @@ PeerImp::doFetchPack(std::shared_ptr<protocol::TMGetObjectByHash> const& packet)
     if (!stringIsUInt256Sized(packet->ledgerhash()))
     {
         JLOG(pJournal_.warn()) << "FetchPack hash size malformed";
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "hash size");
+        fee_.update(Resource::kFeeMalformedRequest, "hash size");
         return;
     }
 
-    fee_.fee = Resource::kFEE_HEAVY_BURDEN_PEER;
+    fee_.fee = Resource::kFeeHeavyBurdenPeer;
 
     uint256 const hash = uint256::fromRaw(packet->ledgerhash());
 
@@ -2891,10 +2890,10 @@ PeerImp::doTransactions(std::shared_ptr<protocol::TMGetObjectByHash> const& pack
     JLOG(pJournal_.trace()) << "received TMGetObjectByHash requesting tx "
                             << packet->objects_size();
 
-    if (packet->objects_size() > reduce_relay::kMAX_TX_QUEUE_SIZE)
+    if (packet->objects_size() > reduce_relay::kMaxTxQueueSize)
     {
         JLOG(pJournal_.error()) << "doTransactions, invalid number of hashes";
-        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "too big");
+        fee_.update(Resource::kFeeMalformedRequest, "too big");
         return;
     }
 
@@ -2904,7 +2903,7 @@ PeerImp::doTransactions(std::shared_ptr<protocol::TMGetObjectByHash> const& pack
 
         if (!stringIsUInt256Sized(obj.hash()))
         {
-            fee_.update(Resource::kFEE_MALFORMED_REQUEST, "hash size");
+            fee_.update(Resource::kFeeMalformedRequest, "hash size");
             return;
         }
 
@@ -2916,7 +2915,7 @@ PeerImp::doTransactions(std::shared_ptr<protocol::TMGetObjectByHash> const& pack
         {
             JLOG(pJournal_.error())
                 << "doTransactions, transaction not found " << Slice(hash.data(), hash.size());
-            fee_.update(Resource::kFEE_MALFORMED_REQUEST, "tx not found");
+            fee_.update(Resource::kFeeMalformedRequest, "tx not found");
             return;
         }
 
@@ -2967,7 +2966,7 @@ PeerImp::checkTransaction(
         {
             JLOG(pJournal_.warn()) << "Ignoring Network relayed Tx containing "
                                       "tfInnerBatchTxn (checkSignature).";
-            charge(Resource::kFEE_MODERATE_BURDEN_PEER, "inner batch txn");
+            charge(Resource::kFeeModerateBurdenPeer, "inner batch txn");
             return;
         }
         // LCOV_EXCL_STOP
@@ -2979,7 +2978,7 @@ PeerImp::checkTransaction(
             JLOG(pJournal_.info()) << "Marking transaction " << stx->getTransactionID()
                                    << "as BAD because it's expired";
             app_.getHashRouter().setFlags(stx->getTransactionID(), HashRouterFlags::BAD);
-            charge(Resource::kFEE_USELESS_DATA, "expired tx");
+            charge(Resource::kFeeUselessData, "expired tx");
             return;
         }
 
@@ -3010,7 +3009,7 @@ PeerImp::checkTransaction(
                 if (!batch)
                 {
                     JLOG(pJournal_.debug()) << "Charging for pseudo-transaction tx " << tx->getID();
-                    charge(Resource::kFEE_USELESS_DATA, "pseudo tx");
+                    charge(Resource::kFeeUselessData, "pseudo tx");
                 }
 
                 return;
@@ -3032,7 +3031,7 @@ PeerImp::checkTransaction(
                 // Probably not necessary to set HashRouterFlags::BAD, but
                 // doesn't hurt.
                 app_.getHashRouter().setFlags(stx->getTransactionID(), HashRouterFlags::BAD);
-                charge(Resource::kFEE_INVALID_SIGNATURE, "check transaction signature failure");
+                charge(Resource::kFeeInvalidSignature, "check transaction signature failure");
                 return;
             }
         }
@@ -3051,7 +3050,7 @@ PeerImp::checkTransaction(
                 JLOG(pJournal_.debug()) << "Exception checking transaction: " << reason;
             }
             app_.getHashRouter().setFlags(stx->getTransactionID(), HashRouterFlags::BAD);
-            charge(Resource::kFEE_INVALID_SIGNATURE, "tx (impossible)");
+            charge(Resource::kFeeInvalidSignature, "tx (impossible)");
             return;
         }
 
@@ -3063,7 +3062,7 @@ PeerImp::checkTransaction(
         JLOG(pJournal_.warn()) << "Exception in " << __func__ << ": " << ex.what();
         app_.getHashRouter().setFlags(stx->getTransactionID(), HashRouterFlags::BAD);
         using namespace std::string_literals;
-        charge(Resource::kFEE_INVALID_DATA, "tx "s + ex.what());
+        charge(Resource::kFeeInvalidData, "tx "s + ex.what());
     }
 }
 
@@ -3082,7 +3081,7 @@ PeerImp::checkPropose(
     {
         std::string const desc{"Proposal fails sig check"};
         JLOG(pJournal_.warn()) << desc;
-        charge(Resource::kFEE_INVALID_SIGNATURE, desc);
+        charge(Resource::kFeeInvalidSignature, desc);
         return;
     }
 
@@ -3126,7 +3125,7 @@ PeerImp::checkValidation(
     {
         std::string const desc{"Validation forwarded by peer is invalid"};
         JLOG(pJournal_.debug()) << desc;
-        charge(Resource::kFEE_INVALID_SIGNATURE, desc);
+        charge(Resource::kFeeInvalidSignature, desc);
         return;
     }
 
@@ -3151,7 +3150,7 @@ PeerImp::checkValidation(
     {
         JLOG(pJournal_.trace()) << "Exception processing validation: " << ex.what();
         using namespace std::string_literals;
-        charge(Resource::kFEE_MALFORMED_REQUEST, "validation "s + ex.what());
+        charge(Resource::kFeeMalformedRequest, "validation "s + ex.what());
     }
 }
 
@@ -3219,7 +3218,7 @@ PeerImp::sendLedgerBase(
     ledgerData.add_nodes()->set_nodedata(s.getDataPtr(), s.getLength());
 
     auto const& stateMap{ledger->stateMap()};
-    if (stateMap.getHash() != beast::kZERO)
+    if (stateMap.getHash() != beast::kZero)
     {
         // Return account state root node if possible
         Serializer root(768);
@@ -3227,10 +3226,10 @@ PeerImp::sendLedgerBase(
         stateMap.serializeRoot(root);
         ledgerData.add_nodes()->set_nodedata(root.getDataPtr(), root.getLength());
 
-        if (ledger->header().txHash != beast::kZERO)
+        if (ledger->header().txHash != beast::kZero)
         {
             auto const& txMap{ledger->txMap()};
-            if (txMap.getHash() != beast::kZERO)
+            if (txMap.getHash() != beast::kZero)
             {
                 // Return TX root node if possible
                 root.erase();
@@ -3308,7 +3307,7 @@ PeerImp::getLedger(std::shared_ptr<protocol::TMGetLedger> const& m)
             {
                 // Do not resource charge a peer responding to a relay
                 if (!m->has_requestcookie())
-                    charge(Resource::kFEE_MALFORMED_REQUEST, "get_ledger ledgerSeq");
+                    charge(Resource::kFeeMalformedRequest, "get_ledger ledgerSeq");
 
                 ledger.reset();
                 JLOG(pJournal_.warn()) << "getLedger: Invalid ledger sequence " << ledgerSeq;
@@ -3365,7 +3364,7 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
 {
     // Do not resource charge a peer responding to a relay
     if (!m->has_requestcookie())
-        charge(Resource::kFEE_MODERATE_BURDEN_PEER, "received a get ledger request");
+        charge(Resource::kFeeModerateBurdenPeer, "received a get ledger request");
 
     std::shared_ptr<Ledger const> ledger;
     std::shared_ptr<SHAMap const> sharedMap;
@@ -3392,7 +3391,7 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
     }
     else
     {
-        if (sendQueue_.size() >= Tuning::kDROP_SEND_QUEUE)
+        if (sendQueue_.size() >= Tuning::kDropSendQueue)
         {
             JLOG(pJournal_.debug()) << "processLedgerRequest: Large send queue";
             return;
@@ -3454,13 +3453,13 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
         std::vector<std::pair<SHAMapNodeID, Blob>> data;
 
         for (int i = 0;
-             i < m->nodeids_size() && ledgerData.nodes_size() < Tuning::kSOFT_MAX_REPLY_NODES;
+             i < m->nodeids_size() && ledgerData.nodes_size() < Tuning::kSoftMaxReplyNodes;
              ++i)
         {
             auto const shaMapNodeId{deserializeSHAMapNodeID(m->nodeids(i))};
 
             data.clear();
-            data.reserve(Tuning::kSOFT_MAX_REPLY_NODES);
+            data.reserve(Tuning::kSoftMaxReplyNodes);
 
             try
             {
@@ -3472,7 +3471,7 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
 
                     for (auto const& d : data)
                     {
-                        if (ledgerData.nodes_size() >= Tuning::kHARD_MAX_REPLY_NODES)
+                        if (ledgerData.nodes_size() >= Tuning::kHardMaxReplyNodes)
                             break;
                         protocol::TMLedgerNode* node{ledgerData.add_nodes()};
                         node->set_nodeid(d.first.getRawString());
@@ -3536,24 +3535,24 @@ PeerImp::getScore(bool haveItem) const
 {
     // Random component of score, used to break ties and avoid
     // overloading the "best" peer
-    static int const kSP_RANDOM_MAX = 9999;
+    static int const kSpRandomMax = 9999;
 
     // Score for being very likely to have the thing we are
     // look for; should be roughly spRandomMax
-    static int const kSP_HAVE_ITEM = 10000;
+    static int const kSpHaveItem = 10000;
 
     // Score reduction for each millisecond of latency; should
     // be roughly spRandomMax divided by the maximum reasonable
     // latency
-    static int const kSP_LATENCY = 30;
+    static int const kSpLatency = 30;
 
     // Penalty for unknown latency; should be roughly spRandomMax
-    static int const kSP_NO_LATENCY = 8000;
+    static int const kSpNoLatency = 8000;
 
-    int score = randInt(kSP_RANDOM_MAX);
+    int score = randInt(kSpRandomMax);
 
     if (haveItem)
-        score += kSP_HAVE_ITEM;
+        score += kSpHaveItem;
 
     std::optional<std::chrono::milliseconds> latency;
     {
@@ -3563,11 +3562,11 @@ PeerImp::getScore(bool haveItem) const
 
     if (latency)
     {
-        score -= latency->count() * kSP_LATENCY;
+        score -= latency->count() * kSpLatency;
     }
     else
     {
-        score -= kSP_NO_LATENCY;
+        score -= kSpNoLatency;
     }
 
     return score;
@@ -3577,7 +3576,7 @@ bool
 PeerImp::isHighLatency() const
 {
     std::scoped_lock const sl(recentLock_);
-    return latency_ >= kPEER_HIGH_LATENCY;
+    return latency_ >= kPeerHighLatency;
 }
 
 void
diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h
index 676057ad82..9c66347810 100644
--- a/src/xrpld/overlay/detail/PeerImp.h
+++ b/src/xrpld/overlay/detail/PeerImp.h
@@ -190,7 +190,7 @@ private:
 
     struct ChargeWithContext
     {
-        Resource::Charge fee = Resource::kFEE_TRIVIAL_PEER;
+        Resource::Charge fee = Resource::kFeeTrivialPeer;
         std::string context{};  // NOLINT(readability-redundant-member-init)
 
         void
@@ -834,18 +834,18 @@ PeerImp::PeerImp(
     , creationTime_(clock_type::now())
     , squelch_(app_.getJournal("Squelch"))
     , usage_(usage)
-    , fee_{.fee = Resource::kFEE_TRIVIAL_PEER}
+    , fee_{.fee = Resource::kFeeTrivialPeer}
     , slot_(std::move(slot))
     , response_(std::move(response))
     , headers_(response_)
     , compressionEnabled_(
-          peerFeatureEnabled(headers_, kFEATURE_COMPR, "lz4", app_.config().COMPRESSION)
+          peerFeatureEnabled(headers_, kFeatureCompr, "lz4", app_.config().COMPRESSION)
               ? Compressed::On
               : Compressed::Off)
     , txReduceRelayEnabled_(
-          peerFeatureEnabled(headers_, kFEATURE_TXRR, app_.config().TX_REDUCE_RELAY_ENABLE))
+          peerFeatureEnabled(headers_, kFeatureTxrr, app_.config().TX_REDUCE_RELAY_ENABLE))
     , ledgerReplayEnabled_(
-          peerFeatureEnabled(headers_, kFEATURE_LEDGER_REPLAY, app_.config().LEDGER_REPLAY))
+          peerFeatureEnabled(headers_, kFeatureLedgerReplay, app_.config().LEDGER_REPLAY))
     , ledgerReplayMsgHandler_(app, app.getLedgerReplayer())
 {
     readBuffer_.commit(
@@ -854,7 +854,7 @@ PeerImp::PeerImp(
                           << " vp reduce-relay base squelch enabled "
                           << peerFeatureEnabled(
                                  headers_,
-                                 kFEATURE_VPRR,
+                                 kFeatureVprr,
                                  app_.config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE)
                           << " tx reduce-relay enabled " << txReduceRelayEnabled_ << " on "
                           << remoteAddress_ << " " << id_;
diff --git a/src/xrpld/overlay/detail/PeerSet.cpp b/src/xrpld/overlay/detail/PeerSet.cpp
index 6dda492315..463b68bb6c 100644
--- a/src/xrpld/overlay/detail/PeerSet.cpp
+++ b/src/xrpld/overlay/detail/PeerSet.cpp
@@ -167,9 +167,9 @@ public:
     [[nodiscard]] std::set<Peer::id_t> const&
     getPeerIds() const override
     {
-        static std::set<Peer::id_t> const kEMPTY_PEERS;
+        static std::set<Peer::id_t> const kEmptyPeers;
         JLOG(j_.error()) << "DummyPeerSet getPeerIds should not be called";
-        return kEMPTY_PEERS;
+        return kEmptyPeers;
     }
 
 private:
diff --git a/src/xrpld/overlay/detail/ProtocolMessage.h b/src/xrpld/overlay/detail/ProtocolMessage.h
index 0550cf68e0..ab41cbe337 100644
--- a/src/xrpld/overlay/detail/ProtocolMessage.h
+++ b/src/xrpld/overlay/detail/ProtocolMessage.h
@@ -159,7 +159,7 @@ parseMessageHeader(boost::system::error_code& ec, BufferSequence const& bufs, st
     // - 32 bits are the uncompressed data size
     if (*iter & 0x80)
     {
-        hdr.header_size = kHEADER_BYTES_COMPRESSED;
+        hdr.header_size = kHeaderBytesCompressed;
 
         // not enough bytes to parse the header
         if (size < hdr.header_size)
@@ -204,7 +204,7 @@ parseMessageHeader(boost::system::error_code& ec, BufferSequence const& bufs, st
     // - 26 bits are the payload size
     if ((*iter & 0xFC) == 0)
     {
-        hdr.header_size = kHEADER_BYTES;
+        hdr.header_size = kHeaderBytes;
 
         if (size < hdr.header_size)
         {
@@ -329,8 +329,8 @@ invokeProtocolMessage(Buffers const& buffers, Handler& handler, std::size_t& hin
     // whose size exceeds this may result in the connection being dropped. A
     // larger message size may be supported in the future or negotiated as
     // part of a protocol upgrade.
-    if (header->payload_wire_size > kMAXIMUM_MESSAGE_SIZE ||
-        header->uncompressed_size > kMAXIMUM_MESSAGE_SIZE)
+    if (header->payload_wire_size > kMaximumMessageSize ||
+        header->uncompressed_size > kMaximumMessageSize)
     {
         result.second = make_error_code(boost::system::errc::message_size);
         return result;
diff --git a/src/xrpld/overlay/detail/ProtocolVersion.cpp b/src/xrpld/overlay/detail/ProtocolVersion.cpp
index 86525068f8..62660b0e01 100644
--- a/src/xrpld/overlay/detail/ProtocolVersion.cpp
+++ b/src/xrpld/overlay/detail/ProtocolVersion.cpp
@@ -25,7 +25,7 @@ namespace xrpl {
           it may not contain any duplicates!)
 */
 
-constexpr ProtocolVersion const kSUPPORTED_PROTOCOL_LIST[]{
+constexpr ProtocolVersion const kSupportedProtocolList[]{
     {2, 1},
     {2, 2},
 };
@@ -36,7 +36,7 @@ constexpr ProtocolVersion const kSUPPORTED_PROTOCOL_LIST[]{
 static_assert(
     []() constexpr -> bool {
         auto const len =
-            std::distance(std::begin(kSUPPORTED_PROTOCOL_LIST), std::end(kSUPPORTED_PROTOCOL_LIST));
+            std::distance(std::begin(kSupportedProtocolList), std::end(kSupportedProtocolList));
 
         // There should be at least one protocol we're willing to speak.
         if (len == 0)
@@ -48,7 +48,7 @@ static_assert(
         {
             for (auto i = 0; i != len - 1; ++i)
             {
-                if (kSUPPORTED_PROTOCOL_LIST[i] >= kSUPPORTED_PROTOCOL_LIST[i + 1])
+                if (kSupportedProtocolList[i] >= kSupportedProtocolList[i + 1])
                     return false;
             }
         }
@@ -125,7 +125,7 @@ negotiateProtocolVersion(std::vector<ProtocolVersion> const& versions)
         [&result](ProtocolVersion const& v) { result = v; };
 
     std::ranges::set_intersection(
-        versions, kSUPPORTED_PROTOCOL_LIST, boost::make_function_output_iterator(pickVersion));
+        versions, kSupportedProtocolList, boost::make_function_output_iterator(pickVersion));
 
     return result;
 }
@@ -141,9 +141,9 @@ negotiateProtocolVersion(boost::beast::string_view const& versions)
 std::string const&
 supportedProtocolVersions()
 {
-    static std::string const kSUPPORTED = []() {
+    static std::string const kSupported = []() {
         std::string ret;
-        for (auto const& v : kSUPPORTED_PROTOCOL_LIST)
+        for (auto const& v : kSupportedProtocolList)
         {
             if (!ret.empty())
                 ret += ", ";
@@ -153,13 +153,13 @@ supportedProtocolVersions()
         return ret;
     }();
 
-    return kSUPPORTED;
+    return kSupported;
 }
 
 bool
 isProtocolSupported(ProtocolVersion const& v)
 {
-    return std::end(kSUPPORTED_PROTOCOL_LIST) != std::ranges::find(kSUPPORTED_PROTOCOL_LIST, v);
+    return std::end(kSupportedProtocolList) != std::ranges::find(kSupportedProtocolList, v);
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/overlay/detail/TrafficCount.cpp b/src/xrpld/overlay/detail/TrafficCount.cpp
index 4dc99e3e37..bdce9e68f0 100644
--- a/src/xrpld/overlay/detail/TrafficCount.cpp
+++ b/src/xrpld/overlay/detail/TrafficCount.cpp
@@ -8,7 +8,7 @@
 
 namespace xrpl {
 
-std::unordered_map<protocol::MessageType, TrafficCount::Category> const kTYPE_LOOKUP = {
+std::unordered_map<protocol::MessageType, TrafficCount::Category> const kTypeLookup = {
     {protocol::mtPING, TrafficCount::Category::Base},
     {protocol::mtSTATUS_CHANGE, TrafficCount::Category::Base},
     {protocol::mtMANIFESTS, TrafficCount::Category::Manifests},
@@ -33,7 +33,7 @@ TrafficCount::categorize(
     protocol::MessageType type,
     bool inbound)
 {
-    if (auto item = kTYPE_LOOKUP.find(type); item != kTYPE_LOOKUP.end())
+    if (auto item = kTypeLookup.find(type); item != kTypeLookup.end())
         return item->second;
 
     if (type == protocol::mtHAVE_SET)
diff --git a/src/xrpld/overlay/detail/TrafficCount.h b/src/xrpld/overlay/detail/TrafficCount.h
index 233f06b70f..cb77c2359f 100644
--- a/src/xrpld/overlay/detail/TrafficCount.h
+++ b/src/xrpld/overlay/detail/TrafficCount.h
@@ -226,7 +226,7 @@ public:
     static std::string
     toString(Category cat)
     {
-        static std::unordered_map<Category, std::string> const kCATEGORY_MAP = {
+        static std::unordered_map<Category, std::string> const kCategoryMap = {
             {Category::Base, "overhead"},
             {Category::Cluster, "overhead_cluster"},
             {Category::Overlay, "overhead_overlay"},
@@ -284,7 +284,7 @@ public:
             {Category::RequestedTransactions, "requested_transactions"},
             {Category::Total, "total"}};
 
-        if (auto it = kCATEGORY_MAP.find(cat); it != kCATEGORY_MAP.end())
+        if (auto it = kCategoryMap.find(cat); it != kCategoryMap.end())
             return it->second;
 
         return "unknown";
diff --git a/src/xrpld/overlay/detail/Tuning.h b/src/xrpld/overlay/detail/Tuning.h
index 9913dd4371..a0f57ec3d7 100644
--- a/src/xrpld/overlay/detail/Tuning.h
+++ b/src/xrpld/overlay/detail/Tuning.h
@@ -4,37 +4,37 @@ namespace xrpl::Tuning {
 
 /** How many ledgers off a server can be and we will
     still consider it converged */
-static constexpr auto kCONVERGED_LEDGER_LIMIT = 24;
+static constexpr auto kConvergedLedgerLimit = 24;
 
 /** How many ledgers off a server has to be before we
     consider it diverged */
-static constexpr auto kDIVERGED_LEDGER_LIMIT = 128;
+static constexpr auto kDivergedLedgerLimit = 128;
 
 /** The soft cap on the number of ledger entries in a single reply. */
-static constexpr auto kSOFT_MAX_REPLY_NODES = 8192;
+static constexpr auto kSoftMaxReplyNodes = 8192;
 
 /** The hard cap on the number of ledger entries in a single reply. */
-static constexpr auto kHARD_MAX_REPLY_NODES = 12288;
+static constexpr auto kHardMaxReplyNodes = 12288;
 
 /** How many timer intervals a sendq has to stay large before we disconnect */
-static constexpr auto kSENDQ_INTERVALS = 4;
+static constexpr auto kSendqIntervals = 4;
 
 /** How many messages on a send queue before we refuse queries */
-static constexpr auto kDROP_SEND_QUEUE = 192;
+static constexpr auto kDropSendQueue = 192;
 
 /** How many messages we consider reasonable sustained on a send queue */
-static constexpr auto kTARGET_SEND_QUEUE = 128;
+static constexpr auto kTargetSendQueue = 128;
 
 /** How often to log send queue size */
-static constexpr auto kSEND_QUEUE_LOG_FREQ = 64;
+static constexpr auto kSendQueueLogFreq = 64;
 
 /** How often we check for idle peers (seconds) */
-static constexpr auto kCHECK_IDLE_PEERS = 4;
+static constexpr auto kCheckIdlePeers = 4;
 
 /** The maximum number of levels to search */
-static constexpr auto kMAX_QUERY_DEPTH = 3;
+static constexpr auto kMaxQueryDepth = 3;
 
 /** Size of buffer used to read from the socket. */
-std::size_t constexpr kREAD_BUFFER_BYTES = 16384;
+constexpr std::size_t kReadBufferBytes = 16384;
 
 }  // namespace xrpl::Tuning
diff --git a/src/xrpld/peerfinder/PeerfinderManager.h b/src/xrpld/peerfinder/PeerfinderManager.h
index 083abf92c6..f88b1b637c 100644
--- a/src/xrpld/peerfinder/PeerfinderManager.h
+++ b/src/xrpld/peerfinder/PeerfinderManager.h
@@ -27,7 +27,7 @@ struct Config
         This includes both inbound and outbound, but does not include
         fixed peers.
     */
-    std::size_t maxPeers{Tuning::kDEFAULT_MAX_PEERS};
+    std::size_t maxPeers{Tuning::kDefaultMaxPeers};
 
     /** The number of automatic outbound connections to maintain.
         Outbound connections are only maintained if autoConnect
diff --git a/src/xrpld/peerfinder/detail/Bootcache.cpp b/src/xrpld/peerfinder/detail/Bootcache.cpp
index 269b6cc757..a0a753530b 100644
--- a/src/xrpld/peerfinder/detail/Bootcache.cpp
+++ b/src/xrpld/peerfinder/detail/Bootcache.cpp
@@ -110,13 +110,13 @@ Bootcache::insert(beast::IP::Endpoint const& endpoint)
 bool
 Bootcache::insertStatic(beast::IP::Endpoint const& endpoint)
 {
-    auto result(map_.insert(value_type(endpoint, kSTATIC_VALENCE)));
+    auto result(map_.insert(value_type(endpoint, kStaticValence)));
 
-    if (!result.second && (result.first->right.valence() < kSTATIC_VALENCE))
+    if (!result.second && (result.first->right.valence() < kStaticValence))
     {
         // An existing entry has too low a valence, replace it
         map_.erase(result.first);
-        result = map_.insert(value_type(endpoint, kSTATIC_VALENCE));
+        result = map_.insert(value_type(endpoint, kStaticValence));
     }
 
     if (result.second)
@@ -199,11 +199,11 @@ Bootcache::onWrite(beast::PropertyStream::Map& map)
 void
 Bootcache::prune()
 {
-    if (size() <= Tuning::kBOOTCACHE_SIZE)
+    if (size() <= Tuning::kBootcacheSize)
         return;
 
     // Calculate the amount to remove
-    auto count((size() * Tuning::kBOOTCACHE_PRUNE_PERCENT) / 100);
+    auto count((size() * Tuning::kBootcachePrunePercent) / 100);
     decltype(count) pruned(0);
 
     // Work backwards because bimap doesn't handle
@@ -240,7 +240,7 @@ Bootcache::update()
     store_.save(list);
     // Reset the flag and cooldown timer
     needsUpdate_ = false;
-    whenUpdate_ = clock_.now() + Tuning::kBOOTCACHE_COOLDOWN_TIME;
+    whenUpdate_ = clock_.now() + Tuning::kBootcacheCooldownTime;
 }
 
 // Checks the clock and calls update if we are off the cooldown.
diff --git a/src/xrpld/peerfinder/detail/Bootcache.h b/src/xrpld/peerfinder/detail/Bootcache.h
index c061f37595..01ee2cad33 100644
--- a/src/xrpld/peerfinder/detail/Bootcache.h
+++ b/src/xrpld/peerfinder/detail/Bootcache.h
@@ -97,7 +97,7 @@ private:
     bool needsUpdate_{false};
 
 public:
-    static constexpr int kSTATIC_VALENCE = 32;
+    static constexpr int kStaticValence = 32;
 
     using iterator = boost::transform_iterator<Transform, map_type::right_map::const_iterator>;
 
diff --git a/src/xrpld/peerfinder/detail/Counts.h b/src/xrpld/peerfinder/detail/Counts.h
index 9fee2efadb..ff88421e09 100644
--- a/src/xrpld/peerfinder/detail/Counts.h
+++ b/src/xrpld/peerfinder/detail/Counts.h
@@ -51,9 +51,9 @@ public:
     [[nodiscard]] std::size_t
     attemptsNeeded() const
     {
-        if (attempts_ >= Tuning::kMAX_CONNECT_ATTEMPTS)
+        if (attempts_ >= Tuning::kMaxConnectAttempts)
             return 0;
-        return Tuning::kMAX_CONNECT_ATTEMPTS - attempts_;
+        return Tuning::kMaxConnectAttempts - attempts_;
     }
 
     /** Returns the number of outbound connection attempts. */
diff --git a/src/xrpld/peerfinder/detail/Endpoint.cpp b/src/xrpld/peerfinder/detail/Endpoint.cpp
index ab9cd66809..15de5cd153 100644
--- a/src/xrpld/peerfinder/detail/Endpoint.cpp
+++ b/src/xrpld/peerfinder/detail/Endpoint.cpp
@@ -10,7 +10,7 @@
 namespace xrpl::PeerFinder {
 
 Endpoint::Endpoint(beast::IP::Endpoint ep, std::uint32_t hops)
-    : hops(std::min(hops, Tuning::kMAX_HOPS + 1)), address(std::move(ep))
+    : hops(std::min(hops, Tuning::kMaxHops + 1)), address(std::move(ep))
 {
 }
 
diff --git a/src/xrpld/peerfinder/detail/Fixed.h b/src/xrpld/peerfinder/detail/Fixed.h
index c334b9ac99..61df9caddb 100644
--- a/src/xrpld/peerfinder/detail/Fixed.h
+++ b/src/xrpld/peerfinder/detail/Fixed.h
@@ -25,8 +25,8 @@ public:
     void
     failure(clock_type::time_point const& now)
     {
-        failures_ = std::min(failures_ + 1, Tuning::kCONNECTION_BACKOFF.size() - 1);
-        when_ = now + std::chrono::minutes(Tuning::kCONNECTION_BACKOFF[failures_]);
+        failures_ = std::min(failures_ + 1, Tuning::kConnectionBackoff.size() - 1);
+        when_ = now + std::chrono::minutes(Tuning::kConnectionBackoff[failures_]);
     }
 
     /** Updates metadata to reflect a successful connection. */
diff --git a/src/xrpld/peerfinder/detail/Handouts.h b/src/xrpld/peerfinder/detail/Handouts.h
index b26a44015d..19a367f8c1 100644
--- a/src/xrpld/peerfinder/detail/Handouts.h
+++ b/src/xrpld/peerfinder/detail/Handouts.h
@@ -88,7 +88,7 @@ public:
     [[nodiscard]] bool
     full() const
     {
-        return list_.size() >= Tuning::kREDIRECT_ENDPOINT_COUNT;
+        return list_.size() >= Tuning::kRedirectEndpointCount;
     }
 
     [[nodiscard]] SlotImp::ptr const&
@@ -117,7 +117,7 @@ private:
 template <class>
 RedirectHandouts::RedirectHandouts(SlotImp::ptr slot) : slot_(std::move(slot))
 {
-    list_.reserve(Tuning::kREDIRECT_ENDPOINT_COUNT);
+    list_.reserve(Tuning::kRedirectEndpointCount);
 }
 
 template <class>
@@ -131,7 +131,7 @@ RedirectHandouts::tryInsert(Endpoint const& ep)
     //             addresses in a peer HTTP handshake instead of
     //             the tmENDPOINTS message.
     //
-    if (ep.hops > Tuning::kMAX_HOPS)
+    if (ep.hops > Tuning::kMaxHops)
         return false;
 
     // Don't send them our address
@@ -172,7 +172,7 @@ public:
     [[nodiscard]] bool
     full() const
     {
-        return list_.size() >= Tuning::kNUMBER_OF_ENDPOINTS;
+        return list_.size() >= Tuning::kNumberOfEndpoints;
     }
 
     void
@@ -201,7 +201,7 @@ private:
 template <class>
 SlotHandouts::SlotHandouts(SlotImp::ptr slot) : slot_(std::move(slot))
 {
-    list_.reserve(Tuning::kNUMBER_OF_ENDPOINTS);
+    list_.reserve(Tuning::kNumberOfEndpoints);
 }
 
 template <class>
@@ -211,7 +211,7 @@ SlotHandouts::tryInsert(Endpoint const& ep)
     if (full())
         return false;
 
-    if (ep.hops > Tuning::kMAX_HOPS)
+    if (ep.hops > Tuning::kMaxHops)
         return false;
 
     if (slot_->recent.filter(ep.address, ep.hops))
diff --git a/src/xrpld/peerfinder/detail/Livecache.h b/src/xrpld/peerfinder/detail/Livecache.h
index 3222a13d60..84efcb7bd1 100644
--- a/src/xrpld/peerfinder/detail/Livecache.h
+++ b/src/xrpld/peerfinder/detail/Livecache.h
@@ -202,8 +202,8 @@ public:
         // but not given out (since they would exceed maxHops). They
         // are used for automatic connection attempts.
         //
-        using Histogram = std::array<int, 1 + Tuning::kMAX_HOPS + 1>;
-        using lists_type = std::array<list_type, 1 + Tuning::kMAX_HOPS + 1>;
+        using Histogram = std::array<int, 1 + Tuning::kMaxHops + 1>;
+        using lists_type = std::array<list_type, 1 + Tuning::kMaxHops + 1>;
 
         template <bool IsConst>
         struct Transform
@@ -371,7 +371,7 @@ Livecache<Allocator>::expire()
 {
     std::size_t n(0);
     typename cache_type::time_point const expired(
-        cache_.clock().now() - Tuning::kLIVE_CACHE_SECONDS_TO_LIVE);
+        cache_.clock().now() - Tuning::kLiveCacheSecondsToLive);
     for (auto iter(cache_.chronological.begin());
          iter != cache_.chronological.end() && iter.when() <= expired;)
     {
@@ -398,7 +398,7 @@ Livecache<Allocator>::insert(Endpoint const& ep)
     // when redirecting.
     //
     XRPL_ASSERT(
-        ep.hops <= (Tuning::kMAX_HOPS + 1),
+        ep.hops <= (Tuning::kMaxHops + 1),
         "xrpl::PeerFinder::Livecache::insert : maximum input hops");
     auto result = cache_.emplace(ep.address, ep);
     Element& e(result.first->second);
@@ -439,7 +439,7 @@ void
 Livecache<Allocator>::onWrite(beast::PropertyStream::Map& map)
 {
     typename cache_type::time_point const expired(
-        cache_.clock().now() - Tuning::kLIVE_CACHE_SECONDS_TO_LIVE);
+        cache_.clock().now() - Tuning::kLiveCacheSecondsToLive);
     map["size"] = size();
     map["hist"] = hops.histogram();
     beast::PropertyStream::Set set("entries", map);
@@ -498,7 +498,7 @@ void
 Livecache<Allocator>::HopsT::insert(Element& e)
 {
     XRPL_ASSERT(
-        e.endpoint.hops <= Tuning::kMAX_HOPS + 1,
+        e.endpoint.hops <= Tuning::kMaxHops + 1,
         "xrpl::PeerFinder::Livecache::HopsT::insert : maximum input hops");
     // This has security implications without a shuffle
     lists_[e.endpoint.hops].push_front(e);
@@ -510,7 +510,7 @@ void
 Livecache<Allocator>::HopsT::reinsert(Element& e, std::uint32_t numHops)
 {
     XRPL_ASSERT(
-        numHops <= Tuning::kMAX_HOPS + 1,
+        numHops <= Tuning::kMaxHops + 1,
         "xrpl::PeerFinder::Livecache::HopsT::reinsert : maximum hops input");
 
     auto& list = lists_[e.endpoint.hops];
diff --git a/src/xrpld/peerfinder/detail/Logic.h b/src/xrpld/peerfinder/detail/Logic.h
index 4d0cc9cf29..3ebe0cf2f4 100644
--- a/src/xrpld/peerfinder/detail/Logic.h
+++ b/src/xrpld/peerfinder/detail/Logic.h
@@ -633,7 +633,7 @@ public:
                 result.emplace_back(slot, list);
             }
 
-            whenBroadcast = now + Tuning::kSECONDS_PER_MESSAGE;
+            whenBroadcast = now + Tuning::kSecondsPerMessage;
         }
 
         return result;
@@ -652,7 +652,7 @@ public:
             entry.second->expire();
 
         // Expire the recent attempts table
-        beast::expire(squelches, Tuning::kRECENT_ATTEMPT_DURATION);
+        beast::expire(squelches, Tuning::kRecentAttemptDuration);
 
         bootcache.periodicActivity();
     }
@@ -669,7 +669,7 @@ public:
             Endpoint& ep(*iter);
 
             // Enforce hop limit
-            if (ep.hops > Tuning::kMAX_HOPS)
+            if (ep.hops > Tuning::kMaxHops)
             {
                 JLOG(journal.debug()) << beast::Leftw(18) << "Endpoints drop " << ep.address
                                       << " for excess hops " << ep.hops;
@@ -731,10 +731,10 @@ public:
         beast::Journal const journal{sink};
 
         // If we're sent too many endpoints, sample them at random:
-        if (list.size() > Tuning::kNUMBER_OF_ENDPOINTS_MAX)
+        if (list.size() > Tuning::kNumberOfEndpointsMax)
         {
             std::shuffle(list.begin(), list.end(), defaultPrng());
-            list.resize(Tuning::kNUMBER_OF_ENDPOINTS_MAX);
+            list.resize(Tuning::kNumberOfEndpointsMax);
         }
 
         JLOG(journal.trace()) << "Endpoints contained " << list.size()
@@ -816,7 +816,7 @@ public:
             bootcache.insert(ep.address);
         }
 
-        slot->whenAcceptEndpoints = now + Tuning::kSECONDS_PER_MESSAGE;
+        slot->whenAcceptEndpoints = now + Tuning::kSecondsPerMessage;
     }
 
     //--------------------------------------------------------------------------
@@ -1207,7 +1207,7 @@ Logic<Checker>::onRedirects(
 {
     std::scoped_lock const _(lock);
     std::size_t n = 0;
-    for (; first != last && n < Tuning::kMAX_REDIRECTS; ++first, ++n)
+    for (; first != last && n < Tuning::kMaxRedirects; ++first, ++n)
         bootcache.insert(beast::IPAddressConversion::fromAsio(*first));
     if (n > 0)
     {
diff --git a/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp b/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
index a8323f6239..bbaeeff8e6 100644
--- a/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
+++ b/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
@@ -18,8 +18,7 @@ Config::Config() : outPeers(calcOutPeers())
 std::size_t
 Config::calcOutPeers() const
 {
-    return std::max(
-        (maxPeers * Tuning::kOUT_PERCENT + 50) / 100, std::size_t(Tuning::kMIN_OUT_COUNT));
+    return std::max((maxPeers * Tuning::kOutPercent + 50) / 100, std::size_t(Tuning::kMinOutCount));
 }
 
 void
@@ -32,8 +31,8 @@ Config::applyTuning()
         // IP addresses.
         ipLimit = 2;
 
-        if (inPeers > Tuning::kDEFAULT_MAX_PEERS)
-            ipLimit += std::min(5, static_cast<int>(inPeers / Tuning::kDEFAULT_MAX_PEERS));
+        if (inPeers > Tuning::kDefaultMaxPeers)
+            ipLimit += std::min(5, static_cast<int>(inPeers / Tuning::kDefaultMaxPeers));
     }
 
     // We don't allow a single IP to consume all incoming slots,
@@ -74,7 +73,7 @@ Config::makeConfig(
         if (cfg.PEERS_MAX != 0)
             config.maxPeers = cfg.PEERS_MAX;
 
-        config.maxPeers = std::max<std::size_t>(config.maxPeers, Tuning::kMIN_OUT_COUNT);
+        config.maxPeers = std::max<std::size_t>(config.maxPeers, Tuning::kMinOutCount);
         config.outPeers = config.calcOutPeers();
 
         // Calculate the number of outbound peers we want. If we dont want
diff --git a/src/xrpld/peerfinder/detail/SlotImp.cpp b/src/xrpld/peerfinder/detail/SlotImp.cpp
index b941f54b48..f6ff24e6a6 100644
--- a/src/xrpld/peerfinder/detail/SlotImp.cpp
+++ b/src/xrpld/peerfinder/detail/SlotImp.cpp
@@ -25,7 +25,7 @@ SlotImp::SlotImp(
     , state_(State::Accept)
     , remote_endpoint_(std::move(remoteEndpoint))
     , local_endpoint_(localEndpoint)
-    , listening_port_(kUNKNOWN_PORT)
+    , listening_port_(kUnknownPort)
     , checked(false)
     , canAccept(false)
     , connectivityCheckInProgress(false)
@@ -39,7 +39,7 @@ SlotImp::SlotImp(beast::IP::Endpoint remoteEndpoint, bool fixed, clock_type& clo
     , reserved_(false)
     , state_(State::Connect)
     , remote_endpoint_(std::move(remoteEndpoint))
-    , listening_port_(kUNKNOWN_PORT)
+    , listening_port_(kUnknownPort)
     , checked(true)
     , canAccept(true)
     , connectivityCheckInProgress(false)
@@ -131,7 +131,7 @@ SlotImp::RecentT::filter(beast::IP::Endpoint const& ep, std::uint32_t hops)
 void
 SlotImp::RecentT::expire()
 {
-    beast::expire(cache_, Tuning::kLIVE_CACHE_SECONDS_TO_LIVE);
+    beast::expire(cache_, Tuning::kLiveCacheSecondsToLive);
 }
 
 }  // namespace xrpl::PeerFinder
diff --git a/src/xrpld/peerfinder/detail/SlotImp.h b/src/xrpld/peerfinder/detail/SlotImp.h
index b198c93e5d..0d09a37539 100644
--- a/src/xrpld/peerfinder/detail/SlotImp.h
+++ b/src/xrpld/peerfinder/detail/SlotImp.h
@@ -77,7 +77,7 @@ public:
     listeningPort() const override
     {
         std::uint32_t const value = listening_port_;
-        if (value == kUNKNOWN_PORT)
+        if (value == kUnknownPort)
             return std::nullopt;
         return value;
     }
@@ -164,7 +164,7 @@ private:
     std::optional<beast::IP::Endpoint> local_endpoint_;
     std::optional<PublicKey> public_key_;
 
-    static std::int32_t constexpr kUNKNOWN_PORT = -1;
+    static constexpr std::int32_t kUnknownPort = -1;
     std::atomic<std::int32_t> listening_port_;
 
 public:
diff --git a/src/xrpld/peerfinder/detail/StoreSqdb.h b/src/xrpld/peerfinder/detail/StoreSqdb.h
index 1239818ba3..19cdd774b7 100644
--- a/src/xrpld/peerfinder/detail/StoreSqdb.h
+++ b/src/xrpld/peerfinder/detail/StoreSqdb.h
@@ -15,7 +15,7 @@ private:
     soci::session sqlDb_;
 
 public:
-    static constexpr auto kCURRENT_SCHEMA_VERSION = 4;  // on-database format version
+    static constexpr auto kCurrentSchemaVersion = 4;  // on-database format version
 
     explicit StoreSqdb(beast::Journal journal = beast::Journal{beast::Journal::getNullSink()})
         : journal_(journal)
@@ -68,7 +68,7 @@ public:
     void
     update()
     {
-        updatePeerFinderDB(sqlDb_, kCURRENT_SCHEMA_VERSION, journal_);
+        updatePeerFinderDB(sqlDb_, kCurrentSchemaVersion, journal_);
     }
 
 private:
diff --git a/src/xrpld/peerfinder/detail/Tuning.h b/src/xrpld/peerfinder/detail/Tuning.h
index 92d71ff8d8..b4781495b8 100644
--- a/src/xrpld/peerfinder/detail/Tuning.h
+++ b/src/xrpld/peerfinder/detail/Tuning.h
@@ -13,32 +13,32 @@ namespace xrpl::PeerFinder::Tuning {
 //---------------------------------------------------------
 
 /** Time to wait between making batches of connection attempts */
-static constexpr auto kSECONDS_PER_CONNECT = 10;
+static constexpr auto kSecondsPerConnect = 10;
 
 /** Maximum number of simultaneous connection attempts. */
-static constexpr auto kMAX_CONNECT_ATTEMPTS = 20;
+static constexpr auto kMaxConnectAttempts = 20;
 
 /** The percentage of total peer slots that are outbound.
     The number of outbound peers will be the larger of the
     minOutCount and outPercent * Config::maxPeers specially
     rounded.
 */
-static constexpr auto kOUT_PERCENT = 15;
+static constexpr auto kOutPercent = 15;
 
 /** A hard minimum on the number of outgoing connections.
     This is enforced outside the Logic, so that the unit test
     can use any settings it wants.
 */
-static constexpr auto kMIN_OUT_COUNT = 10;
+static constexpr auto kMinOutCount = 10;
 
 /** The default value of Config::maxPeers. */
-static constexpr auto kDEFAULT_MAX_PEERS = 21;
+static constexpr auto kDefaultMaxPeers = 21;
 
 /** Max redirects we will accept from one connection.
     Redirects are limited for security purposes, to prevent
     the address caches from getting flooded.
 */
-static constexpr auto kMAX_REDIRECTS = 30;
+static constexpr auto kMaxRedirects = 30;
 
 //------------------------------------------------------------------------------
 //
@@ -46,7 +46,7 @@ static constexpr auto kMAX_REDIRECTS = 30;
 //
 //------------------------------------------------------------------------------
 
-static std::array<int, 10> const kCONNECTION_BACKOFF{{1, 1, 2, 3, 5, 8, 13, 21, 34, 55}};
+static std::array<int, 10> const kConnectionBackoff{{1, 1, 2, 3, 5, 8, 13, 21, 34, 55}};
 
 //------------------------------------------------------------------------------
 //
@@ -55,16 +55,16 @@ static std::array<int, 10> const kCONNECTION_BACKOFF{{1, 1, 2, 3, 5, 8, 13, 21,
 //------------------------------------------------------------------------------
 
 // Threshold of cache entries above which we trim.
-static constexpr auto kBOOTCACHE_SIZE = 1000;
+static constexpr auto kBootcacheSize = 1000;
 
 // The percentage of addresses we prune when we trim the cache.
-static constexpr auto kBOOTCACHE_PRUNE_PERCENT = 10;
+static constexpr auto kBootcachePrunePercent = 10;
 
 // The cool down wait between database updates
 // Ideally this should be larger than the time it takes a full
 // peer to send us a set of addresses and then disconnect.
 //
-static std::chrono::seconds const kBOOTCACHE_COOLDOWN_TIME(60);
+static std::chrono::seconds const kBootcacheCooldownTime(60);
 
 //------------------------------------------------------------------------------
 //
@@ -73,29 +73,29 @@ static std::chrono::seconds const kBOOTCACHE_COOLDOWN_TIME(60);
 //------------------------------------------------------------------------------
 
 // Drop incoming messages with hops greater than this number
-std::uint32_t constexpr kMAX_HOPS = 6;
+constexpr std::uint32_t kMaxHops = 6;
 
 // How many Endpoint to send in each mtENDPOINTS
-std::uint32_t constexpr kNUMBER_OF_ENDPOINTS = 2 * kMAX_HOPS;
+constexpr std::uint32_t kNumberOfEndpoints = 2 * kMaxHops;
 
 // The most Endpoint we will accept in mtENDPOINTS
-std::uint32_t constexpr kNUMBER_OF_ENDPOINTS_MAX =
-    std::max<decltype(kNUMBER_OF_ENDPOINTS)>(kNUMBER_OF_ENDPOINTS * 2, 64);
+constexpr std::uint32_t kNumberOfEndpointsMax =
+    std::max<decltype(kNumberOfEndpoints)>(kNumberOfEndpoints * 2, 64);
 
 // Number of addresses we provide when redirecting.
-std::uint32_t constexpr kREDIRECT_ENDPOINT_COUNT = 10;
+constexpr std::uint32_t kRedirectEndpointCount = 10;
 
 // How often we send or accept mtENDPOINTS messages per peer
 // (we use a prime number of purpose)
-std::chrono::seconds constexpr kSECONDS_PER_MESSAGE(151);
+constexpr std::chrono::seconds kSecondsPerMessage(151);
 
 // How long an Endpoint will stay in the cache
 // This should be a small multiple of the broadcast frequency
-std::chrono::seconds constexpr kLIVE_CACHE_SECONDS_TO_LIVE(30);
+constexpr std::chrono::seconds kLiveCacheSecondsToLive(30);
 
 // How much time to wait before trying an outgoing address again.
 // Note that we ignore the port for purposes of comparison.
-std::chrono::seconds constexpr kRECENT_ATTEMPT_DURATION(60);
+constexpr std::chrono::seconds kRecentAttemptDuration(60);
 
 }  // namespace xrpl::PeerFinder::Tuning
 /** @} */
diff --git a/src/xrpld/rpc/BookChanges.h b/src/xrpld/rpc/BookChanges.h
index 04c7a2c449..45c3cf2e4b 100644
--- a/src/xrpld/rpc/BookChanges.h
+++ b/src/xrpld/rpc/BookChanges.h
@@ -108,15 +108,15 @@ computeBookChanges(std::shared_ptr<L const> const& lpAccepted)
             STAmount second = noswap ? deltaPays : deltaGets;
 
             // defensively programmed, should (probably) never happen
-            if (second == beast::kZERO)
+            if (second == beast::kZero)
                 continue;
 
             STAmount const rate = divide(first, second, noIssue());
 
-            if (first < beast::kZERO)
+            if (first < beast::kZero)
                 first = -first;
 
-            if (second < beast::kZERO)
+            if (second < beast::kZero)
                 second = -second;
 
             std::stringstream ss;
diff --git a/src/xrpld/rpc/CTID.h b/src/xrpld/rpc/CTID.h
index 6c7e95a246..781cd85e29 100644
--- a/src/xrpld/rpc/CTID.h
+++ b/src/xrpld/rpc/CTID.h
@@ -30,11 +30,11 @@ namespace xrpl::RPC {
 inline std::optional<std::string>
 encodeCTID(uint32_t ledgerSeq, uint32_t txnIndex, uint32_t networkID) noexcept
 {
-    constexpr uint32_t kMAX_LEDGER_SEQ = 0x0FFF'FFFF;
-    constexpr uint32_t kMAX_TXN_INDEX = 0xFFFF;
-    constexpr uint32_t kMAX_NETWORK_ID = 0xFFFF;
+    static constexpr uint32_t kMaxLedgerSeq = 0x0FFF'FFFF;
+    static constexpr uint32_t kMaxTxnIndex = 0xFFFF;
+    static constexpr uint32_t kMaxNetworkId = 0xFFFF;
 
-    if (ledgerSeq > kMAX_LEDGER_SEQ || txnIndex > kMAX_TXN_INDEX || networkID > kMAX_NETWORK_ID)
+    if (ledgerSeq > kMaxLedgerSeq || txnIndex > kMaxTxnIndex || networkID > kMaxNetworkId)
         return std::nullopt;
 
     uint64_t const ctidValue = ((0xC000'0000ULL + static_cast<uint64_t>(ledgerSeq)) << 32) |
@@ -68,8 +68,8 @@ decodeCTID(T const ctid) noexcept
         if (ctidString.size() != 16)
             return std::nullopt;
 
-        static boost::regex const kHEX_REGEX("^[0-9A-Fa-f]{16}$");
-        if (!boost::regex_match(ctidString, kHEX_REGEX))
+        static boost::regex const kHexRegex("^[0-9A-Fa-f]{16}$");
+        if (!boost::regex_match(ctidString, kHexRegex))
             return std::nullopt;
 
         try
@@ -94,9 +94,9 @@ decodeCTID(T const ctid) noexcept
     }
 
     // Validate CTID prefix.
-    constexpr uint64_t kCTID_PREFIX_MASK = 0xF000'0000'0000'0000ULL;
-    constexpr uint64_t kCTID_PREFIX = 0xC000'0000'0000'0000ULL;
-    if ((ctidValue & kCTID_PREFIX_MASK) != kCTID_PREFIX)
+    static constexpr uint64_t kCtidPrefixMask = 0xF000'0000'0000'0000ULL;
+    static constexpr uint64_t kCtidPrefix = 0xC000'0000'0000'0000ULL;
+    if ((ctidValue & kCtidPrefixMask) != kCtidPrefix)
         return std::nullopt;
 
     uint32_t const ledgerSeq = static_cast<uint32_t>((ctidValue >> 32) & 0x0FFF'FFFF);
diff --git a/src/xrpld/rpc/detail/AccountAssets.cpp b/src/xrpld/rpc/detail/AccountAssets.cpp
index 5bc4360a0e..67b9174fe3 100644
--- a/src/xrpld/rpc/detail/AccountAssets.cpp
+++ b/src/xrpld/rpc/detail/AccountAssets.cpp
@@ -32,7 +32,7 @@ accountSourceAssets(
             auto& saBalance = rspEntry.getBalance();
 
             // Filter out non
-            if (saBalance > beast::kZERO
+            if (saBalance > beast::kZero
                 // Have IOUs to send.
                 || (rspEntry.getLimitPeer()
                     // Peer extends credit.
diff --git a/src/xrpld/rpc/detail/Handler.cpp b/src/xrpld/rpc/detail/Handler.cpp
index 938e2e645d..23eb8fdeec 100644
--- a/src/xrpld/rpc/detail/Handler.cpp
+++ b/src/xrpld/rpc/detail/Handler.cpp
@@ -75,7 +75,7 @@ handlerFrom()
         HandlerImpl::maxApiVer};
 }
 
-Handler const kHANDLER_ARRAY[]{
+Handler const kHandlerArray[]{
     // Some handlers not specified here are added to the table via addHandler()
     // Request-response methods
     {.name = "account_info",
@@ -382,7 +382,7 @@ private:
     {
         XRPL_ASSERT(minVer <= maxVer, "xrpl::RPC::HandlerTable : valid API version range");
         XRPL_ASSERT(
-            maxVer <= RPC::kAPI_MAXIMUM_VALID_VERSION,
+            maxVer <= RPC::kApiMaximumValidVersion,
             "xrpl::RPC::HandlerTable : valid max API version");
 
         return std::any_of(
@@ -418,15 +418,15 @@ public:
     static HandlerTable const&
     instance()
     {
-        static HandlerTable const kHANDLER_TABLE(kHANDLER_ARRAY);
-        return kHANDLER_TABLE;
+        static HandlerTable const kHandlerTable(kHandlerArray);
+        return kHandlerTable;
     }
 
     [[nodiscard]] Handler const*
     getHandler(unsigned version, bool betaEnabled, std::string const& name) const
     {
-        if (version < RPC::kAPI_MINIMUM_SUPPORTED_VERSION ||
-            version > (betaEnabled ? RPC::kAPI_BETA_VERSION : RPC::kAPI_MAXIMUM_SUPPORTED_VERSION))
+        if (version < RPC::kApiMinimumSupportedVersion ||
+            version > (betaEnabled ? RPC::kApiBetaVersion : RPC::kApiMaximumSupportedVersion))
             return nullptr;
 
         auto const range = table_.equal_range(name);
@@ -455,8 +455,8 @@ private:
     addHandler()
     {
         static_assert(HandlerImpl::minApiVer <= HandlerImpl::maxApiVer);
-        static_assert(HandlerImpl::maxApiVer <= RPC::kAPI_MAXIMUM_VALID_VERSION);
-        static_assert(RPC::kAPI_MINIMUM_SUPPORTED_VERSION <= HandlerImpl::minApiVer);
+        static_assert(HandlerImpl::maxApiVer <= RPC::kApiMaximumValidVersion);
+        static_assert(RPC::kApiMinimumSupportedVersion <= HandlerImpl::minApiVer);
 
         if (overlappingApiVersion(
                 table_.equal_range(HandlerImpl::name),
diff --git a/src/xrpld/rpc/detail/Handler.h b/src/xrpld/rpc/detail/Handler.h
index 5140f5d6be..140f421ed3 100644
--- a/src/xrpld/rpc/detail/Handler.h
+++ b/src/xrpld/rpc/detail/Handler.h
@@ -32,8 +32,8 @@ struct Handler
     Role role;
     RPC::Condition condition;
 
-    unsigned minApiVer = kAPI_MINIMUM_SUPPORTED_VERSION;
-    unsigned maxApiVer = kAPI_MAXIMUM_VALID_VERSION;
+    unsigned minApiVer = kApiMinimumSupportedVersion;
+    unsigned maxApiVer = kApiMaximumValidVersion;
 };
 
 Handler const*
@@ -80,7 +80,7 @@ conditionMet(Condition conditionRequired, T& context)
 
     if (!context.app.config().standalone() && conditionRequired != Condition::NoCondition)
     {
-        if (context.ledgerMaster.getValidatedLedgerAge() > Tuning::kMAX_VALIDATED_LEDGER_AGE)
+        if (context.ledgerMaster.getValidatedLedgerAge() > Tuning::kMaxValidatedLedgerAge)
         {
             if (context.apiVersion == 1)
                 return RpcNoCurrent;
diff --git a/src/xrpld/rpc/detail/LegacyPathFind.cpp b/src/xrpld/rpc/detail/LegacyPathFind.cpp
index 83c7c30549..0bfa19a1f4 100644
--- a/src/xrpld/rpc/detail/LegacyPathFind.cpp
+++ b/src/xrpld/rpc/detail/LegacyPathFind.cpp
@@ -21,13 +21,13 @@ LegacyPathFind::LegacyPathFind(bool isAdmin, Application& app)
     }
 
     auto const& jobCount = app.getJobQueue().getJobCountGE(JtClient);
-    if (jobCount > Tuning::kMAX_PATHFIND_JOB_COUNT || app.getFeeTrack().isLoadedLocal())
+    if (jobCount > Tuning::kMaxPathfindJobCount || app.getFeeTrack().isLoadedLocal())
         return;
 
     while (true)
     {
         int prevVal = inProgress.load();
-        if (prevVal >= Tuning::kMAX_PATHFINDS_IN_PROGRESS)
+        if (prevVal >= Tuning::kMaxPathfindsInProgress)
             return;
 
         if (inProgress.compare_exchange_strong(
diff --git a/src/xrpld/rpc/detail/PathRequest.cpp b/src/xrpld/rpc/detail/PathRequest.cpp
index 7aaf45c50f..6207b3393f 100644
--- a/src/xrpld/rpc/detail/PathRequest.cpp
+++ b/src/xrpld/rpc/detail/PathRequest.cpp
@@ -180,7 +180,7 @@ PathRequest::isValid(std::shared_ptr<AssetCache> const& crCache)
     if (!raSrcAccount_ || !raDstAccount_)
         return false;
 
-    if (!convert_all_ && (saSendMax_ || saDstAmount_ <= beast::kZERO))
+    if (!convert_all_ && (saSendMax_ || saDstAmount_ <= beast::kZero))
     {
         // If send max specified, dst amt must be -1.
         jvStatus_ = rpcError(RpcDstAmtMalformed);
@@ -314,7 +314,7 @@ PathRequest::parseJson(json::Value const& jvParams)
 
     convert_all_ = saDstAmount_ == STAmount(saDstAmount_.asset(), 1u, 0, true);
 
-    if (!validAsset(saDstAmount_.asset()) || (!convert_all_ && saDstAmount_ <= beast::kZERO))
+    if (!validAsset(saDstAmount_.asset()) || (!convert_all_ && saDstAmount_ <= beast::kZero))
     {
         jvStatus_ = rpcError(RpcDstAmtMalformed);
         return PFR_PJ_INVALID;
@@ -332,7 +332,7 @@ PathRequest::parseJson(json::Value const& jvParams)
         saSendMax_.emplace();
         if (!amountFromJsonNoThrow(*saSendMax_, jvParams[jss::send_max]) ||
             !validAsset(saSendMax_->asset()) ||
-            (*saSendMax_ <= beast::kZERO &&
+            (*saSendMax_ <= beast::kZero &&
              *saSendMax_ != STAmount(saSendMax_->asset(), 1u, 0, true)))
         {
             jvStatus_ = rpcError(RpcSendmaxMalformed);
@@ -344,7 +344,7 @@ PathRequest::parseJson(json::Value const& jvParams)
     {
         json::Value const& jvSrcCurrencies = jvParams[jss::source_currencies];
         if (!jvSrcCurrencies.isArray() || jvSrcCurrencies.size() == 0 ||
-            jvSrcCurrencies.size() > RPC::Tuning::kMAX_SRC_CUR)
+            jvSrcCurrencies.size() > RPC::Tuning::kMaxSrcCur)
         {
             jvStatus_ = rpcError(RpcSrcCurMalformed);
             return PFR_PJ_INVALID;
@@ -523,7 +523,7 @@ PathRequest::getPathFinder(
     // NOLINTEND(bugprone-unchecked-optional-access)
     if (pathfinder->findPaths(level, continueCallback))
     {
-        pathfinder->computePathRanks(kMAX_PATHS, continueCallback);
+        pathfinder->computePathRanks(kMaxPaths, continueCallback);
     }
     else
     {
@@ -556,7 +556,7 @@ PathRequest::findPaths(
                     [&]<typename TAsset>(TAsset const& a) {
                         if (!sameAccount || a != saDstAmount_.asset())
                         {
-                            if (sourceAssets.size() >= RPC::Tuning::kMAX_AUTO_SRC_CUR)
+                            if (sourceAssets.size() >= RPC::Tuning::kMaxAutoSrcCur)
                                 return false;
                             if constexpr (std::is_same_v<TAsset, Currency>)
                             {
@@ -596,7 +596,7 @@ PathRequest::findPaths(
 
         STPath fullLiquidityPath;
         auto ps = pathfinder->getBestPaths(
-            kMAX_PATHS, fullLiquidityPath, context_[asset], asset.getIssuer(), continueCallback);
+            kMaxPaths, fullLiquidityPath, context_[asset], asset.getIssuer(), continueCallback);
         context_[asset] = ps;
 
         auto const& sourceAccount = [&] {
diff --git a/src/xrpld/rpc/detail/PathRequest.h b/src/xrpld/rpc/detail/PathRequest.h
index b74d4c6ade..17381c5ea5 100644
--- a/src/xrpld/rpc/detail/PathRequest.h
+++ b/src/xrpld/rpc/detail/PathRequest.h
@@ -155,7 +155,7 @@ private:
     std::chrono::steady_clock::time_point quick_reply_;
     std::chrono::steady_clock::time_point full_reply_;
 
-    static unsigned int const kMAX_PATHS = 4;
+    static unsigned int const kMaxPaths = 4;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/detail/Pathfinder.cpp b/src/xrpld/rpc/detail/Pathfinder.cpp
index 21f232614b..e949c9b6ff 100644
--- a/src/xrpld/rpc/detail/Pathfinder.cpp
+++ b/src/xrpld/rpc/detail/Pathfinder.cpp
@@ -94,14 +94,14 @@ namespace {
 
 // This is an arbitrary cutoff, and it might cause us to miss other
 // good paths with this arbitrary cut off.
-constexpr std::size_t kPATHFINDER_MAX_COMPLETE_PATHS = 1000;
+constexpr std::size_t kPathfinderMaxCompletePaths = 1000;
 
 struct AccountCandidate
 {
     int priority;
     AccountID account;
 
-    static int const kHIGH_PRIORITY = 10000;
+    static int const kHighPriority = 10000;
 };
 
 bool
@@ -242,7 +242,7 @@ bool
 Pathfinder::findPaths(int searchLevel, std::function<bool(void)> const& continueCallback)
 {
     JLOG(j_.trace()) << "findPaths start";
-    if (dstAmount_ == beast::kZERO)
+    if (dstAmount_ == beast::kZero)
     {
         // No need to send zero money.
         JLOG(j_.debug()) << "Destination amount was zero.";
@@ -367,7 +367,7 @@ Pathfinder::findPaths(int searchLevel, std::function<bool(void)> const& continue
             JLOG(j_.trace()) << "findPaths trying payment type " << paymentType;
             addPathsForType(costedPath.type, continueCallback);
 
-            if (completePaths_.size() > kPATHFINDER_MAX_COMPLETE_PATHS)
+            if (completePaths_.size() > kPathfinderMaxCompletePaths)
                 break;
         }
     }
@@ -722,7 +722,7 @@ Pathfinder::getBestPaths(
         }
     }
 
-    if (remaining > beast::kZERO)
+    if (remaining > beast::kZero)
     {
         XRPL_ASSERT(
             fullLiquidityPath.empty(), "xrpl::Pathfinder::getBestPaths : second empty path result");
@@ -795,7 +795,7 @@ Pathfinder::getPathsOut(
                         {
                         }
                         else if (
-                            rspEntry.getBalance() <= beast::kZERO &&
+                            rspEntry.getBalance() <= beast::kZero &&
                             (!rspEntry.getLimitPeer() ||
                              -rspEntry.getBalance() >= rspEntry.getLimitPeer() ||
                              (bAuthRequired && !rspEntry.getAuth())))
@@ -910,26 +910,26 @@ Pathfinder::addPathsForType(
             break;
 
         case NodeType::Accounts:
-            addLinks(parentPaths, pathsOut, kAF_ADD_ACCOUNTS, continueCallback);
+            addLinks(parentPaths, pathsOut, kAfAddAccounts, continueCallback);
             break;
 
         case NodeType::Books:
-            addLinks(parentPaths, pathsOut, kAF_ADD_BOOKS, continueCallback);
+            addLinks(parentPaths, pathsOut, kAfAddBooks, continueCallback);
             break;
 
         case NodeType::XrpBook:
-            addLinks(parentPaths, pathsOut, kAF_ADD_BOOKS | kAF_OB_XRP, continueCallback);
+            addLinks(parentPaths, pathsOut, kAfAddBooks | kAfObXrp, continueCallback);
             break;
 
         case NodeType::DestBook:
-            addLinks(parentPaths, pathsOut, kAF_ADD_BOOKS | kAF_OB_LAST, continueCallback);
+            addLinks(parentPaths, pathsOut, kAfAddBooks | kAfObLast, continueCallback);
             break;
 
         case NodeType::Destination:
             // FIXME: What if a different issuer was specified on the
             // destination amount?
             // TODO(tom): what does this even mean?  Should it be a JIRA?
-            addLinks(parentPaths, pathsOut, kAF_ADD_ACCOUNTS | kAF_AC_LAST, continueCallback);
+            addLinks(parentPaths, pathsOut, kAfAddAccounts | kAfAcLast, continueCallback);
             break;
     }
 
@@ -1013,7 +1013,7 @@ Pathfinder::addLink(
                      << " completePaths size=" << completePaths_.size();
     JLOG(j_.trace()) << currentPath.getJson(JsonOptions::Values::None);
 
-    if ((addFlags & kAF_ADD_ACCOUNTS) != 0u)
+    if ((addFlags & kAfAddAccounts) != 0u)
     {
         // add accounts
         if (bOnXRP)
@@ -1035,16 +1035,16 @@ Pathfinder::addLink(
                 bool const bRequireAuth(sleEnd->isFlag(lsfRequireAuth));
                 bool const bIsEndAsset(uEndPathAsset == dstAmount_.asset());
                 bool const bIsNoRippleOut(isNoRippleOut(currentPath));
-                bool const bDestOnly((addFlags & kAF_AC_LAST) != 0u);
+                bool const bDestOnly((addFlags & kAfAcLast) != 0u);
 
                 AccountCandidates candidates;
 
                 auto forAssets = [&]<typename AssetType>(AssetType const& assets) {
                     candidates.reserve(assets.size());
 
-                    static bool constexpr kIS_LINE =
+                    static constexpr bool kIsLine =
                         std::is_same_v<AssetType, std::vector<PathFindTrustLine>>;
-                    static bool constexpr kIS_MPT =
+                    static constexpr bool kIsMpt =
                         std::is_same_v<AssetType, std::vector<PathFindMPT>>;
 
                     for (auto const& asset : assets)
@@ -1052,14 +1052,14 @@ Pathfinder::addLink(
                         if (continueCallback && !continueCallback())
                             return;
                         auto const& acct = [&]() constexpr {
-                            if constexpr (kIS_LINE)
+                            if constexpr (kIsLine)
                                 return asset.getAccountIDPeer();
                             // Unlike trustline, MPT is not bidirectional
-                            if constexpr (kIS_MPT)
+                            if constexpr (kIsMpt)
                                 return getMPTIssuer(asset);
                         }();
                         auto const direction = [&]() constexpr -> LineDirection {
-                            if constexpr (kIS_LINE)
+                            if constexpr (kIsLine)
                                 return asset.getDirectionPeer();
                             // incoming for MPT since MPT doesn't support
                             // rippling (see LineDirection comments)
@@ -1080,27 +1080,27 @@ Pathfinder::addLink(
                         }
 
                         auto const correctAsset = [&]() {
-                            if constexpr (kIS_LINE)
+                            if constexpr (kIsLine)
                             {
                                 return uEndPathAsset.get<Currency>() ==
                                     asset.getLimit().template get<Issue>().currency;
                             }
-                            if constexpr (kIS_MPT)
+                            if constexpr (kIsMpt)
                             {
                                 return uEndPathAsset.get<MPTID>() == asset.getMptID();
                             }
                         }();
                         auto checkAsset = [&]() {
-                            if constexpr (kIS_LINE)
+                            if constexpr (kIsLine)
                             {
                                 return (
-                                    (asset.getBalance() <= beast::kZERO &&
+                                    (asset.getBalance() <= beast::kZero &&
                                      (!asset.getLimitPeer() ||
                                       -asset.getBalance() >= asset.getLimitPeer() ||
                                       (bRequireAuth && !asset.getAuth()))) ||
                                     (bIsNoRippleOut && asset.getNoRipple()));
                             }
-                            if constexpr (kIS_MPT)
+                            if constexpr (kIsMpt)
                             {
                                 return asset.isZeroBalance() || asset.isMaxedOut() ||
                                     requireAuth(*ledger_, MPTIssue{asset}, acct);
@@ -1132,7 +1132,7 @@ Pathfinder::addLink(
                                 else if (!bDestOnly)
                                 {
                                     // this is a high-priority candidate
-                                    candidates.push_back({AccountCandidate::kHIGH_PRIORITY, acct});
+                                    candidates.push_back({AccountCandidate::kHighPriority, acct});
                                 }
                             }
                             else if (acct == srcAccount_)
@@ -1212,10 +1212,10 @@ Pathfinder::addLink(
             }
         }
     }
-    if ((addFlags & kAF_ADD_BOOKS) != 0u)
+    if ((addFlags & kAfAddBooks) != 0u)
     {
         // add order books
-        if ((addFlags & kAF_OB_XRP) != 0u)
+        if ((addFlags & kAfObXrp) != 0u)
         {
             // to XRP only
             if (!bOnXRP &&
@@ -1229,7 +1229,7 @@ Pathfinder::addLink(
         }
         else
         {
-            bool const bDestOnly = (addFlags & kAF_OB_LAST) != 0;
+            bool const bDestOnly = (addFlags & kAfObLast) != 0;
             auto books = app_.getOrderBookDB().getBooksByTakerPays(
                 assetFromPathAsset(uEndPathAsset, uEndIssuer), domain_);
             JLOG(j_.trace()) << books.size() << " books found from this currency/issuer";
diff --git a/src/xrpld/rpc/detail/Pathfinder.h b/src/xrpld/rpc/detail/Pathfinder.h
index ba1fc453b3..de2c2d83e6 100644
--- a/src/xrpld/rpc/detail/Pathfinder.h
+++ b/src/xrpld/rpc/detail/Pathfinder.h
@@ -196,19 +196,19 @@ private:
     beast::Journal const j_;
 
     // Add ripple paths
-    static std::uint32_t const kAF_ADD_ACCOUNTS = 0x001;
+    static std::uint32_t const kAfAddAccounts = 0x001;
 
     // Add order books
-    static std::uint32_t const kAF_ADD_BOOKS = 0x002;
+    static std::uint32_t const kAfAddBooks = 0x002;
 
     // Add order book to XRP only
-    static std::uint32_t const kAF_OB_XRP = 0x010;
+    static std::uint32_t const kAfObXrp = 0x010;
 
     // Must link to destination currency
-    static std::uint32_t const kAF_OB_LAST = 0x040;
+    static std::uint32_t const kAfObLast = 0x040;
 
     // Destination account only
-    static std::uint32_t const kAF_AC_LAST = 0x080;
+    static std::uint32_t const kAfAcLast = 0x080;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/detail/PathfinderUtils.h b/src/xrpld/rpc/detail/PathfinderUtils.h
index ff47de3217..a703127148 100644
--- a/src/xrpld/rpc/detail/PathfinderUtils.h
+++ b/src/xrpld/rpc/detail/PathfinderUtils.h
@@ -10,10 +10,10 @@ largestAmount(STAmount const& amt)
     return amt.asset().visit(
         [&](Issue const& issue) -> STAmount {
             if (issue.native())
-                return kINITIAL_XRP;
-            return STAmount(amt.asset(), STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
+                return kInitialXrp;
+            return STAmount(amt.asset(), STAmount::kMaxValue, STAmount::kMaxOffset);
         },
-        [&](MPTIssue const&) { return STAmount(amt.asset(), kMAX_MP_TOKEN_AMOUNT, 0); });
+        [&](MPTIssue const&) { return STAmount(amt.asset(), kMaxMpTokenAmount, 0); });
 }
 
 inline STAmount
diff --git a/src/xrpld/rpc/detail/RPCCall.cpp b/src/xrpld/rpc/detail/RPCCall.cpp
index bbeb132b7a..24fcc652df 100644
--- a/src/xrpld/rpc/detail/RPCCall.cpp
+++ b/src/xrpld/rpc/detail/RPCCall.cpp
@@ -128,11 +128,11 @@ private:
         // optionally followed by a forward slash and some other characters
         // (the issuer).
         // https://www.boost.org/doc/libs/1_82_0/libs/regex/doc/html/boost_regex/syntax/perl_syntax.html
-        static boost::regex const kRE_CUR_ISS("\\`([][:alnum:]<>(){}[|?!@#$%^&*]{3})(?:/(.+))?\\'");
+        static boost::regex const kReCurIss("\\`([][:alnum:]<>(){}[|?!@#$%^&*]{3})(?:/(.+))?\\'");
 
         boost::smatch smMatch;
 
-        if (boost::regex_match(strCurrencyIssuer, smMatch, kRE_CUR_ISS))
+        if (boost::regex_match(strCurrencyIssuer, smMatch, kReCurIss))
         {
             json::Value jvResult(json::ValueType::Object);
             std::string const strCurrency = smMatch[1];
@@ -900,7 +900,7 @@ private:
     parseVault(json::Value const& jvParams)
     {
         std::string const strVaultID = jvParams[0u].asString();
-        uint256 id = beast::kZERO;
+        uint256 id = beast::kZero;
         if (!id.parseHex(strVaultID))
             return rpcError(RpcInvalidParams);
 
@@ -1269,7 +1269,7 @@ public:
             int maxParams;
         };
 
-        static constexpr Command kCOMMANDS[] = {
+        static constexpr Command kCommands[] = {
             // Request-response methods
             // - Returns an error, or the request.
             // - To modify the method, provide a new method in the request.
@@ -1483,7 +1483,7 @@ public:
 
         auto const count = jvParams.size();
 
-        for (auto const& command : kCOMMANDS)
+        for (auto const& command : kCommands)
         {
             if (strMethod == command.name)
             {
@@ -1818,7 +1818,7 @@ namespace RPCCall {
 int
 fromCommandLine(Config const& config, std::vector<std::string> const& vCmd, Logs& logs)
 {
-    auto const result = rpcClient(vCmd, config, logs, RPC::kAPI_COMMAND_LINE_VERSION);
+    auto const result = rpcClient(vCmd, config, logs, RPC::kApiCommandLineVersion);
 
     std::cout << result.second.toStyledString();
 
@@ -1860,10 +1860,10 @@ fromNetwork(
 
     // Number of bytes to try to receive if no
     // Content-Length header received
-    constexpr auto kRPC_REPLY_MAX_BYTES = megabytes(256);
+    constexpr auto kRpcReplyMaxBytes = megabytes(256);
 
     using namespace std::chrono_literals;
-    auto constexpr kRPC_WEBHOOK_TIMEOUT = 30s;
+    static constexpr auto kRpcWebhookTimeout = 30s;
 
     HTTPClient::request(
         bSSL,
@@ -1879,8 +1879,8 @@ fromNetwork(
             std::placeholders::_1,
             std::placeholders::_2,
             j),
-        kRPC_REPLY_MAX_BYTES,
-        kRPC_WEBHOOK_TIMEOUT,
+        kRpcReplyMaxBytes,
+        kRpcWebhookTimeout,
         std::bind(
             &RPCCallImp::onResponse,
             callbackFuncP,
diff --git a/src/xrpld/rpc/detail/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp
index fb99aa682a..6b032317d3 100644
--- a/src/xrpld/rpc/detail/RPCHandler.cpp
+++ b/src/xrpld/rpc/detail/RPCHandler.cpp
@@ -114,7 +114,7 @@ fillHandler(JsonContext& context, Handler const*& result)
     {
         // Count all jobs at jtCLIENT priority or higher.
         int const jobCount = context.app.getJobQueue().getJobCountGE(JtClient);
-        if (jobCount > Tuning::kMAX_JOB_QUEUE_CLIENTS)
+        if (jobCount > Tuning::kMaxJobQueueClients)
         {
             JLOG(context.j.debug()) << "Too busy for command: " << jobCount;
             return RpcTooBusy;
@@ -157,9 +157,9 @@ template <class Object, class Method>
 Status
 callMethod(JsonContext& context, Method method, std::string const& name, Object& result)
 {
-    static std::atomic<std::uint64_t> kREQUEST_ID{0};
+    static std::atomic<std::uint64_t> kRequestId{0};
     auto& perfLog = context.app.getPerfLog();
-    std::uint64_t const curId = ++kREQUEST_ID;
+    std::uint64_t const curId = ++kRequestId;
     try
     {
         perfLog.rpcStart(name, curId);
@@ -179,8 +179,8 @@ callMethod(JsonContext& context, Method method, std::string const& name, Object&
         perfLog.rpcError(name, curId);
         JLOG(context.j.info()) << "Caught throw: " << e.what();
 
-        if (context.loadType == Resource::kFEE_REFERENCE_RPC)
-            context.loadType = Resource::kFEE_EXCEPTION_RPC;
+        if (context.loadType == Resource::kFeeReferenceRpc)
+            context.loadType = Resource::kFeeExceptionRpc;
 
         injectError(RpcInternal, result);
         return RpcInternal;
diff --git a/src/xrpld/rpc/detail/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp
index 84ecd4e607..d48057a0a8 100644
--- a/src/xrpld/rpc/detail/RPCHelpers.cpp
+++ b/src/xrpld/rpc/detail/RPCHelpers.cpp
@@ -164,7 +164,7 @@ getSeedFromRPC(json::Value const& params, json::Value& error)
     using string_to_seed_t = std::function<std::optional<Seed>(std::string const&)>;
     using seed_match_t = std::pair<char const*, string_to_seed_t>;
 
-    static seed_match_t const kSEED_TYPES[]{
+    static seed_match_t const kSeedTypes[]{
         {jss::passphrase.cStr(), [](std::string const& s) { return parseGenericSeed(s); }},
         {jss::seed.cStr(), [](std::string const& s) { return parseBase58<Seed>(s); }},
         {jss::seed_hex.cStr(), [](std::string const& s) {
@@ -177,7 +177,7 @@ getSeedFromRPC(json::Value const& params, json::Value& error)
     // Identify which seed type is in use.
     seed_match_t const* seedType = nullptr;
     int count = 0;
-    for (auto const& t : kSEED_TYPES)
+    for (auto const& t : kSeedTypes)
     {
         if (params.isMember(t.first))
         {
@@ -219,13 +219,13 @@ keypairForSignature(json::Value const& params, json::Value& error, unsigned int
     bool const hasKeyType = params.isMember(jss::key_type);
 
     // All of the secret types we allow, but only one at a time.
-    static char const* const kSECRET_TYPES[]{
+    static char const* const kSecretTypes[]{
         jss::passphrase.cStr(), jss::secret.cStr(), jss::seed.cStr(), jss::seed_hex.cStr()};
 
     // Identify which secret type is in use.
     char const* secretType = nullptr;
     int count = 0;
-    for (auto t : kSECRET_TYPES)
+    for (auto t : kSecretTypes)
     {
         if (params.isMember(t))
         {
@@ -351,7 +351,7 @@ chooseLedgerEntryType(json::Value const& params)
     std::pair<RPC::Status, LedgerEntryType> result{RPC::Status::kOK, ltANY};
     if (params.isMember(jss::type))
     {
-        static constexpr auto kTYPES =
+        static constexpr auto kTypes =
             std::to_array<std::tuple<char const*, char const*, LedgerEntryType>>({
 #pragma push_macro("LEDGER_ENTRY")
 #undef LEDGER_ENTRY
@@ -378,10 +378,10 @@ chooseLedgerEntryType(json::Value const& params)
         // against the canonical name (case-insensitive) or the RPC name
         // (case-sensitive).
         auto const filter = p.asString();
-        auto const iter = std::ranges::find_if(kTYPES, [&filter](decltype(kTYPES.front())& t) {
+        auto const iter = std::ranges::find_if(kTypes, [&filter](decltype(kTypes.front())& t) {
             return boost::iequals(std::get<0>(t), filter) || std::get<1>(t) == filter;
         });
-        if (iter == kTYPES.end())
+        if (iter == kTypes.end())
         {
             result.first = RPC::Status{RpcInvalidParams, "Invalid field 'type'."};
             XRPL_ASSERT(
diff --git a/src/xrpld/rpc/detail/RPCHelpers.h b/src/xrpld/rpc/detail/RPCHelpers.h
index cdebd592c7..781db1b8a5 100644
--- a/src/xrpld/rpc/detail/RPCHelpers.h
+++ b/src/xrpld/rpc/detail/RPCHelpers.h
@@ -152,7 +152,7 @@ std::optional<std::pair<PublicKey, SecretKey>>
 keypairForSignature(
     json::Value const& params,
     json::Value& error,
-    unsigned int apiVersion = kAPI_VERSION_IF_UNSPECIFIED);
+    unsigned int apiVersion = kApiVersionIfUnspecified);
 
 /** Parse subscribe/unsubscribe parameters
  */
diff --git a/src/xrpld/rpc/detail/RPCLedgerHelpers.cpp b/src/xrpld/rpc/detail/RPCLedgerHelpers.cpp
index 467546098d..4d0d10a66b 100644
--- a/src/xrpld/rpc/detail/RPCLedgerHelpers.cpp
+++ b/src/xrpld/rpc/detail/RPCLedgerHelpers.cpp
@@ -36,7 +36,7 @@ isValidatedOld(LedgerMaster& ledgerMaster, bool standalone)
     if (standalone)
         return false;
 
-    return ledgerMaster.getValidatedLedgerAge() > Tuning::kMAX_VALIDATED_LEDGER_AGE;
+    return ledgerMaster.getValidatedLedgerAge() > Tuning::kMaxValidatedLedgerAge;
 }
 
 template <class T>
@@ -304,9 +304,9 @@ getLedger(T& ledger, LedgerShortcut shortcut, Context const& context)
             return {RpcNotSynced, "notSynced"};
         }
 
-        static auto const kMIN_SEQUENCE_GAP = 10;
+        static auto const kMinSequenceGap = 10;
 
-        if (ledger->header().seq + kMIN_SEQUENCE_GAP < context.ledgerMaster.getValidLedgerIndex())
+        if (ledger->header().seq + kMinSequenceGap < context.ledgerMaster.getValidLedgerIndex())
         {
             ledger.reset();
             if (context.apiVersion == 1)
@@ -412,7 +412,7 @@ getOrAcquireLedger(RPC::JsonContext const& context)
             return Unexpected(RPC::expectedFieldError(jss::ledger_index, "number"));
 
         // We need a validated ledger to get the hash from the sequence
-        if (ledgerMaster.getValidatedLedgerAge() > RPC::Tuning::kMAX_VALIDATED_LEDGER_AGE)
+        if (ledgerMaster.getValidatedLedgerAge() > RPC::Tuning::kMaxValidatedLedgerAge)
         {
             if (context.apiVersion == 1)
                 return Unexpected(rpcError(RpcNoCurrent));
@@ -471,7 +471,7 @@ getOrAcquireLedger(RPC::JsonContext const& context)
             neededHash = hashOfSeq(*ledger, ledgerIndex, j);
         }
         XRPL_ASSERT(neededHash, "xrpl::RPC::getOrAcquireLedger : nonzero needed hash");
-        ledgerHash = neededHash ? *neededHash : beast::kZERO;  // kludge
+        ledgerHash = neededHash ? *neededHash : beast::kZero;  // kludge
     }
 
     // Try to get the desired ledger
diff --git a/src/xrpld/rpc/detail/Role.cpp b/src/xrpld/rpc/detail/Role.cpp
index 638ef22630..dcc6965d58 100644
--- a/src/xrpld/rpc/detail/Role.cpp
+++ b/src/xrpld/rpc/detail/Role.cpp
@@ -259,7 +259,7 @@ forwardedFor(http_request_type const& request)
 
         // Look for the first (case insensitive) "for=" at a directive
         // boundary (start of value, or preceded by , ; or OWS).
-        static constexpr std::string_view kFOR_STR{"for="};
+        static constexpr std::string_view kForStr{"for="};
         auto const atFieldBoundary = [begin = it->value().begin()](auto p) {
             return p == begin || p[-1] == ';' || p[-1] == ',' || p[-1] == ' ' || p[-1] == '\t';
         };
@@ -269,8 +269,8 @@ forwardedFor(http_request_type const& request)
             found = std::search(
                 found,
                 it->value().end(),
-                kFOR_STR.begin(),
-                kFOR_STR.end(),
+                kForStr.begin(),
+                kForStr.end(),
                 [&asciiToLower](char c1, char c2) { return asciiToLower(c1) == asciiToLower(c2); });
 
             if (found == it->value().end())
@@ -282,7 +282,7 @@ forwardedFor(http_request_type const& request)
             ++found;
         }
 
-        std::advance(found, kFOR_STR.size());
+        std::advance(found, kForStr.size());
 
         // We found a "for=".  Scan for the end of the IP address.
         auto const end = it->value().end();
diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp
index 2b49b06394..2ed6630af2 100644
--- a/src/xrpld/rpc/detail/ServerHandler.cpp
+++ b/src/xrpld/rpc/detail/ServerHandler.cpp
@@ -337,8 +337,7 @@ ServerHandler::onWSMessage(
 {
     json::Value jv;
     auto const size = boost::asio::buffer_size(buffers);
-    if (size > RPC::Tuning::kMAX_REQUEST_SIZE || !json::Reader{}.parse(jv, buffers) ||
-        !jv.isObject())
+    if (size > RPC::Tuning::kMaxRequestSize || !json::Reader{}.parse(jv, buffers) || !jv.isObject())
     {
         json::Value jvResult(json::ValueType::Object);
         jvResult[jss::type] = jss::error;
@@ -427,11 +426,11 @@ ServerHandler::processSession(
 
     // Requests without "command" are invalid.
     json::Value jr(json::ValueType::Object);
-    Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
+    Resource::Charge loadType = Resource::kFeeReferenceRpc;
     try
     {
         auto apiVersion = RPC::getAPIVersionNumber(jv, app_.config().BETA_RPC_API);
-        if (apiVersion == RPC::kAPI_INVALID_VERSION ||
+        if (apiVersion == RPC::kApiInvalidVersion ||
             (!jv.isMember(jss::command) && !jv.isMember(jss::method)) ||
             (jv.isMember(jss::command) && !jv[jss::command].isString()) ||
             (jv.isMember(jss::method) && !jv[jss::method].isString()) ||
@@ -440,8 +439,8 @@ ServerHandler::processSession(
         {
             jr[jss::type] = jss::response;
             jr[jss::status] = jss::error;
-            jr[jss::error] = apiVersion == RPC::kAPI_INVALID_VERSION ? jss::invalid_API_version
-                                                                     : jss::missingCommand;
+            jr[jss::error] = apiVersion == RPC::kApiInvalidVersion ? jss::invalid_API_version
+                                                                   : jss::missingCommand;
             jr[jss::request] = jv;
             if (jv.isMember(jss::id))
                 jr[jss::id] = jv[jss::id];
@@ -452,7 +451,7 @@ ServerHandler::processSession(
             if (jv.isMember(jss::api_version))
                 jr[jss::api_version] = jv[jss::api_version];
 
-            is->getConsumer().charge(Resource::kFEE_MALFORMED_RPC);
+            is->getConsumer().charge(Resource::kFeeMalformedRpc);
             return jr;
         }
 
@@ -468,7 +467,7 @@ ServerHandler::processSession(
             is->user());
         if (Role::FORBID == role)
         {
-            loadType = Resource::kFEE_MALFORMED_RPC;
+            loadType = Resource::kFeeMalformedRpc;
             jr[jss::result] = rpcError(RpcForbidden);
         }
         else
@@ -593,10 +592,10 @@ makeJsonError(json::Int code, json::Value&& message)
     return r;
 }
 
-json::Int constexpr kMETHOD_NOT_FOUND = -32601;
-json::Int constexpr kSERVER_OVERLOADED = -32604;
-json::Int constexpr kFORBIDDEN = -32605;
-json::Int constexpr kWRONG_VERSION = -32606;
+constexpr json::Int kMethodNotFound = -32601;
+constexpr json::Int kServerOverloaded = -32604;
+constexpr json::Int kForbidden = -32605;
+constexpr json::Int kWrongVersion = -32606;
 
 void
 ServerHandler::processRequest(
@@ -613,7 +612,7 @@ ServerHandler::processRequest(
     json::Value jsonOrig;
     {
         json::Reader reader;
-        if ((request.size() > RPC::Tuning::kMAX_REQUEST_SIZE) || !reader.parse(request, jsonOrig) ||
+        if ((request.size() > RPC::Tuning::kMaxRequestSize) || !reader.parse(request, jsonOrig) ||
             !jsonOrig || !jsonOrig.isObject())
         {
             httpReply(
@@ -648,12 +647,12 @@ ServerHandler::processRequest(
         {
             json::Value r(json::ValueType::Object);
             r[jss::request] = jsonRPC;
-            r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "Method not found");
+            r[jss::error] = makeJsonError(kMethodNotFound, "Method not found");
             reply.append(r);
             continue;
         }
 
-        unsigned apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED;
+        unsigned apiVersion = RPC::kApiVersionIfUnspecified;
         if (jsonRPC.isMember(jss::params) && jsonRPC[jss::params].isArray() &&
             jsonRPC[jss::params].size() > 0 && jsonRPC[jss::params][0u].isObject())
         {
@@ -661,13 +660,13 @@ ServerHandler::processRequest(
                 jsonRPC[jss::params][json::UInt(0)], app_.config().BETA_RPC_API);
         }
 
-        if (apiVersion == RPC::kAPI_VERSION_IF_UNSPECIFIED && batch)
+        if (apiVersion == RPC::kApiVersionIfUnspecified && batch)
         {
             // for batch request, api_version may be at a different level
             apiVersion = RPC::getAPIVersionNumber(jsonRPC, app_.config().BETA_RPC_API);
         }
 
-        if (apiVersion == RPC::kAPI_INVALID_VERSION)
+        if (apiVersion == RPC::kApiInvalidVersion)
         {
             if (!batch)
             {
@@ -676,7 +675,7 @@ ServerHandler::processRequest(
             }
             json::Value r(json::ValueType::Object);
             r[jss::request] = jsonRPC;
-            r[jss::error] = makeJsonError(kWRONG_VERSION, jss::invalid_API_version.cStr());
+            r[jss::error] = makeJsonError(kWrongVersion, jss::invalid_API_version.cStr());
             reply.append(r);
             continue;
         }
@@ -718,7 +717,7 @@ ServerHandler::processRequest(
                     return;
                 }
                 json::Value r = jsonRPC;
-                r[jss::error] = makeJsonError(kSERVER_OVERLOADED, "Server is overloaded");
+                r[jss::error] = makeJsonError(kServerOverloaded, "Server is overloaded");
                 reply.append(r);
                 continue;
             }
@@ -726,28 +725,28 @@ ServerHandler::processRequest(
 
         if (role == Role::FORBID)
         {
-            usage.charge(Resource::kFEE_MALFORMED_RPC);
+            usage.charge(Resource::kFeeMalformedRpc);
             if (!batch)
             {
                 httpReply(403, "Forbidden", output, rpcJ);
                 return;
             }
             json::Value r = jsonRPC;
-            r[jss::error] = makeJsonError(kFORBIDDEN, "Forbidden");
+            r[jss::error] = makeJsonError(kForbidden, "Forbidden");
             reply.append(r);
             continue;
         }
 
         if (!jsonRPC.isMember(jss::method) || jsonRPC[jss::method].isNull())
         {
-            usage.charge(Resource::kFEE_MALFORMED_RPC);
+            usage.charge(Resource::kFeeMalformedRpc);
             if (!batch)
             {
                 httpReply(400, "Null method", output, rpcJ);
                 return;
             }
             json::Value r = jsonRPC;
-            r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "Null method");
+            r[jss::error] = makeJsonError(kMethodNotFound, "Null method");
             reply.append(r);
             continue;
         }
@@ -755,14 +754,14 @@ ServerHandler::processRequest(
         json::Value const& method = jsonRPC[jss::method];
         if (!method.isString())
         {
-            usage.charge(Resource::kFEE_MALFORMED_RPC);
+            usage.charge(Resource::kFeeMalformedRpc);
             if (!batch)
             {
                 httpReply(400, "method is not string", output, rpcJ);
                 return;
             }
             json::Value r = jsonRPC;
-            r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "method is not string");
+            r[jss::error] = makeJsonError(kMethodNotFound, "method is not string");
             reply.append(r);
             continue;
         }
@@ -770,14 +769,14 @@ ServerHandler::processRequest(
         std::string const strMethod = method.asString();
         if (strMethod.empty())
         {
-            usage.charge(Resource::kFEE_MALFORMED_RPC);
+            usage.charge(Resource::kFeeMalformedRpc);
             if (!batch)
             {
                 httpReply(400, "method is empty", output, rpcJ);
                 return;
             }
             json::Value r = jsonRPC;
-            r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "method is empty");
+            r[jss::error] = makeJsonError(kMethodNotFound, "method is empty");
             reply.append(r);
             continue;
         }
@@ -798,7 +797,7 @@ ServerHandler::processRequest(
             }
             else if (!params.isArray() || params.size() != 1)
             {
-                usage.charge(Resource::kFEE_MALFORMED_RPC);
+                usage.charge(Resource::kFeeMalformedRpc);
                 httpReply(400, "params unparsable", output, rpcJ);
                 return;
             }
@@ -807,7 +806,7 @@ ServerHandler::processRequest(
                 params = std::move(params[0u]);
                 if (!params.isObjectOrNull())
                 {
-                    usage.charge(Resource::kFEE_MALFORMED_RPC);
+                    usage.charge(Resource::kFeeMalformedRpc);
                     httpReply(400, "params unparsable", output, rpcJ);
                     return;
                 }
@@ -823,7 +822,7 @@ ServerHandler::processRequest(
         {
             if (!params[jss::ripplerpc].isString())
             {
-                usage.charge(Resource::kFEE_MALFORMED_RPC);
+                usage.charge(Resource::kFeeMalformedRpc);
                 if (!batch)
                 {
                     httpReply(400, "ripplerpc is not a string", output, rpcJ);
@@ -831,7 +830,7 @@ ServerHandler::processRequest(
                 }
 
                 json::Value r = jsonRPC;
-                r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "ripplerpc is not a string");
+                r[jss::error] = makeJsonError(kMethodNotFound, "ripplerpc is not a string");
                 reply.append(r);
                 continue;
             }
@@ -854,7 +853,7 @@ ServerHandler::processRequest(
         params[jss::command] = strMethod;
         JLOG(journal_.trace()) << "doRpcCommand:" << strMethod << ":" << params;
 
-        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
+        Resource::Charge loadType = Resource::kFeeReferenceRpc;
 
         RPC::JsonContext context{
             {.j = journal_,
@@ -1004,14 +1003,14 @@ ServerHandler::processRequest(
 
     if (auto stream = journal_.debug())
     {
-        static int const kMAX_SIZE = 10000;
-        if (response.size() <= kMAX_SIZE)
+        static int const kMaxSize = 10000;
+        if (response.size() <= kMaxSize)
         {
             stream << "Reply: " << response;
         }
         else
         {
-            stream << "Reply: " << response.substr(0, kMAX_SIZE);
+            stream << "Reply: " << response.substr(0, kMaxSize);
         }
     }
 
diff --git a/src/xrpld/rpc/detail/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp
index 0fdc1bfdc7..4c47914d66 100644
--- a/src/xrpld/rpc/detail/TransactionSign.cpp
+++ b/src/xrpld/rpc/detail/TransactionSign.cpp
@@ -382,7 +382,7 @@ checkTxJsonFields(
     }
 
     // Check for current ledger.
-    if (verify && !config.standalone() && (validatedLedgerAge > Tuning::kMAX_VALIDATED_LEDGER_AGE))
+    if (verify && !config.standalone() && (validatedLedgerAge > Tuning::kMaxValidatedLedgerAge))
     {
         if (apiVersion == 1)
         {
@@ -848,7 +848,7 @@ getTxFee(Application const& app, Config const& config, json::Value tx)
         if (!tx[jss::Signers].isArray())
             return config.FEES.reference_fee;
 
-        if (tx[jss::Signers].size() > STTx::kMAX_MULTI_SIGNERS)
+        if (tx[jss::Signers].size() > STTx::kMaxMultiSigners)
             return config.FEES.reference_fee;
 
         // check multi-signed signers
@@ -945,8 +945,8 @@ checkFee(
     if (!doAutoFill)
         return RPC::missingFieldError("tx_json.Fee");
 
-    int mult = Tuning::kDEFAULT_AUTO_FILL_FEE_MULTIPLIER;
-    int div = Tuning::kDEFAULT_AUTO_FILL_FEE_DIVISOR;
+    int mult = Tuning::kDefaultAutoFillFeeMultiplier;
+    int div = Tuning::kDefaultAutoFillFeeDivisor;
     if (request.isMember(jss::fee_mult_max))
     {
         if (request[jss::fee_mult_max].isInt())
diff --git a/src/xrpld/rpc/detail/TransactionSign.h b/src/xrpld/rpc/detail/TransactionSign.h
index e26c0795b8..1fd9e87b54 100644
--- a/src/xrpld/rpc/detail/TransactionSign.h
+++ b/src/xrpld/rpc/detail/TransactionSign.h
@@ -25,8 +25,8 @@ getCurrentNetworkFee(
     TxQ const& txQ,
     Application const& app,
     json::Value const& tx,
-    int mult = Tuning::kDEFAULT_AUTO_FILL_FEE_MULTIPLIER,
-    int div = Tuning::kDEFAULT_AUTO_FILL_FEE_DIVISOR);
+    int mult = Tuning::kDefaultAutoFillFeeMultiplier,
+    int div = Tuning::kDefaultAutoFillFeeDivisor);
 
 /** Fill in the fee on behalf of the client.
     This is called when the client does not explicitly specify the fee.
diff --git a/src/xrpld/rpc/detail/Tuning.h b/src/xrpld/rpc/detail/Tuning.h
index 45c164efbe..12c09bcb15 100644
--- a/src/xrpld/rpc/detail/Tuning.h
+++ b/src/xrpld/rpc/detail/Tuning.h
@@ -11,57 +11,58 @@ struct LimitRange
 };
 
 /** Limits for the account_lines command. */
-static LimitRange constexpr kACCOUNT_LINES = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static constexpr LimitRange kAccountLines = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the account_channels command. */
-static LimitRange constexpr kACCOUNT_CHANNELS = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static constexpr LimitRange kAccountChannels = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the account_objects command. */
-static LimitRange constexpr kACCOUNT_OBJECTS = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static constexpr LimitRange kAccountObjects = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the account_offers command. */
-static LimitRange constexpr kACCOUNT_OFFERS = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static constexpr LimitRange kAccountOffers = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the account_tx command. */
-static LimitRange constexpr kACCOUNT_TX = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static constexpr LimitRange kAccountTx = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the book_offers command. */
-static LimitRange constexpr kBOOK_OFFERS = {.rmin = 1, .rDefault = 60, .rmax = 100};
+static constexpr LimitRange kBookOffers = {.rmin = 1, .rDefault = 60, .rmax = 100};
 
 /** Limits for the no_ripple_check command. */
-static LimitRange constexpr kNO_RIPPLE_CHECK = {.rmin = 10, .rDefault = 300, .rmax = 400};
+static constexpr LimitRange kNoRippleCheck = {.rmin = 10, .rDefault = 300, .rmax = 400};
 
 /** Limits for the account_nftokens command, in pages. */
-static LimitRange constexpr kACCOUNT_NF_TOKENS = {.rmin = 20, .rDefault = 100, .rmax = 400};
+static constexpr LimitRange kAccountNfTokens = {.rmin = 20, .rDefault = 100, .rmax = 400};
 
 /** Limits for the nft_buy_offers & nft_sell_offers commands. */
-static LimitRange constexpr kNFT_OFFERS = {.rmin = 50, .rDefault = 250, .rmax = 500};
+static constexpr LimitRange kNftOffers = {.rmin = 50, .rDefault = 250, .rmax = 500};
 
-static int constexpr kDEFAULT_AUTO_FILL_FEE_MULTIPLIER = 10;
-static int constexpr kDEFAULT_AUTO_FILL_FEE_DIVISOR = 1;
-static int constexpr kMAX_PATHFINDS_IN_PROGRESS = 2;
-static int constexpr kMAX_PATHFIND_JOB_COUNT = 50;
-static int constexpr kMAX_JOB_QUEUE_CLIENTS = 500;
-auto constexpr kMAX_VALIDATED_LEDGER_AGE = std::chrono::minutes{2};
-static int constexpr kMAX_REQUEST_SIZE = 1000000;
+static constexpr int kDefaultAutoFillFeeMultiplier = 10;
+static constexpr int kDefaultAutoFillFeeDivisor = 1;
+static constexpr int kMaxPathfindsInProgress = 2;
+static constexpr int kMaxPathfindJobCount = 50;
+static constexpr int kMaxJobQueueClients = 500;
+constexpr auto kMaxValidatedLedgerAge = std::chrono::minutes{2};
+static constexpr int kMaxRequestSize = 1000000;
 
 /** Maximum number of pages in one response from a binary LedgerData request. */
-static int constexpr kBINARY_PAGE_LENGTH = 2048;
+static constexpr int kBinaryPageLength = 2048;
 
 /** Maximum number of pages in one response from a Json LedgerData request. */
-static int constexpr kJSON_PAGE_LENGTH = 256;
+static constexpr int kJsonPageLength = 256;
 
 /** Maximum number of pages in a LedgerData response. */
-int constexpr pageLength(bool isBinary)
+constexpr int
+pageLength(bool isBinary)
 {
-    return isBinary ? kBINARY_PAGE_LENGTH : kJSON_PAGE_LENGTH;
+    return isBinary ? kBinaryPageLength : kJsonPageLength;
 }
 
 /** Maximum number of source currencies allowed in a path find request. */
-static int constexpr kMAX_SRC_CUR = 18;
+static constexpr int kMaxSrcCur = 18;
 
 /** Maximum number of auto source currencies in a path find request. */
-static int constexpr kMAX_AUTO_SRC_CUR = 88;
+static constexpr int kMaxAutoSrcCur = 88;
 
 }  // namespace xrpl::RPC::Tuning
 /** @} */
diff --git a/src/xrpld/rpc/handlers/VaultInfo.cpp b/src/xrpld/rpc/handlers/VaultInfo.cpp
index 882a865904..2c00205131 100644
--- a/src/xrpld/rpc/handlers/VaultInfo.cpp
+++ b/src/xrpld/rpc/handlers/VaultInfo.cpp
@@ -22,7 +22,7 @@ parseVault(json::Value const& params, json::Value& jvResult)
     auto const hasOwner = params.isMember(jss::owner);
     auto const hasSeq = params.isMember(jss::seq);
 
-    uint256 uNodeIndex = beast::kZERO;
+    uint256 uNodeIndex = beast::kZero;
     if (hasVaultId && !hasOwner && !hasSeq)
     {
         if (!uNodeIndex.parseHex(params[jss::vault_id].asString()))
@@ -42,7 +42,7 @@ parseVault(json::Value const& params, json::Value& jvResult)
         }
         if (!(params[jss::seq].isInt() || params[jss::seq].isUInt()) ||
             params[jss::seq].asDouble() <= 0.0 ||
-            params[jss::seq].asDouble() > double(json::Value::kMAX_UINT))
+            params[jss::seq].asDouble() > double(json::Value::kMaxUInt))
         {
             RPC::injectError(RpcInvalidParams, jvResult);
             return std::nullopt;
@@ -69,8 +69,8 @@ doVaultInfo(RPC::JsonContext& context)
     if (!lpLedger)
         return jvResult;
 
-    auto const uNodeIndex = parseVault(context.params, jvResult).value_or(beast::kZERO);
-    if (uNodeIndex == beast::kZERO)
+    auto const uNodeIndex = parseVault(context.params, jvResult).value_or(beast::kZero);
+    if (uNodeIndex == beast::kZero)
     {
         jvResult[jss::error] = "malformedRequest";
         return jvResult;
diff --git a/src/xrpld/rpc/handlers/account/AccountChannels.cpp b/src/xrpld/rpc/handlers/account/AccountChannels.cpp
index 8ba193f5ea..6d5876322c 100644
--- a/src/xrpld/rpc/handlers/account/AccountChannels.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountChannels.cpp
@@ -108,7 +108,7 @@ doAccountChannels(RPC::JsonContext& context)
         return rpcError(RpcActMalformed);
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_CHANNELS, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kAccountChannels, context))
         return *err;
 
     json::Value jsonChannels{json::ValueType::Array};
@@ -120,7 +120,7 @@ doAccountChannels(RPC::JsonContext& context)
     };
     VisitData visitData = {.items = {}, .accountID = accountID, .raDstAccount = raDstAccount};
     visitData.items.reserve(limit);
-    uint256 startAfter = beast::kZERO;
+    uint256 startAfter = beast::kZero;
     std::uint64_t startHint = 0;
 
     if (params.isMember(jss::marker))
@@ -214,7 +214,7 @@ doAccountChannels(RPC::JsonContext& context)
     for (auto const& item : visitData.items)
         addChannel(jsonChannels, *item);
 
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
     result[jss::channels] = std::move(jsonChannels);
     return result;
 }
diff --git a/src/xrpld/rpc/handlers/account/AccountInfo.cpp b/src/xrpld/rpc/handlers/account/AccountInfo.cpp
index ece73c9aee..d0f45cbc6f 100644
--- a/src/xrpld/rpc/handlers/account/AccountInfo.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountInfo.cpp
@@ -121,7 +121,7 @@ doAccountInfo(RPC::JsonContext& context)
     }
     auto const accountID{id.value()};
 
-    static constexpr std::array<std::pair<std::string_view, LedgerSpecificFlags>, 9> kLS_FLAGS{
+    static constexpr std::array<std::pair<std::string_view, LedgerSpecificFlags>, 9> kLsFlags{
         {{"defaultRipple", lsfDefaultRipple},
          {"depositAuth", lsfDepositAuth},
          {"disableMasterKey", lsfDisableMaster},
@@ -133,17 +133,17 @@ doAccountInfo(RPC::JsonContext& context)
          {"requireDestinationTag", lsfRequireDestTag}}};
 
     static constexpr std::array<std::pair<std::string_view, LedgerSpecificFlags>, 4>
-        kDISALLOW_INCOMING_FLAGS{
+        kDisallowIncomingFlags{
             {{"disallowIncomingNFTokenOffer", lsfDisallowIncomingNFTokenOffer},
              {"disallowIncomingCheck", lsfDisallowIncomingCheck},
              {"disallowIncomingPayChan", lsfDisallowIncomingPayChan},
              {"disallowIncomingTrustline", lsfDisallowIncomingTrustline}}};
 
-    static constexpr std::pair<std::string_view, LedgerSpecificFlags>
-        kALLOW_TRUST_LINE_CLAWBACK_FLAG{"allowTrustLineClawback", lsfAllowTrustLineClawback};
+    static constexpr std::pair<std::string_view, LedgerSpecificFlags> kAllowTrustLineClawbackFlag{
+        "allowTrustLineClawback", lsfAllowTrustLineClawback};
 
-    static constexpr std::pair<std::string_view, LedgerSpecificFlags>
-        kALLOW_TRUST_LINE_LOCKING_FLAG{"allowTrustLineLocking", lsfAllowTrustLineLocking};
+    static constexpr std::pair<std::string_view, LedgerSpecificFlags> kAllowTrustLineLockingFlag{
+        "allowTrustLineLocking", lsfAllowTrustLineLocking};
 
     auto const sleAccepted = ledger->read(keylet::account(accountID));
     if (sleAccepted)
@@ -163,22 +163,22 @@ doAccountInfo(RPC::JsonContext& context)
         result[jss::account_data] = jvAccepted;
 
         json::Value acctFlags{json::ValueType::Object};
-        for (auto const& lsf : kLS_FLAGS)
+        for (auto const& lsf : kLsFlags)
             acctFlags[lsf.first.data()] = sleAccepted->isFlag(lsf.second);
 
-        for (auto const& lsf : kDISALLOW_INCOMING_FLAGS)
+        for (auto const& lsf : kDisallowIncomingFlags)
             acctFlags[lsf.first.data()] = sleAccepted->isFlag(lsf.second);
 
         if (ledger->rules().enabled(featureClawback))
         {
-            acctFlags[kALLOW_TRUST_LINE_CLAWBACK_FLAG.first.data()] =
-                sleAccepted->isFlag(kALLOW_TRUST_LINE_CLAWBACK_FLAG.second);
+            acctFlags[kAllowTrustLineClawbackFlag.first.data()] =
+                sleAccepted->isFlag(kAllowTrustLineClawbackFlag.second);
         }
 
         if (ledger->rules().enabled(featureTokenEscrow))
         {
-            acctFlags[kALLOW_TRUST_LINE_LOCKING_FLAG.first.data()] =
-                sleAccepted->isFlag(kALLOW_TRUST_LINE_LOCKING_FLAG.second);
+            acctFlags[kAllowTrustLineLockingFlag.first.data()] =
+                sleAccepted->isFlag(kAllowTrustLineLockingFlag.second);
         }
 
         result[jss::account_flags] = std::move(acctFlags);
diff --git a/src/xrpld/rpc/handlers/account/AccountLines.cpp b/src/xrpld/rpc/handlers/account/AccountLines.cpp
index d8f067a3be..c60ce90201 100644
--- a/src/xrpld/rpc/handlers/account/AccountLines.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountLines.cpp
@@ -121,7 +121,7 @@ doAccountLines(RPC::JsonContext& context)
     }
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_LINES, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kAccountLines, context))
         return *err;
 
     // this flag allows the requester to ask incoming trustlines in default
@@ -144,7 +144,7 @@ doAccountLines(RPC::JsonContext& context)
         .raPeerAccount = raPeerAccount,
         .ignoreDefault = ignoreDefault,
         .foundCount = 0};
-    uint256 startAfter = beast::kZERO;
+    uint256 startAfter = beast::kZero;
     std::uint64_t startHint = 0;
 
     if (params.isMember(jss::marker))
@@ -260,7 +260,7 @@ doAccountLines(RPC::JsonContext& context)
     for (auto const& item : visitData.items)
         addLine(jsonLines, item);
 
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/account/AccountNFTs.cpp b/src/xrpld/rpc/handlers/account/AccountNFTs.cpp
index 6fc72ef72a..0eb91206f3 100644
--- a/src/xrpld/rpc/handlers/account/AccountNFTs.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountNFTs.cpp
@@ -58,7 +58,7 @@ doAccountNFTs(RPC::JsonContext& context)
         return rpcError(RpcActNotFound);
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_NF_TOKENS, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kAccountNfTokens, context))
         return *err;
 
     uint256 marker;
@@ -86,7 +86,7 @@ doAccountNFTs(RPC::JsonContext& context)
     // Continue iteration from the current page:
     bool pastMarker = marker.isZero();
     bool markerFound = false;
-    uint256 const maskedMarker = marker & nft::kPAGE_MASK;
+    uint256 const maskedMarker = marker & nft::kPageMask;
     while (cp)
     {
         auto arr = cp->getFieldArray(sfNFTokens);
@@ -105,7 +105,7 @@ doAccountNFTs(RPC::JsonContext& context)
             //     in that case then we need to compare against the full
             //     256 bits.
             uint256 const nftokenID = o[sfNFTokenID];
-            uint256 const maskedNftokenID = nftokenID & nft::kPAGE_MASK;
+            uint256 const maskedNftokenID = nftokenID & nft::kPageMask;
 
             if (!pastMarker)
             {
@@ -161,7 +161,7 @@ doAccountNFTs(RPC::JsonContext& context)
         return RPC::invalidFieldError(jss::marker);
 
     result[jss::account] = toBase58(accountID);
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/account/AccountObjects.cpp b/src/xrpld/rpc/handlers/account/AccountObjects.cpp
index c544a6ff1a..08a7fbe44a 100644
--- a/src/xrpld/rpc/handlers/account/AccountObjects.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountObjects.cpp
@@ -69,7 +69,7 @@ getAccountObjects(
         // if it is we will try to iterate the pages up to the limit
         // and then change over to the owner directory
 
-        if (firstNFTPage.key != (entryIndex & ~nft::kPAGE_MASK))
+        if (firstNFTPage.key != (entryIndex & ~nft::kPageMask))
             iterateNFTPages = false;
     }
 
@@ -121,7 +121,7 @@ getAccountObjects(
         // to iterating the root directory (and the conventional
         // behaviour of this RPC function.) Therefore we should
         // zero entryIndex so as not to terribly confuse things.
-        entryIndex = beast::kZERO;
+        entryIndex = beast::kZero;
     }
 
     auto const root = keylet::ownerDir(account);
@@ -257,7 +257,7 @@ doAccountObjects(RPC::JsonContext& context)
         {
             json::StaticString name;
             LedgerEntryType type;
-        } static constexpr kDELETION_BLOCKERS[] = {
+        } static constexpr kDeletionBlockers[] = {
             {.name = jss::check, .type = ltCHECK},
             {.name = jss::escrow, .type = ltESCROW},
             {.name = jss::nft_page, .type = ltNFTOKEN_PAGE},
@@ -274,9 +274,9 @@ doAccountObjects(RPC::JsonContext& context)
         };
 
         typeFilter.emplace();
-        typeFilter->reserve(std::size(kDELETION_BLOCKERS));
+        typeFilter->reserve(std::size(kDeletionBlockers));
 
-        for (auto [name, type] : kDELETION_BLOCKERS)
+        for (auto [name, type] : kDeletionBlockers)
         {
             if (params.isMember(jss::type) && name != params[jss::type])
             {
@@ -306,7 +306,7 @@ doAccountObjects(RPC::JsonContext& context)
     }
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_OBJECTS, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kAccountObjects, context))
         return *err;
 
     uint256 dirIndex;
@@ -333,7 +333,7 @@ doAccountObjects(RPC::JsonContext& context)
         return RPC::invalidFieldError(jss::marker);
 
     result[jss::account] = toBase58(accountID);
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/account/AccountOffers.cpp b/src/xrpld/rpc/handlers/account/AccountOffers.cpp
index f8ce85099a..85d9470b75 100644
--- a/src/xrpld/rpc/handlers/account/AccountOffers.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountOffers.cpp
@@ -83,12 +83,12 @@ doAccountOffers(RPC::JsonContext& context)
         return rpcError(RpcActNotFound);
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_OFFERS, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kAccountOffers, context))
         return *err;
 
     json::Value& jsonOffers(result[jss::offers] = json::ValueType::Array);
     std::vector<std::shared_ptr<SLE const>> offers;
-    uint256 startAfter = beast::kZERO;
+    uint256 startAfter = beast::kZero;
     std::uint64_t startHint = 0;
 
     if (params.isMember(jss::marker))
@@ -177,7 +177,7 @@ doAccountOffers(RPC::JsonContext& context)
     for (auto const& offer : offers)
         appendOfferJson(offer, jsonOffers);
 
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/account/AccountTx.cpp b/src/xrpld/rpc/handlers/account/AccountTx.cpp
index f1c1309d59..6c6d2bb6fd 100644
--- a/src/xrpld/rpc/handlers/account/AccountTx.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountTx.cpp
@@ -211,7 +211,7 @@ getLedgerRange(RPC::Context& context, std::optional<LedgerSpecifier> const& ledg
 std::pair<AccountTxResult, RPC::Status>
 doAccountTxHelp(RPC::Context& context, AccountTxArgs const& args)
 {
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
 
     AccountTxResult result;
 
@@ -410,7 +410,7 @@ doAccountTx(RPC::JsonContext& context)
         return RPC::invalidFieldError(jss::forward);
     }
 
-    if (auto const err = RPC::readLimitField(args.limit, RPC::Tuning::kACCOUNT_TX, context))
+    if (auto const err = RPC::readLimitField(args.limit, RPC::Tuning::kAccountTx, context))
         return *err;
 
     args.binary = params.isMember(jss::binary) && params[jss::binary].asBool();
diff --git a/src/xrpld/rpc/handlers/account/GatewayBalances.cpp b/src/xrpld/rpc/handlers/account/GatewayBalances.cpp
index 7b6d6ca07b..146b9ead5c 100644
--- a/src/xrpld/rpc/handlers/account/GatewayBalances.cpp
+++ b/src/xrpld/rpc/handlers/account/GatewayBalances.cpp
@@ -72,7 +72,7 @@ doGatewayBalances(RPC::JsonContext& context)
     if (!id)
         return rpcError(RpcActMalformed);
     auto const accountID{id.value()};
-    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
+    context.loadType = Resource::kFeeHeavyBurdenRpc;
 
     result[jss::account] = toBase58(accountID);
 
@@ -153,7 +153,7 @@ doGatewayBalances(RPC::JsonContext& context)
                     return;
 
                 auto& bal = locked[escrow.get<Issue>().currency];
-                if (bal == beast::kZERO)
+                if (bal == beast::kZero)
                 {
                     // This is needed to set the currency code correctly
                     bal = escrow;
@@ -170,8 +170,7 @@ doGatewayBalances(RPC::JsonContext& context)
                         // On overflow return the largest valid STAmount.
                         // Very large sums of STAmount are approximations
                         // anyway.
-                        bal =
-                            STAmount(bal.get<Issue>(), STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
+                        bal = STAmount(bal.get<Issue>(), STAmount::kMaxValue, STAmount::kMaxOffset);
                     }
                 }
             }
@@ -210,7 +209,7 @@ doGatewayBalances(RPC::JsonContext& context)
             {
                 // normal negative balance, obligation to customer
                 auto& bal = sums[rs->getBalance().get<Issue>().currency];
-                if (bal == beast::kZERO)
+                if (bal == beast::kZero)
                 {
                     // This is needed to set the currency code correctly
                     bal = -rs->getBalance();
@@ -227,7 +226,7 @@ doGatewayBalances(RPC::JsonContext& context)
                         // On overflow return the largest valid STAmount.
                         // Very large sums of STAmount are approximations
                         // anyway.
-                        bal = STAmount(bal.asset(), STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
+                        bal = STAmount(bal.asset(), STAmount::kMaxValue, STAmount::kMaxOffset);
                     }
                 }
             }
diff --git a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
index b8a2055069..bb48d3ebd5 100644
--- a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
+++ b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
@@ -75,7 +75,7 @@ doNoRippleCheck(RPC::JsonContext& context)
     }
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::kNO_RIPPLE_CHECK, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kNoRippleCheck, context))
         return *err;
 
     bool transactions = false;
diff --git a/src/xrpld/rpc/handlers/admin/data/LedgerRequest.cpp b/src/xrpld/rpc/handlers/admin/data/LedgerRequest.cpp
index 4b15dbdcaf..de1e4439cf 100644
--- a/src/xrpld/rpc/handlers/admin/data/LedgerRequest.cpp
+++ b/src/xrpld/rpc/handlers/admin/data/LedgerRequest.cpp
@@ -15,7 +15,7 @@ namespace xrpl {
 json::Value
 doLedgerRequest(RPC::JsonContext& context)
 {
-    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
+    context.loadType = Resource::kFeeHeavyBurdenRpc;
     auto res = RPC::getOrAcquireLedger(context);
 
     if (!res.has_value())
diff --git a/src/xrpld/rpc/handlers/admin/peer/Connect.cpp b/src/xrpld/rpc/handlers/admin/peer/Connect.cpp
index 1d5e537aba..568dcdaa26 100644
--- a/src/xrpld/rpc/handlers/admin/peer/Connect.cpp
+++ b/src/xrpld/rpc/handlers/admin/peer/Connect.cpp
@@ -45,7 +45,7 @@ doConnect(RPC::JsonContext& context)
     }
     else
     {
-        iPort = kDEFAULT_PEER_PORT;
+        iPort = kDefaultPeerPort;
     }
 
     auto const ipStr = context.params[jss::ip].asString();
diff --git a/src/xrpld/rpc/handlers/admin/signing/Sign.cpp b/src/xrpld/rpc/handlers/admin/signing/Sign.cpp
index 6953dfd3d8..781e160f54 100644
--- a/src/xrpld/rpc/handlers/admin/signing/Sign.cpp
+++ b/src/xrpld/rpc/handlers/admin/signing/Sign.cpp
@@ -22,7 +22,7 @@ doSign(RPC::JsonContext& context)
         return RPC::makeError(RpcNotSupported, "Signing is not supported by this server.");
     }
 
-    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
+    context.loadType = Resource::kFeeHeavyBurdenRpc;
     NetworkOPs::FailHard const failType = NetworkOPs::doFailHard(
         context.params.isMember(jss::fail_hard) && context.params[jss::fail_hard].asBool());
 
diff --git a/src/xrpld/rpc/handlers/admin/signing/SignFor.cpp b/src/xrpld/rpc/handlers/admin/signing/SignFor.cpp
index 102cea08b4..35274d51f4 100644
--- a/src/xrpld/rpc/handlers/admin/signing/SignFor.cpp
+++ b/src/xrpld/rpc/handlers/admin/signing/SignFor.cpp
@@ -23,7 +23,7 @@ doSignFor(RPC::JsonContext& context)
         return RPC::makeError(RpcNotSupported, "Signing is not supported by this server.");
     }
 
-    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
+    context.loadType = Resource::kFeeHeavyBurdenRpc;
     auto const failHard = context.params[jss::fail_hard].asBool();
     auto const failType = NetworkOPs::doFailHard(failHard);
 
diff --git a/src/xrpld/rpc/handlers/ledger/Ledger.cpp b/src/xrpld/rpc/handlers/ledger/Ledger.cpp
index 7034dce768..1b096002bd 100644
--- a/src/xrpld/rpc/handlers/ledger/Ledger.cpp
+++ b/src/xrpld/rpc/handlers/ledger/Ledger.cpp
@@ -106,8 +106,7 @@ LedgerHandler::check()
         {
             return RpcTooBusy;
         }
-        context_.loadType =
-            binary ? Resource::kFEE_MEDIUM_BURDEN_RPC : Resource::kFEE_HEAVY_BURDEN_RPC;
+        context_.loadType = binary ? Resource::kFeeMediumBurdenRpc : Resource::kFeeHeavyBurdenRpc;
     }
 
     if (*queue)
diff --git a/src/xrpld/rpc/handlers/ledger/Ledger.h b/src/xrpld/rpc/handlers/ledger/Ledger.h
index 83ea4314e5..719e635170 100644
--- a/src/xrpld/rpc/handlers/ledger/Ledger.h
+++ b/src/xrpld/rpc/handlers/ledger/Ledger.h
@@ -40,9 +40,9 @@ public:
     // NOLINTBEGIN(readability-identifier-naming)
     static constexpr char name[] = "ledger";
 
-    static constexpr unsigned minApiVer = RPC::kAPI_MINIMUM_SUPPORTED_VERSION;
+    static constexpr unsigned minApiVer = RPC::kApiMinimumSupportedVersion;
 
-    static constexpr unsigned maxApiVer = RPC::kAPI_MAXIMUM_VALID_VERSION;
+    static constexpr unsigned maxApiVer = RPC::kApiMaximumValidVersion;
 
     static constexpr Role role = Role::USER;
 
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp b/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
index f07b7f2f06..9a9119d2ba 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
+++ b/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
@@ -203,7 +203,7 @@ parseCredential(
         return Unexpected(issuer.error());
 
     auto const credType = LedgerEntryHelpers::requiredHexBlob(
-        cred, jss::credential_type, kMAX_CREDENTIAL_TYPE_LENGTH, "malformedRequest");
+        cred, jss::credential_type, kMaxCredentialTypeLength, "malformedRequest");
     if (!credType)
         return Unexpected(credType.error());
 
@@ -244,7 +244,7 @@ parseAuthorizeCredentials(json::Value const& jv)
     }
 
     std::uint32_t const n = jv.size();
-    if (n > kMAX_CREDENTIALS_ARRAY_SIZE)
+    if (n > kMaxCredentialsArraySize)
     {
         return Unexpected(
             LedgerEntryHelpers::malformedError(
@@ -283,10 +283,7 @@ parseAuthorizeCredentials(json::Value const& jv)
             return Unexpected(issuer.error());
 
         auto const credentialType = LedgerEntryHelpers::requiredHexBlob(
-            jo,
-            jss::credential_type,
-            kMAX_CREDENTIAL_TYPE_LENGTH,
-            "malformedAuthorizedCredentials");
+            jo, jss::credential_type, kMaxCredentialTypeLength, "malformedAuthorizedCredentials");
         if (!credentialType)
             return Unexpected(credentialType.error());
 
@@ -836,7 +833,7 @@ struct LedgerEntry
 json::Value
 doLedgerEntry(RPC::JsonContext& context)
 {
-    static auto kLEDGER_ENTRY_PARSERS = std::to_array<LedgerEntry>({
+    static auto kLedgerEntryParsers = std::to_array<LedgerEntry>({
 #pragma push_macro("LEDGER_ENTRY")
 #undef LEDGER_ENTRY
 
@@ -859,7 +856,7 @@ doLedgerEntry(RPC::JsonContext& context)
     auto const hasMoreThanOneMember = [&]() {
         int count = 0;
 
-        for (auto const& ledgerEntry : kLEDGER_ENTRY_PARSERS)
+        for (auto const& ledgerEntry : kLedgerEntryParsers)
         {
             if (context.params.isMember(ledgerEntry.fieldName))
             {
@@ -888,7 +885,7 @@ doLedgerEntry(RPC::JsonContext& context)
     try
     {
         bool found = false;
-        for (auto const& ledgerEntry : kLEDGER_ENTRY_PARSERS)
+        for (auto const& ledgerEntry : kLedgerEntryParsers)
         {
             if (context.params.isMember(ledgerEntry.fieldName))
             {
diff --git a/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp b/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
index 38251f855f..df6772e4c0 100644
--- a/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
@@ -57,7 +57,7 @@ toIso8601(NetClock::time_point tp)
     return date::format(
         "%Y-%Om-%dT%H:%M:%OS%z",
         date::sys_time<system_clock::duration>(
-            system_clock::time_point{tp.time_since_epoch() + kEPOCH_OFFSET}));
+            system_clock::time_point{tp.time_since_epoch() + kEpochOffset}));
 }
 
 json::Value
@@ -85,13 +85,13 @@ doAMMInfo(RPC::JsonContext& context)
         std::optional<Asset> asset2;
         std::optional<uint256> ammID;
 
-        constexpr auto kINVALID = [](json::Value const& params) -> bool {
+        static constexpr auto kInvalid = [](json::Value const& params) -> bool {
             return (params.isMember(jss::asset) != params.isMember(jss::asset2)) ||
                 (params.isMember(jss::asset) == params.isMember(jss::amm_account));
         };
 
         // NOTE, identical check for apVersion >= 3 below
-        if (context.apiVersion < 3 && kINVALID(params))
+        if (context.apiVersion < 3 && kInvalid(params))
             return Unexpected(RpcInvalidParams);
 
         if (params.isMember(jss::asset))
@@ -139,7 +139,7 @@ doAMMInfo(RPC::JsonContext& context)
         }
 
         // NOTE, identical check for apVersion < 3 above
-        if (context.apiVersion >= 3 && kINVALID(params))
+        if (context.apiVersion >= 3 && kInvalid(params))
             return Unexpected(RpcInvalidParams);
 
         XRPL_ASSERT(
@@ -219,7 +219,7 @@ doAMMInfo(RPC::JsonContext& context)
             json::Value auction;
             auto const timeSlot = ammAuctionTimeSlot(
                 ledger->header().parentCloseTime.time_since_epoch().count(), auctionSlot);
-            auction[jss::time_interval] = timeSlot ? *timeSlot : kAUCTION_SLOT_TIME_INTERVALS;
+            auction[jss::time_interval] = timeSlot ? *timeSlot : kAuctionSlotTimeIntervals;
             auctionSlot[sfPrice].setJson(auction[jss::price]);
             auction[jss::discounted_fee] = auctionSlot[sfDiscountedFee];
             auction[jss::account] = to_string(auctionSlot.getAccountID(sfAccount));
diff --git a/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp b/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp
index 390dd88166..5d031c2c74 100644
--- a/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp
@@ -242,7 +242,7 @@ doBookOffers(RPC::JsonContext& context)
     }
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::kBOOK_OFFERS, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kBookOffers, context))
         return *err;
 
     bool const bProof(context.params.isMember(jss::proof));
@@ -254,13 +254,13 @@ doBookOffers(RPC::JsonContext& context)
     context.netOps.getBookPage(
         lpLedger,
         {book.in, book.out, domain},
-        takerID ? *takerID : beast::kZERO,
+        takerID ? *takerID : beast::kZero,
         bProof,
         limit,
         jvMarker,
         jvResult);
 
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
 
     return jvResult;
 }
diff --git a/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp b/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
index 4963663b39..cc176aaadb 100644
--- a/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
@@ -101,7 +101,7 @@ doDepositAuthorized(RPC::JsonContext& context)
                 RPC::expectedFieldMessage(
                     jss::credentials, "is non-empty array of CredentialID(hash256)"));
         }
-        if (creds.size() > kMAX_CREDENTIALS_ARRAY_SIZE)
+        if (creds.size() > kMaxCredentialsArraySize)
         {
             return RPC::makeError(
                 RpcInvalidParams, RPC::expectedFieldMessage(jss::credentials, "array too long"));
diff --git a/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp b/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp
index 1d34ca21b2..e6c7a160ad 100644
--- a/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp
@@ -52,7 +52,7 @@ iteratePriceData(
     std::function<bool(STObject const&)> const& f)
 {
     using Meta = std::shared_ptr<STObject const>;
-    constexpr std::uint8_t kMAX_HISTORY = 3;
+    static constexpr std::uint8_t kMaxHistory = 3;
     bool isNew = false;
     std::uint8_t history = 0;
 
@@ -82,7 +82,7 @@ iteratePriceData(
         if ((oracle == nullptr) || f(*oracle) || isNew)
             return;
 
-        if (++history > kMAX_HISTORY)
+        if (++history > kMaxHistory)
             return;
 
         uint256 const prevTx = chain->getFieldH256(sfPreviousTxnID);
@@ -152,11 +152,11 @@ doGetAggregatePrice(RPC::JsonContext& context)
     json::Value result;
     auto const& params(context.params);
 
-    constexpr std::uint16_t kMAX_ORACLES = 200;
+    static constexpr std::uint16_t kMaxOracles = 200;
     if (!params.isMember(jss::oracles))
         return RPC::missingFieldError(jss::oracles);
     if (!params[jss::oracles].isArray() || params[jss::oracles].size() == 0 ||
-        params[jss::oracles].size() > kMAX_ORACLES)
+        params[jss::oracles].size() > kMaxOracles)
     {
         RPC::injectError(RpcOracleMalformed, result);
         return result;
@@ -215,7 +215,7 @@ doGetAggregatePrice(RPC::JsonContext& context)
         return result;
     }
     if (params.isMember(jss::trim) &&
-        (std::get<std::uint32_t>(trim) == 0 || std::get<std::uint32_t>(trim) > kMAX_TRIM))
+        (std::get<std::uint32_t>(trim) == 0 || std::get<std::uint32_t>(trim) > kMaxTrim))
     {
         RPC::injectError(RpcInvalidParams, result);
         return result;
@@ -341,11 +341,11 @@ doGetAggregatePrice(RPC::JsonContext& context)
         auto const middle = size / 2;
         if ((size % 2) == 0)
         {
-            static STAmount const kTWO{noIssue(), 2, 0};
+            static STAmount const kTwo{noIssue(), 2, 0};
             auto it = itAdvance(prices.right.begin(), middle - 1);
             auto const& a1 = it->first;
             auto const& a2 = (++it)->first;
-            return divide(a1 + a2, kTWO, noIssue());
+            return divide(a1 + a2, kTwo, noIssue());
         }
         return itAdvance(prices.right.begin(), middle)->first;
     }();
diff --git a/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h b/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h
index 822896a644..b94e431117 100644
--- a/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h
+++ b/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h
@@ -48,7 +48,7 @@ inline json::Value
 enumerateNFTOffers(RPC::JsonContext& context, uint256 const& nftId, Keylet const& directory)
 {
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::kNFT_OFFERS, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kNftOffers, context))
         return *err;
 
     std::shared_ptr<ReadView const> ledger;
@@ -125,7 +125,7 @@ enumerateNFTOffers(RPC::JsonContext& context, uint256 const& nftId, Keylet const
     for (auto const& offer : offers)
         appendNftOfferJson(context.app, offer, jsonOffers);
 
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/orderbook/PathFind.cpp b/src/xrpld/rpc/handlers/orderbook/PathFind.cpp
index da338dfcc8..7955a93eb4 100644
--- a/src/xrpld/rpc/handlers/orderbook/PathFind.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/PathFind.cpp
@@ -34,7 +34,7 @@ doPathFind(RPC::JsonContext& context)
 
     if (sSubCommand == "create")
     {
-        context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
+        context.loadType = Resource::kFeeHeavyBurdenRpc;
         context.infoSub->clearRequest();
         return context.app.getPathRequestManager().makePathRequest(
             context.infoSub, lpLedger, context.params);
diff --git a/src/xrpld/rpc/handlers/orderbook/RipplePathFind.cpp b/src/xrpld/rpc/handlers/orderbook/RipplePathFind.cpp
index 316f26fa32..956d50add7 100644
--- a/src/xrpld/rpc/handlers/orderbook/RipplePathFind.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/RipplePathFind.cpp
@@ -26,7 +26,7 @@ doRipplePathFind(RPC::JsonContext& context)
     if (context.app.config().PATH_SEARCH_MAX == 0)
         return rpcError(RpcNotSupported);
 
-    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
+    context.loadType = Resource::kFeeHeavyBurdenRpc;
 
     std::shared_ptr<ReadView const> lpLedger;
     json::Value jvResult;
@@ -37,7 +37,7 @@ doRipplePathFind(RPC::JsonContext& context)
         // No ledger specified, use pathfinding defaults
         // and dispatch to pathfinding engine
         if (context.app.getLedgerMaster().getValidatedLedgerAge() >
-            RPC::Tuning::kMAX_VALIDATED_LEDGER_AGE)
+            RPC::Tuning::kMaxValidatedLedgerAge)
         {
             if (context.apiVersion == 1)
                 return rpcError(RpcNoNetwork);
diff --git a/src/xrpld/rpc/handlers/server_info/ServerDefinitions.cpp b/src/xrpld/rpc/handlers/server_info/ServerDefinitions.cpp
index a5a9836e27..aa23a7af26 100644
--- a/src/xrpld/rpc/handlers/server_info/ServerDefinitions.cpp
+++ b/src/xrpld/rpc/handlers/server_info/ServerDefinitions.cpp
@@ -78,7 +78,7 @@ ServerDefinitions::translate(std::string const& inp)
         return replace("UINT", "UInt");
     }
 
-    static std::unordered_map<std::string_view, std::string_view> const kREPLACEMENTS{
+    static std::unordered_map<std::string_view, std::string_view> const kReplacements{
         {"OBJECT", "STObject"},
         {"ARRAY", "STArray"},
         {"ACCOUNT", "AccountID"},
@@ -89,7 +89,7 @@ ServerDefinitions::translate(std::string const& inp)
         {"XCHAIN_BRIDGE", "XChainBridge"},
     };
 
-    if (auto const& it = kREPLACEMENTS.find(inp); it != kREPLACEMENTS.end())
+    if (auto const& it = kReplacements.find(inp); it != kReplacements.end())
     {
         return std::string(it->second);
     }
@@ -129,7 +129,7 @@ ServerDefinitions::ServerDefinitions() : defs_{json::ValueType::Object}
 
     defs_[jss::TYPES]["Done"] = -1;
     std::map<int32_t, std::string> typeMap{{-1, "Done"}};
-    for (auto const& [rawName, typeValue] : kS_TYPE_MAP)
+    for (auto const& [rawName, typeValue] : kSTypeMap)
     {
         std::string const typeName = translate(std::string(rawName).substr(4) /* remove STI_ */);
         defs_[jss::TYPES][typeName] = typeValue;
@@ -216,10 +216,10 @@ ServerDefinitions::ServerDefinitions() : defs_{json::ValueType::Object}
     }
 
     // copy into a sorted map to ensure deterministic output order (sorted by fieldCode)
-    static std::map<int, SField const*> const kSORTED_FIELDS(
+    static std::map<int, SField const*> const kSortedFields(
         xrpl::SField::getKnownCodeToField().begin(), xrpl::SField::getKnownCodeToField().end());
 
-    for (auto const& [code, field] : kSORTED_FIELDS)
+    for (auto const& [code, field] : kSortedFields)
     {
         if (field->fieldName.empty())
             continue;
@@ -369,8 +369,8 @@ ServerDefinitions::ServerDefinitions() : defs_{json::ValueType::Object}
 ServerDefinitions const&
 getDefinitions()
 {
-    static ServerDefinitions const kDEFS{};
-    return kDEFS;
+    static ServerDefinitions const kDefs{};
+    return kDefs;
 }
 
 }  // namespace detail
diff --git a/src/xrpld/rpc/handlers/server_info/Version.h b/src/xrpld/rpc/handlers/server_info/Version.h
index c3ae5cf39f..64c150162e 100644
--- a/src/xrpld/rpc/handlers/server_info/Version.h
+++ b/src/xrpld/rpc/handlers/server_info/Version.h
@@ -27,9 +27,9 @@ public:
     // NOLINTBEGIN(readability-identifier-naming)
     static constexpr char const* name = "version";
 
-    static constexpr unsigned minApiVer = RPC::kAPI_MINIMUM_SUPPORTED_VERSION;
+    static constexpr unsigned minApiVer = RPC::kApiMinimumSupportedVersion;
 
-    static constexpr unsigned maxApiVer = RPC::kAPI_MAXIMUM_VALID_VERSION;
+    static constexpr unsigned maxApiVer = RPC::kApiMaximumValidVersion;
 
     static constexpr Role role = Role::USER;
 
diff --git a/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp b/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
index adad854eb9..93840bb6d6 100644
--- a/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
+++ b/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
@@ -197,7 +197,7 @@ doSubscribe(RPC::JsonContext& context)
         if (!context.app.config().useTxTables())
             return rpcError(RpcNotEnabled);
 
-        context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+        context.loadType = Resource::kFeeMediumBurdenRpc;
         auto const& req = context.params[jss::account_history_tx_stream];
         if (!req.isMember(jss::account) || !req[jss::account].isString())
             return rpcError(RpcInvalidParams);
@@ -285,7 +285,7 @@ doSubscribe(RPC::JsonContext& context)
             if ((j.isMember(jss::snapshot) && j[jss::snapshot].asBool()) ||
                 (j.isMember(jss::state_now) && j[jss::state_now].asBool()))
             {
-                context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+                context.loadType = Resource::kFeeMediumBurdenRpc;
                 std::shared_ptr<ReadView const> lpLedger =
                     context.app.getLedgerMaster().getPublishedLedger();
                 if (lpLedger)
@@ -299,7 +299,7 @@ doSubscribe(RPC::JsonContext& context)
                             field == jss::asks ? reversed(book) : book,
                             takerID ? *takerID : noAccount(),
                             false,
-                            RPC::Tuning::kBOOK_OFFERS.rDefault,
+                            RPC::Tuning::kBookOffers.rDefault,
                             jvMarker,
                             jvOffers);
 
diff --git a/src/xrpld/rpc/handlers/transaction/Simulate.cpp b/src/xrpld/rpc/handlers/transaction/Simulate.cpp
index 6f7940d4aa..ba108eb5b2 100644
--- a/src/xrpld/rpc/handlers/transaction/Simulate.cpp
+++ b/src/xrpld/rpc/handlers/transaction/Simulate.cpp
@@ -194,7 +194,7 @@ getTxJsonFromParams(json::Value const& params)
         try
         {
             SerialIter sitTrans(makeSlice(*unHexed));
-            txJson = STObject(std::ref(sitTrans), kSF_GENERIC).getJson(JsonOptions::Values::None);
+            txJson = STObject(std::ref(sitTrans), kSfGeneric).getJson(JsonOptions::Values::None);
         }
         catch (std::runtime_error const&)
         {
@@ -306,7 +306,7 @@ simulateTxn(RPC::JsonContext& context, std::shared_ptr<Transaction> transaction)
 json::Value
 doSimulate(RPC::JsonContext& context)
 {
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
 
     json::Value txJson;  // the tx as a JSON
 
diff --git a/src/xrpld/rpc/handlers/transaction/Submit.cpp b/src/xrpld/rpc/handlers/transaction/Submit.cpp
index 774297391a..f0c4cb2391 100644
--- a/src/xrpld/rpc/handlers/transaction/Submit.cpp
+++ b/src/xrpld/rpc/handlers/transaction/Submit.cpp
@@ -44,7 +44,7 @@ getFailHard(RPC::JsonContext const& context)
 json::Value
 doSubmit(RPC::JsonContext& context)
 {
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
 
     if (!context.params.isMember(jss::tx_blob))
     {
diff --git a/src/xrpld/rpc/handlers/transaction/SubmitMultiSigned.cpp b/src/xrpld/rpc/handlers/transaction/SubmitMultiSigned.cpp
index 80ec0c6702..cc04ed073e 100644
--- a/src/xrpld/rpc/handlers/transaction/SubmitMultiSigned.cpp
+++ b/src/xrpld/rpc/handlers/transaction/SubmitMultiSigned.cpp
@@ -15,7 +15,7 @@ namespace xrpl {
 json::Value
 doSubmitMultiSigned(RPC::JsonContext& context)
 {
-    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
+    context.loadType = Resource::kFeeHeavyBurdenRpc;
     auto const failHard = context.params[jss::fail_hard].asBool();
     auto const failType = NetworkOPs::doFailHard(failHard);
 
diff --git a/src/xrpld/rpc/handlers/transaction/Tx.cpp b/src/xrpld/rpc/handlers/transaction/Tx.cpp
index 099caeac42..c065bc268e 100644
--- a/src/xrpld/rpc/handlers/transaction/Tx.cpp
+++ b/src/xrpld/rpc/handlers/transaction/Tx.cpp
@@ -77,12 +77,12 @@ doTxHelp(RPC::Context& context, TxArgs args)
 
     if (args.ledgerRange)
     {
-        constexpr uint16_t kMAX_RANGE = 1000;
+        static constexpr uint16_t kMaxRange = 1000;
 
         if (args.ledgerRange->second < args.ledgerRange->first)
             return {result, RpcInvalidLgrRange};
 
-        if (args.ledgerRange->second - args.ledgerRange->first > kMAX_RANGE)
+        if (args.ledgerRange->second - args.ledgerRange->first > kMaxRange)
             return {result, RpcExcessiveLgrRange};
 
         range = ClosedInterval<uint32_t>(args.ledgerRange->first, args.ledgerRange->second);
@@ -205,16 +205,16 @@ populateJsonResponse(
         auto const& sttx = result.txn->getSTransaction();
         if (context.apiVersion > 1)
         {
-            constexpr auto kOPTIONS_JSON =
+            static constexpr auto kOptionsJson =
                 static_cast<JsonOptions::underlying_t>(JsonOptions::Values::IncludeDate) |
                 static_cast<JsonOptions::underlying_t>(JsonOptions::Values::DisableApiPriorV2);
             if (args.binary)
             {
-                response[jss::tx_blob] = result.txn->getJson(kOPTIONS_JSON, true);
+                response[jss::tx_blob] = result.txn->getJson(kOptionsJson, true);
             }
             else
             {
-                response[jss::tx_json] = result.txn->getJson(kOPTIONS_JSON);
+                response[jss::tx_json] = result.txn->getJson(kOptionsJson);
                 RPC::insertDeliverMax(
                     response[jss::tx_json], sttx->getTxnType(), context.apiVersion);
             }
diff --git a/src/xrpld/rpc/handlers/transaction/TxHistory.cpp b/src/xrpld/rpc/handlers/transaction/TxHistory.cpp
index 75d03951a4..a45046773c 100644
--- a/src/xrpld/rpc/handlers/transaction/TxHistory.cpp
+++ b/src/xrpld/rpc/handlers/transaction/TxHistory.cpp
@@ -21,7 +21,7 @@ doTxHistory(RPC::JsonContext& context)
     if (!context.app.config().useTxTables())
         return rpcError(RpcNotEnabled);
 
-    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
+    context.loadType = Resource::kFeeMediumBurdenRpc;
 
     if (!context.params.isMember(jss::start))
         return rpcError(RpcInvalidParams);
diff --git a/src/xrpld/shamap/NodeFamily.cpp b/src/xrpld/shamap/NodeFamily.cpp
index aab36b7ca3..a1668e80b2 100644
--- a/src/xrpld/shamap/NodeFamily.cpp
+++ b/src/xrpld/shamap/NodeFamily.cpp
@@ -30,8 +30,8 @@ NodeFamily::NodeFamily(Application& app, CollectorManager& cm)
               stopwatch(),
               app.getJournal("NodeFamilyFulLBelowCache"),
               cm.collector(),
-              kFULL_BELOW_TARGET_SIZE,
-              kFULL_BELOW_EXPIRATION))
+              kFullBelowTargetSize,
+              kFullBelowExpiration))
     , tnCache_(
           std::make_shared<TreeNodeCache>(
               "Node family tree node cache",

From 6809690fadbc8f93a462f0682d277b2e67879166 Mon Sep 17 00:00:00 2001
From: Ed Hennis <ed@ripple.com>
Date: Fri, 15 May 2026 14:04:49 -0400
Subject: [PATCH 04/12] release: Set version to 3.3.0-b0 (#7280)

Co-authored-by: Bart <bthomee@users.noreply.github.com>
---
 src/libxrpl/protocol/BuildInfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libxrpl/protocol/BuildInfo.cpp b/src/libxrpl/protocol/BuildInfo.cpp
index 07c5f6f4dc..820936a22d 100644
--- a/src/libxrpl/protocol/BuildInfo.cpp
+++ b/src/libxrpl/protocol/BuildInfo.cpp
@@ -23,7 +23,7 @@ namespace {
 //------------------------------------------------------------------------------
 // clang-format off
 // NOLINTNEXTLINE(readability-identifier-naming)
-char const* const versionString = "3.2.0-b0"
+char const* const versionString = "3.3.0-b0"
     // clang-format on
     ;
 

From c7ecfc6a970b2ef527097e51545cebc4285ed684 Mon Sep 17 00:00:00 2001
From: Mayukha Vadari <mvadari@ripple.com>
Date: Fri, 15 May 2026 19:02:04 -0400
Subject: [PATCH 05/12] refactor: Clean up comments post-clang-tidy changes
 (#7283)

---
 .../xrpl/protocol/detail/ledger_entries.macro    |  4 ++--
 .../ledger/helpers/RippleStateHelpers.cpp        | 16 ++++++++--------
 src/libxrpl/ledger/helpers/TokenHelpers.cpp      |  2 +-
 src/libxrpl/tx/Transactor.cpp                    |  2 +-
 .../tx/transactors/delegate/DelegateSet.cpp      |  4 ++--
 src/libxrpl/tx/transactors/dex/AMMVote.cpp       | 10 +++++-----
 src/libxrpl/tx/transactors/lending/LoanPay.cpp   |  2 +-
 src/test/app/AMMMPT_test.cpp                     |  2 +-
 src/test/app/Invariants_test.cpp                 |  2 +-
 src/xrpld/app/misc/NetworkOPs.cpp                |  2 +-
 src/xrpld/app/misc/detail/TxQ.cpp                |  2 +-
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/include/xrpl/protocol/detail/ledger_entries.macro b/include/xrpl/protocol/detail/ledger_entries.macro
index bf641862d1..c4b392a92f 100644
--- a/include/xrpl/protocol/detail/ledger_entries.macro
+++ b/include/xrpl/protocol/detail/ledger_entries.macro
@@ -84,7 +84,7 @@ LEDGER_ENTRY(ltNEGATIVE_UNL, 0x004e, NegativeUNL, nunl, ({
 
 /** A ledger object which contains a list of NFTs
 
-    \sa keylet::nftpage_min, keylet::nftpage_max, keylet::nftpage
+    \sa keylet::nftpageMin, keylet::nftpageMax, keylet::nftpage
  */
 LEDGER_ENTRY(ltNFTOKEN_PAGE, 0x0050, NFTokenPage, nft_page, ({
     {sfPreviousPageMin,      SoeOptional},
@@ -112,7 +112,7 @@ LEDGER_ENTRY(ltSIGNER_LIST, 0x0053, SignerList, signer_list, ({
 
 /** A ledger object which describes a ticket.
 
-    \sa keylet::ticket
+    \sa keylet::kTicket
  */
 LEDGER_ENTRY(ltTICKET, 0x0054, Ticket, ticket, ({
     {sfAccount,              SoeRequired},
diff --git a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
index 3b37dff23c..5aaa417ad9 100644
--- a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
@@ -183,15 +183,15 @@ trustCreate(
     bool const bSrcHigh,
     AccountID const& uSrcAccountID,
     AccountID const& uDstAccountID,
-    uint256 const& uIndex,      // --> ripple state entry
-    SLE::ref sleAccount,        // --> the account being set.
-    bool const bAuth,           // --> authorize account.
-    bool const bNoRipple,       // --> others cannot ripple through
-    bool const bFreeze,         // --> funds cannot leave
-    bool bDeepFreeze,           // --> can neither receive nor send funds
-    STAmount const& saBalance,  // --> balance of account being set.
+    uint256 const& uIndex,      // ripple state entry
+    SLE::ref sleAccount,        // the account being set.
+    bool const bAuth,           // authorize account.
+    bool const bNoRipple,       // others cannot ripple through
+    bool const bFreeze,         // funds cannot leave
+    bool bDeepFreeze,           // can neither receive nor send funds
+    STAmount const& saBalance,  // balance of account being set.
                                 // Issuer should be noAccount()
-    STAmount const& saLimit,    // --> limit for account being set.
+    STAmount const& saLimit,    // limit for account being set.
                                 // Issuer should be the account being set.
     std::uint32_t uQualityIn,
     std::uint32_t uQualityOut,
diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
index 0c20392f4f..c9dccb884d 100644
--- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
@@ -1191,7 +1191,7 @@ directSendNoLimitMultiMPT(
     // Use uint64_t, not STAmount, to keep MaximumAmount comparisons in exact
     // integer arithmetic. STAmount implicitly converts to Number, whose
     // small-scale mantissa (~16 digits) can lose precision for values near
-    // maxMPTokenAmount (19 digits).
+    // kMaxMpTokenAmount (19 digits).
     std::uint64_t totalSendAmount{0};
     std::uint64_t const maximumAmount = sle->at(~sfMaximumAmount).value_or(kMaxMpTokenAmount);
     std::uint64_t const outstandingAmount = sle->getFieldU64(sfOutstandingAmount);
diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp
index 81a30fc5ef..995013a3ca 100644
--- a/src/libxrpl/tx/Transactor.cpp
+++ b/src/libxrpl/tx/Transactor.cpp
@@ -1238,7 +1238,7 @@ Transactor::operator()()
 
     if (isTecClaim(result) && ((view().flags() & TapFailHard) != 0u))
     {
-        // If the tapFAIL_HARD flag is set, a tec result
+        // If the TapFailHard flag is set, a tec result
         // must not do anything
         ctx_.discard();
         applied = false;
diff --git a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
index 085af8b4c7..990767c819 100644
--- a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
+++ b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
@@ -115,8 +115,8 @@ DelegateSet::doApply()
 
     (*sle)[sfOwnerNode] = *page;
 
-    // Add to authorized account's owner directory so the object can be found
-    // and cleaned up when the authorized account is deleted.
+    // Add to authorized account's owner directory so AccountDelete can find
+    // and clean up inbound delegations when the authorized account is deleted.
     auto const destPage = ctx_.view().dirInsert(
         keylet::ownerDir(authAccount), delegateKey, describeOwnerDir(authAccount));
 
diff --git a/src/libxrpl/tx/transactors/dex/AMMVote.cpp b/src/libxrpl/tx/transactors/dex/AMMVote.cpp
index 30ae6004f0..a4afb5392e 100644
--- a/src/libxrpl/tx/transactors/dex/AMMVote.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMVote.cpp
@@ -80,14 +80,14 @@ AMMVote::preclaim(PreclaimContext const& ctx)
 }
 
 static std::pair<TER, bool>
-applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journal j)
+applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& accountID, beast::Journal j)
 {
     auto const feeNew = ctx.tx[sfTradingFee];
     auto ammSle = sb.peek(keylet::amm(ctx.tx[sfAsset], ctx.tx[sfAsset2]));
     if (!ammSle)
         return {tecINTERNAL, false};
     STAmount const lptAMMBalance = (*ammSle)[sfLPTokenBalance];
-    auto const lpTokensNew = ammLPHolds(sb, *ammSle, account, ctx.journal);
+    auto const lpTokensNew = ammLPHolds(sb, *ammSle, accountID, ctx.journal);
     std::optional<STAmount> minTokens;
     std::size_t minPos{0};
     AccountID minAccount{0};
@@ -108,13 +108,13 @@ applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journ
         auto lpTokens = ammLPHolds(sb, *ammSle, entryAccount, ctx.journal);
         if (lpTokens == beast::kZero)
         {
-            JLOG(j.debug()) << "AMMVote::applyVote, account " << entryAccount << " is not LP";
+            JLOG(j.debug()) << "AMMVote::applyVote, accountID " << entryAccount << " is not LP";
             continue;
         }
         auto feeVal = entry[sfTradingFee];
         STObject newEntry = STObject::makeInnerObject(sfVoteEntry);
         // The account already has the vote entry.
-        if (entryAccount == account)
+        if (entryAccount == accountID)
         {
             lpTokens = lpTokensNew;
             feeVal = feeNew;
@@ -156,7 +156,7 @@ applyVote(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journ
                 sfVoteWeight,
                 static_cast<std::int64_t>(
                     Number(lpTokensNew) * kVoteWeightScaleFactor / lptAMMBalance));
-            newEntry.setAccountID(sfAccount, account);
+            newEntry.setAccountID(sfAccount, accountID);
             num += feeNew * lpTokensNew;
             den += lpTokensNew;
             if (minPos)
diff --git a/src/libxrpl/tx/transactors/lending/LoanPay.cpp b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
index 89e7bee60b..12a0212b72 100644
--- a/src/libxrpl/tx/transactors/lending/LoanPay.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
@@ -99,7 +99,7 @@ LoanPay::calculateBaseFee(ReadView const& view, STTx const& tx)
 
     if (loanSle->at(sfPaymentRemaining) <= kLoanPaymentsPerFeeIncrement)
     {
-        // If there are fewer than loanPaymentsPerFeeIncrement payments left to
+        // If there are fewer than kLoanPaymentsPerFeeIncrement payments left to
         // pay, we can skip the computations.
         return normalCost;
     }
diff --git a/src/test/app/AMMMPT_test.cpp b/src/test/app/AMMMPT_test.cpp
index 4d073d0188..eba388e5fd 100644
--- a/src/test/app/AMMMPT_test.cpp
+++ b/src/test/app/AMMMPT_test.cpp
@@ -7037,7 +7037,7 @@ private:
         }
 
         // This test validates both invariant changes work together for
-        // the specific case of MPT/MPT pools with > maxDeletableAMMTrustLines.
+        // the specific case of MPT/MPT pools with > kMaxDeletableAmmTrustLines.
         {
             Env env(
                 *this,
diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp
index 4b24f83180..775e18656b 100644
--- a/src/test/app/Invariants_test.cpp
+++ b/src/test/app/Invariants_test.cpp
@@ -182,7 +182,7 @@ class Invariants_test : public beast::unit_test::Suite
 
         // Invariants normally run in the Transaction's "apply" (operator()) context, and can always
         // access global Rules.
-        CurrentTransactionRulesGuard const rg(ov.rules());
+        CurrentTransactionRulesGuard const rulesGuard(ov.rules());
 
         BEAST_EXPECT(precheck(a1, a2, ac));
 
diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp
index 343f5dff94..d6f9d10f05 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -4549,7 +4549,7 @@ NetworkOPsImp::getBookPage(
                         uOfferOwnerID,
                         book.out.currency,
                         book.out.account,
-                        FreezeHandling::fhZERO_IF_FROZEN);
+                        FreezeHandling::ZeroIfFrozen);
 
                     if (saOwnerFunds.isNegative())
                     {
diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp
index d23aca8744..0f70f17046 100644
--- a/src/xrpld/app/misc/detail/TxQ.cpp
+++ b/src/xrpld/app/misc/detail/TxQ.cpp
@@ -395,7 +395,7 @@ TxQ::canBeHeld(
     // PreviousTxnID is deprecated and should never be used.
     // AccountTxnID is not supported by the transaction
     // queue yet, but should be added in the future.
-    // tapFAIL_HARD transactions are never held
+    // TapFailHard transactions are never held
     if (tx.isFieldPresent(sfPreviousTxnID) || tx.isFieldPresent(sfAccountTxnID) ||
         ((flags & TapFailHard) != 0u))
         return telCAN_NOT_QUEUE;

From 93836f22db8e71acad06d6a390f25d3d41795380 Mon Sep 17 00:00:00 2001
From: Michael Legleux <legleux@users.noreply.github.com>
Date: Fri, 15 May 2026 22:08:37 -0700
Subject: [PATCH 06/12] ci: Add Linux package builds (DEB + RPM) to CI (#6639)

---
 .github/scripts/strategy-matrix/generate.py |  64 +++++--
 .github/scripts/strategy-matrix/linux.json  |   6 +-
 .github/workflows/on-pr.yml                 |  12 ++
 .github/workflows/on-tag.yml                |  23 ++-
 .github/workflows/on-trigger.yml            |   9 +
 .github/workflows/reusable-package.yml      |  99 ++++++++++
 CMakeLists.txt                              |   1 +
 cfg/validators-example.txt                  |   2 +-
 cmake/XrplPackaging.cmake                   |  44 +++++
 cspell.config.yaml                          |  12 +-
 package/README.md                           | 175 ++++++++++++++++++
 package/build_pkg.sh                        | 192 ++++++++++++++++++++
 package/debian/control                      |  23 +++
 package/debian/copyright                    |  18 ++
 package/debian/rules                        |  27 +++
 package/debian/source/format                |   1 +
 package/debian/xrpld.docs                   |   2 +
 package/debian/xrpld.links                  |   2 +
 package/rpm/xrpld.spec                      | 100 ++++++++++
 package/shared/50-xrpld.preset              |   4 +
 package/shared/update-xrpld                 | 152 ++++++++++++++++
 package/shared/update-xrpld.service         |  16 ++
 package/shared/update-xrpld.timer           |  10 +
 package/shared/xrpld.logrotate              |  19 ++
 package/shared/xrpld.service                |  22 +++
 package/shared/xrpld.sysusers               |   1 +
 package/shared/xrpld.tmpfiles               |   2 +
 src/test/app/ValidatorSite_test.cpp         |   2 +-
 src/xrpld/core/detail/Config.cpp            |   4 +-
 29 files changed, 1018 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/reusable-package.yml
 create mode 100644 cmake/XrplPackaging.cmake
 create mode 100644 package/README.md
 create mode 100755 package/build_pkg.sh
 create mode 100644 package/debian/control
 create mode 100644 package/debian/copyright
 create mode 100644 package/debian/rules
 create mode 100644 package/debian/source/format
 create mode 100644 package/debian/xrpld.docs
 create mode 100644 package/debian/xrpld.links
 create mode 100644 package/rpm/xrpld.spec
 create mode 100644 package/shared/50-xrpld.preset
 create mode 100755 package/shared/update-xrpld
 create mode 100644 package/shared/update-xrpld.service
 create mode 100644 package/shared/update-xrpld.timer
 create mode 100644 package/shared/xrpld.logrotate
 create mode 100644 package/shared/xrpld.service
 create mode 100644 package/shared/xrpld.sysusers
 create mode 100644 package/shared/xrpld.tmpfiles

diff --git a/.github/scripts/strategy-matrix/generate.py b/.github/scripts/strategy-matrix/generate.py
index 6f00c69416..6eccfcc6be 100755
--- a/.github/scripts/strategy-matrix/generate.py
+++ b/.github/scripts/strategy-matrix/generate.py
@@ -32,7 +32,32 @@ We will further set additional CMake arguments as follows:
 """
 
 
-def generate_strategy_matrix(all: bool, config: Config) -> list:
+def build_config_name(os_entry: dict[str, str], platform: str, build_type: str) -> str:
+    parts = [os_entry["distro_name"]]
+    for key in ("distro_version", "compiler_name", "compiler_version"):
+        if value := os_entry[key]:
+            parts.append(value)
+    parts.append("arm64" if "arm64" in platform else "amd64")
+    parts.append(build_type.lower())
+    return "-".join(parts)
+
+
+def generate_packaging_matrix(config: Config) -> list[dict]:
+    """Emit one entry per os entry with `package: true`. Architecture is
+    hardcoded to linux/amd64 here (and the runner is hardcoded at the
+    workflow level) until arm64 packaging is ready.
+    """
+    return [
+        {
+            "artifact_name": f"xrpld-{build_config_name(os, 'linux/amd64', 'Release')}",
+            "os": os,
+        }
+        for os in config.os
+        if os.get("package", False)
+    ]
+
+
+def generate_strategy_matrix(all: bool, config: Config) -> list[dict]:
     configurations = []
     for architecture, os, build_type, cmake_args in itertools.product(
         config.architecture, config.os, config.build_type, config.cmake_args
@@ -101,14 +126,15 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
                     continue
 
             # RHEL:
-            # - 9 using GCC 12: Debug on linux/amd64.
+            # - 9 using GCC 12: Debug and Release on linux/amd64
+            #   (Release is required for RPM packaging).
             # - 10 using Clang: Release on linux/amd64.
             if os["distro_name"] == "rhel":
                 skip = True
                 if os["distro_version"] == "9":
                     if (
                         f"{os['compiler_name']}-{os['compiler_version']}" == "gcc-12"
-                        and build_type == "Debug"
+                        and build_type in ["Debug", "Release"]
                         and architecture["platform"] == "linux/amd64"
                     ):
                         skip = False
@@ -123,7 +149,8 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
                     continue
 
             # Ubuntu:
-            # - Jammy using GCC 12: Debug on linux/arm64.
+            # - Jammy using GCC 12: Debug on linux/arm64, Release on
+            #   linux/amd64 (Release is required for DEB packaging).
             # - Noble using GCC 14: Release on linux/amd64.
             # - Noble using Clang 18: Debug on linux/amd64.
             # - Noble using Clang 19: Release on linux/arm64.
@@ -136,6 +163,12 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
                         and architecture["platform"] == "linux/arm64"
                     ):
                         skip = False
+                    if (
+                        f"{os['compiler_name']}-{os['compiler_version']}" == "gcc-12"
+                        and build_type == "Release"
+                        and architecture["platform"] == "linux/amd64"
+                    ):
+                        skip = False
                 elif os["distro_version"] == "noble":
                     if (
                         f"{os['compiler_name']}-{os['compiler_version']}" == "gcc-14"
@@ -218,17 +251,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
 
         # Generate a unique name for the configuration, e.g. macos-arm64-debug
         # or debian-bookworm-gcc-12-amd64-release.
-        config_name = os["distro_name"]
-        if (n := os["distro_version"]) != "":
-            config_name += f"-{n}"
-        if (n := os["compiler_name"]) != "":
-            config_name += f"-{n}"
-        if (n := os["compiler_version"]) != "":
-            config_name += f"-{n}"
-        config_name += (
-            f"-{architecture['platform'][architecture['platform'].find('/')+1:]}"
-        )
-        config_name += f"-{build_type.lower()}"
+        config_name = build_config_name(os, architecture["platform"], build_type)
         if "-Dcoverage=ON" in cmake_args:
             config_name += "-coverage"
         if "-Dunity=ON" in cmake_args:
@@ -332,10 +355,19 @@ if __name__ == "__main__":
         required=False,
         type=Path,
     )
+    parser.add_argument(
+        "-p",
+        "--packaging",
+        help="Emit the packaging matrix (derived from the 'package' field on os entries) instead of the build/test matrix.",
+        action="store_true",
+    )
     args = parser.parse_args()
 
     matrix = []
-    if args.config is None or args.config == "":
+    if args.packaging:
+        config_path = args.config if args.config else THIS_DIR / "linux.json"
+        matrix += generate_packaging_matrix(read_config(config_path))
+    elif args.config is None or args.config == "":
         matrix += generate_strategy_matrix(
             args.all, read_config(THIS_DIR / "linux.json")
         )
diff --git a/.github/scripts/strategy-matrix/linux.json b/.github/scripts/strategy-matrix/linux.json
index 1b9af523cb..4f090a81a3 100644
--- a/.github/scripts/strategy-matrix/linux.json
+++ b/.github/scripts/strategy-matrix/linux.json
@@ -127,7 +127,8 @@
       "distro_version": "9",
       "compiler_name": "gcc",
       "compiler_version": "12",
-      "image_sha": "4c086b9"
+      "image_sha": "4c086b9",
+      "package": true
     },
     {
       "distro_name": "rhel",
@@ -169,7 +170,8 @@
       "distro_version": "jammy",
       "compiler_name": "gcc",
       "compiler_version": "12",
-      "image_sha": "4c086b9"
+      "image_sha": "4c086b9",
+      "package": true
     },
     {
       "distro_name": "ubuntu",
diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml
index d95f3a6c00..ca715e0376 100644
--- a/.github/workflows/on-pr.yml
+++ b/.github/workflows/on-pr.yml
@@ -64,11 +64,13 @@ jobs:
             .github/workflows/reusable-build-test-config.yml
             .github/workflows/reusable-build-test.yml
             .github/workflows/reusable-clang-tidy.yml
+            .github/workflows/reusable-package.yml
             .github/workflows/reusable-strategy-matrix.yml
             .github/workflows/reusable-test.yml
             .github/workflows/reusable-upload-recipe.yml
             .clang-tidy
             .codecov.yml
+            cfg/**
             cmake/**
             conan/**
             external/**
@@ -78,6 +80,10 @@ jobs:
             CMakeLists.txt
             conanfile.py
             conan.lock
+            LICENSE.md
+            package/**
+            README.md
+
       - name: Check whether to run
         # This step determines whether the rest of the workflow should
         # run. The rest of the workflow will run if this job runs AND at
@@ -134,6 +140,11 @@ jobs:
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
+  package:
+    needs: [should-run, build-test]
+    if: ${{ needs.should-run.outputs.go == 'true' }}
+    uses: ./.github/workflows/reusable-package.yml
+
   upload-recipe:
     needs:
       - should-run
@@ -168,6 +179,7 @@ jobs:
       - check-rename
       - clang-tidy
       - build-test
+      - package
       - upload-recipe
       - notify-clio
     runs-on: ubuntu-latest
diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
index e570a0e119..b7517ccf11 100644
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -1,5 +1,5 @@
-# This workflow uploads the libxrpl recipe to the Conan remote when a versioned
-# tag is pushed.
+# This workflow uploads the libxrpl recipe to the Conan remote and builds
+# release packages when a versioned tag is pushed.
 name: Tag
 
 on:
@@ -22,3 +22,22 @@ jobs:
     secrets:
       remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }}
       remote_password: ${{ secrets.CONAN_REMOTE_PASSWORD }}
+
+  build-test:
+    if: ${{ github.repository == 'XRPLF/rippled' }}
+    uses: ./.github/workflows/reusable-build-test.yml
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [linux]
+    with:
+      ccache_enabled: false
+      os: ${{ matrix.os }}
+      strategy_matrix: minimal
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  package:
+    if: ${{ github.repository == 'XRPLF/rippled' }}
+    needs: build-test
+    uses: ./.github/workflows/reusable-package.yml
diff --git a/.github/workflows/on-trigger.yml b/.github/workflows/on-trigger.yml
index 11d98bffb7..803ba3c87b 100644
--- a/.github/workflows/on-trigger.yml
+++ b/.github/workflows/on-trigger.yml
@@ -21,11 +21,13 @@ on:
       - ".github/workflows/reusable-build-test-config.yml"
       - ".github/workflows/reusable-build-test.yml"
       - ".github/workflows/reusable-clang-tidy.yml"
+      - ".github/workflows/reusable-package.yml"
       - ".github/workflows/reusable-strategy-matrix.yml"
       - ".github/workflows/reusable-test.yml"
       - ".github/workflows/reusable-upload-recipe.yml"
       - ".clang-tidy"
       - ".codecov.yml"
+      - "cfg/**"
       - "cmake/**"
       - "conan/**"
       - "external/**"
@@ -35,6 +37,9 @@ on:
       - "CMakeLists.txt"
       - "conanfile.py"
       - "conan.lock"
+      - "LICENSE.md"
+      - "package/**"
+      - "README.md"
 
   # Run at 06:32 UTC on every day of the week from Monday through Friday. This
   # will force all dependencies to be rebuilt, which is useful to verify that
@@ -95,3 +100,7 @@ jobs:
     secrets:
       remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }}
       remote_password: ${{ secrets.CONAN_REMOTE_PASSWORD }}
+
+  package:
+    needs: build-test
+    uses: ./.github/workflows/reusable-package.yml
diff --git a/.github/workflows/reusable-package.yml b/.github/workflows/reusable-package.yml
new file mode 100644
index 0000000000..ad73cd8733
--- /dev/null
+++ b/.github/workflows/reusable-package.yml
@@ -0,0 +1,99 @@
+# Build Linux packages (DEB and RPM) from pre-built binary artifacts.
+# Discovers which configurations to package from linux.json (os entries
+# with "package": true) and fans out one job per entry. Today only
+# linux/amd64 is emitted; the architecture is hardcoded both here
+# (runner) and in generate.py.
+name: Package
+
+on:
+  workflow_call:
+    inputs:
+      pkg_release:
+        description: "Package release number. Increment when repackaging the same executable."
+        required: false
+        type: string
+        default: "1"
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  BUILD_DIR: build
+
+jobs:
+  generate-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.generate.outputs.matrix }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Set up Python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        with:
+          python-version: 3.13
+
+      - name: Generate packaging matrix
+        id: generate
+        working-directory: .github/scripts/strategy-matrix
+        run: |
+          ./generate.py --packaging --config=linux.json >> "${GITHUB_OUTPUT}"
+
+  generate-version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          sparse-checkout: |
+            .github/actions/generate-version
+            src/libxrpl/protocol/BuildInfo.cpp
+      - name: Generate version
+        id: version
+        uses: ./.github/actions/generate-version
+
+  package:
+    needs: [generate-matrix, generate-version]
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
+    name: "${{ matrix.artifact_name }}"
+    permissions:
+      contents: read
+    runs-on: ["self-hosted", "Linux", "X64", "heavy"]
+    container: ${{ format('ghcr.io/xrplf/ci/{0}-{1}:{2}-{3}-sha-{4}', matrix.os.distro_name, matrix.os.distro_version, matrix.os.compiler_name, matrix.os.compiler_version, matrix.os.image_sha) }}
+    timeout-minutes: 30
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
+      - name: Download pre-built binary
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: ${{ matrix.artifact_name }}
+          path: ${{ env.BUILD_DIR }}
+
+      - name: Make binary executable
+        run: chmod +x "${BUILD_DIR}/xrpld"
+
+      - name: Build package
+        env:
+          PKG_VERSION: ${{ needs.generate-version.outputs.version }}
+          PKG_RELEASE: ${{ inputs.pkg_release }}
+        run: ./package/build_pkg.sh
+
+      - name: Upload package artifact
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        if: ${{ github.event.repository.visibility == 'public' }}
+        with:
+          name: ${{ matrix.artifact_name }}-pkg-${{ needs.generate-version.outputs.version }}
+          path: |
+            ${{ env.BUILD_DIR }}/debbuild/*.deb
+            ${{ env.BUILD_DIR }}/debbuild/*.ddeb
+            ${{ env.BUILD_DIR }}/rpmbuild/RPMS/**/*.rpm
+          if-no-files-found: error
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80ff8fec13..d315a5dcec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,6 +134,7 @@ endif()
 include(XrplCore)
 include(XrplProtocolAutogen)
 include(XrplInstall)
+include(XrplPackaging)
 include(XrplValidatorKeys)
 
 if(tests)
diff --git a/cfg/validators-example.txt b/cfg/validators-example.txt
index 384db924f4..d690a67501 100644
--- a/cfg/validators-example.txt
+++ b/cfg/validators-example.txt
@@ -28,7 +28,7 @@
 #    https://vl.ripple.com
 #    https://unl.xrplf.org
 #    http://127.0.0.1:8000
-#    file:///etc/opt/xrpld/vl.txt
+#    file:///etc/xrpld/vl.txt
 #
 # [validator_list_keys]
 #
diff --git a/cmake/XrplPackaging.cmake b/cmake/XrplPackaging.cmake
new file mode 100644
index 0000000000..fe885c200c
--- /dev/null
+++ b/cmake/XrplPackaging.cmake
@@ -0,0 +1,44 @@
+#[===================================================================[
+   Linux packaging support: 'package' target.
+
+   The packaging script (package/build_pkg.sh) installs to FHS-standard
+   paths (/usr/bin, /etc/xrpld, etc.) regardless of CMAKE_INSTALL_PREFIX,
+   so no prefix guard is needed here.
+#]===================================================================]
+if(NOT is_linux)
+    message(STATUS "Packaging not supported on non-Linux hosts")
+    return()
+endif()
+
+if(NOT DEFINED pkg_release)
+    set(pkg_release 1)
+endif()
+
+find_program(RPMBUILD_EXECUTABLE rpmbuild)
+find_program(DPKG_BUILDPACKAGE_EXECUTABLE dpkg-buildpackage)
+
+if(NOT (RPMBUILD_EXECUTABLE OR DPKG_BUILDPACKAGE_EXECUTABLE))
+    message(
+        STATUS
+        "Neither rpmbuild nor dpkg-buildpackage found; 'package' target not available"
+    )
+    return()
+endif()
+
+set(package_env
+    SRC_DIR=${CMAKE_SOURCE_DIR}
+    BUILD_DIR=${CMAKE_BINARY_DIR}
+    PKG_VERSION=${xrpld_version}
+    PKG_RELEASE=${pkg_release}
+)
+
+add_custom_target(
+    package
+    COMMAND
+        ${CMAKE_COMMAND} -E env ${package_env}
+        ${CMAKE_SOURCE_DIR}/package/build_pkg.sh
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    DEPENDS xrpld
+    COMMENT "Building Linux package (deb/rpm inferred from host tooling)"
+    VERBATIM
+)
diff --git a/cspell.config.yaml b/cspell.config.yaml
index bc56ef5d79..275df41f58 100644
--- a/cspell.config.yaml
+++ b/cspell.config.yaml
@@ -99,12 +99,15 @@ words:
   - desync
   - desynced
   - determ
+  - disablerepo
   - distro
   - doxyfile
   - dxrpl
   - enabled
+  - enablerepo
   - endmacro
   - exceptioned
+  - EXPECT_STREQ
   - Falco
   - fcontext
   - finalizers
@@ -162,6 +165,7 @@ words:
   - Merkle
   - Metafuncton
   - misprediction
+  - missingok
   - mptbalance
   - MPTDEX
   - mptflags
@@ -193,7 +197,9 @@ words:
   - NOLINT
   - NOLINTNEXTLINE
   - nonxrp
+  - noreplace
   - noripple
+  - notifempty
   - nudb
   - nullptr
   - nunl
@@ -213,6 +219,7 @@ words:
   - preauthorize
   - preauthorizes
   - preclaim
+  - preun
   - protobuf
   - protos
   - ptrs
@@ -247,12 +254,14 @@ words:
   - sfields
   - shamap
   - shamapitem
+  - shlibs
   - sidechain
   - SIGGOOD
   - sle
   - sles
   - soci
   - socidb
+  - SRPMS
   - sslws
   - statsd
   - STATSDCOLLECTOR
@@ -280,8 +289,8 @@ words:
   - txn
   - txns
   - txs
-  - UBSAN
   - ubsan
+  - UBSAN
   - umant
   - unacquired
   - unambiguity
@@ -318,7 +327,6 @@ words:
   - xbridge
   - xchain
   - ximinez
-  - EXPECT_STREQ
   - XMACRO
   - xrpkuwait
   - xrpl
diff --git a/package/README.md b/package/README.md
new file mode 100644
index 0000000000..2089e32e64
--- /dev/null
+++ b/package/README.md
@@ -0,0 +1,175 @@
+# Linux Packaging
+
+This directory contains all files needed to build RPM and Debian packages for `xrpld`.
+
+## Directory layout
+
+```
+package/
+  build_pkg.sh      Staging and build script (called by CMake targets and CI)
+  rpm/
+    xrpld.spec      RPM spec (xrpld_version/pkg_release passed via rpmbuild --define)
+  debian/           Debian control files (control, rules, install, links, conffiles, ...)
+  shared/
+    xrpld.service       systemd unit file (used by both RPM and DEB)
+    xrpld.sysusers      sysusers.d config (used by both RPM and DEB)
+    xrpld.tmpfiles      tmpfiles.d config (used by both RPM and DEB)
+    xrpld.logrotate     logrotate config (installed to /etc/logrotate.d/xrpld)
+    update-xrpld        auto-update script (installed to /usr/libexec/xrpld/, run by update-xrpld.timer)
+```
+
+## Prerequisites
+
+Packaging targets and their container images are declared in
+[`.github/scripts/strategy-matrix/linux.json`](../.github/scripts/strategy-matrix/linux.json)
+via a `"package": true` field on specific os entries. Today only
+`linux/amd64` is emitted; the architecture is hardcoded in `generate.py`
+and the workflow runner. The package format
+(deb or rpm) is inferred at build time from the container's package manager
+(`apt-get` -> deb, `dnf`/`yum` -> rpm). The image tag is composed as
+`ghcr.io/xrplf/ci/{distro}-{version}:{compiler}-{cver}-sha-{image_sha}` —
+the same scheme used by `reusable-build-test.yml`. Bump `image_sha` in
+`linux.json` and both CI and local builds pick up the new image with no
+workflow edits.
+
+| Package type | Image (derived from `linux.json`)                    | Tool required                                                   |
+| ------------ | ---------------------------------------------------- | --------------------------------------------------------------- |
+| RPM          | `ghcr.io/xrplf/ci/rhel-9:gcc-12-sha-<git_sha>`       | `rpmbuild`                                                      |
+| DEB          | `ghcr.io/xrplf/ci/ubuntu-jammy:gcc-12-sha-<git_sha>` | `dpkg-buildpackage`, `debhelper (>= 13)`, `dh-sequence-systemd` |
+
+To print the exact image tags for the current `linux.json`:
+
+```bash
+./.github/scripts/strategy-matrix/generate.py --packaging --config=.github/scripts/strategy-matrix/linux.json
+```
+
+## Building packages
+
+### Via CI
+
+Caller workflows (`on-pr.yml`, `on-tag.yml`, `on-trigger.yml`) call
+`reusable-strategy-matrix.yml` with `mode: packaging` to generate the matrix of
+`{artifact_name, os}` entries, then fan out to
+`reusable-package.yml` per entry. That workflow downloads the pre-built `xrpld`
+binary artifact, detects the package format from the container, and calls
+`build_pkg.sh` directly — no CMake configure or build step is needed inside
+the packaging job.
+
+### Locally (mirrors CI)
+
+With an `xrpld` binary already built at `build/xrpld`, run the packaging step
+inside the same container CI uses. The image tag is derived from `linux.json`
+so you don't need to hardcode a SHA.
+
+```bash
+# From the repo root. Pick any image flagged with `"package": true` in
+# linux.json; the package format is inferred from the container's package
+# manager. Example for the rpm-producing image:
+IMAGE=$(jq -r '
+  .os | map(select(.package == true))[0] |
+  "ghcr.io/xrplf/ci/\(.distro_name)-\(.distro_version):\(.compiler_name)-\(.compiler_version)-sha-\(.image_sha)"
+' .github/scripts/strategy-matrix/linux.json)
+
+VERSION=2.4.0-local
+PKG_RELEASE=1
+
+docker run --rm \
+  -v "$(pwd):/src" \
+  -w /src \
+  "$IMAGE" \
+  ./package/build_pkg.sh --pkg-version "$VERSION" --pkg-release "$PKG_RELEASE"
+
+# Output:
+#   build/debbuild/*.deb         (DEB + dbgsym .ddeb)
+#   build/rpmbuild/RPMS/x86_64/*.rpm
+```
+
+### Via CMake (host-side target)
+
+If you run CMake configure on a host that has `rpmbuild` or `dpkg-buildpackage`
+installed natively, you can use the CMake target directly — no container
+needed, but the host toolchain replaces the pinned CI image:
+
+```bash
+cmake \
+  -Dxrpld=ON \
+  -Dxrpld_version=2.4.0-local \
+  -Dtests=OFF \
+  ..
+
+cmake --build . --target package       # deb on Debian/Ubuntu, rpm on RHEL
+```
+
+The `cmake/XrplPackaging.cmake` module defines the target only if at least one
+of `rpmbuild` / `dpkg-buildpackage` is present; `build_pkg.sh` then infers the
+package format from the host's package manager. The packaging script installs
+to FHS-standard paths (`/usr/bin`, `/etc/xrpld`, etc.) regardless of
+`CMAKE_INSTALL_PREFIX`.
+
+## How `build_pkg.sh` works
+
+`build_pkg.sh` accepts long-form flags, each of which can also be set via an
+environment variable. Flags override env vars; env vars override the built-in
+defaults. Run `./package/build_pkg.sh --help` for the same table:
+
+| Flag                       | Env var             | Default                       | Purpose                             |
+| -------------------------- | ------------------- | ----------------------------- | ----------------------------------- |
+| `--src-dir DIR`            | `SRC_DIR`           | `$PWD`                        | repo root                           |
+| `--build-dir DIR`          | `BUILD_DIR`         | `$PWD/build`                  | directory holding pre-built `xrpld` |
+| `--pkg-version STR`        | `PKG_VERSION`       | parsed from `xrpld --version` | version string, e.g. `3.2.0-b1`     |
+| `--pkg-release N`          | `PKG_RELEASE`       | `1`                           | package release number              |
+| `--source-date-epoch SECS` | `SOURCE_DATE_EPOCH` | latest git commit ctime       | reproducibility timestamp           |
+
+The package format (`deb` or `rpm`) is inferred from the host's package
+manager (`apt-get` -> deb, `dnf`/`yum` -> rpm). Hosts without one of those
+fail early.
+
+Flags are for explicit invocation; environment variables are intended for
+CMake/systemd/CI integration. The CI workflow and the CMake `package` target
+both invoke `build_pkg.sh` with no flags, configuring it entirely via env
+(see `cmake/XrplPackaging.cmake`).
+
+It resolves `SRC_DIR` and `BUILD_DIR` to absolute paths, then calls
+`stage_common()` to copy the binary, config files, and shared support files
+into the staging area, and invokes the platform build tool.
+
+### RPM
+
+1. Creates the standard `rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}` tree inside the build directory.
+2. Copies `xrpld.spec` and all source files (binary, configs, service files) into `SOURCES/`.
+3. Runs `rpmbuild -bb --define "xrpld_version ..." --define "pkg_release ..."`. The spec uses manual `install` commands to place files.
+4. Output: `rpmbuild/RPMS/x86_64/xrpld-*.rpm`
+
+### DEB
+
+1. Creates a staging source tree at `debbuild/source/` inside the build directory.
+2. Stages the binary, configs, `README.md`, and `LICENSE.md`.
+3. Copies `package/debian/` control files into `debbuild/source/debian/`.
+4. Copies shared service/sysusers/tmpfiles into `debian/` where `dh_installsystemd`, `dh_installsysusers`, and `dh_installtmpfiles` pick them up automatically.
+5. Generates a minimal `debian/changelog` (pre-release versions use `~` instead of `-`).
+6. Runs `dpkg-buildpackage -b --no-sign`. `debian/rules` uses manual `install` commands.
+7. Output: `debbuild/*.deb` and `debbuild/*.ddeb` (dbgsym package)
+
+## Post-build verification
+
+```bash
+# DEB
+dpkg-deb -c debbuild/*.deb | grep -E 'systemd|sysusers|tmpfiles'
+lintian -I debbuild/*.deb
+
+# RPM
+rpm -qlp rpmbuild/RPMS/x86_64/*.rpm
+```
+
+## Reproducibility
+
+The following environment variables improve build reproducibility. They are not
+set automatically by `build_pkg.sh`; set them manually if needed:
+
+```bash
+export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
+export TZ=UTC
+export LC_ALL=C.UTF-8
+export GZIP=-n
+export DEB_BUILD_OPTIONS="noautodbgsym reproducible=+fixfilepath"
+```
diff --git a/package/build_pkg.sh b/package/build_pkg.sh
new file mode 100755
index 0000000000..c834951493
--- /dev/null
+++ b/package/build_pkg.sh
@@ -0,0 +1,192 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Build an RPM or Debian package from a pre-built xrpld binary.
+#
+# Flags override env vars; env vars override defaults. Env vars are intended
+# for CMake/systemd/CI integration; flags are for explicit invocation.
+
+usage() {
+    cat <<'EOF'
+Usage: build_pkg.sh [options]
+
+Options (each can also be set via the env var shown):
+  --src-dir DIR             repo root                  [SRC_DIR;           default: $PWD]
+  --build-dir DIR           directory holding xrpld    [BUILD_DIR;         default: $PWD/build]
+  --pkg-version STR         version, e.g. 3.2.0-b1     [PKG_VERSION;       default: parsed from xrpld --version]
+  --pkg-release N           package release number     [PKG_RELEASE;       default: 1]
+  --source-date-epoch SECS  reproducibility timestamp  [SOURCE_DATE_EPOCH; default: latest git commit ctime]
+  -h, --help                show this help and exit
+EOF
+}
+
+need_arg() {
+    if [[ $# -lt 2 || "$2" == --* ]]; then
+        echo "Missing value for $1" >&2
+        exit 2
+    fi
+}
+
+# Seed from env. CLI parsing below overrides these directly.
+SRC_DIR="${SRC_DIR:-}"
+BUILD_DIR="${BUILD_DIR:-}"
+PKG_VERSION="${PKG_VERSION:-}"
+PKG_RELEASE="${PKG_RELEASE:-}"
+SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-}"
+
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --src-dir)            need_arg "$@"; SRC_DIR="$2";           shift 2 ;;
+        --build-dir)          need_arg "$@"; BUILD_DIR="$2";         shift 2 ;;
+        --pkg-version)        need_arg "$@"; PKG_VERSION="$2";       shift 2 ;;
+        --pkg-release)        need_arg "$@"; PKG_RELEASE="$2";       shift 2 ;;
+        --source-date-epoch)  need_arg "$@"; SOURCE_DATE_EPOCH="$2"; shift 2 ;;
+        -h|--help)            usage; exit 0 ;;
+        *)
+            echo "Unknown argument: $1" >&2
+            usage >&2
+            exit 2
+            ;;
+    esac
+done
+
+SRC_DIR="$(cd "${SRC_DIR:-${PWD}}" && pwd)"
+BUILD_DIR="$(cd "${BUILD_DIR:-${PWD}/build}" && pwd)"
+PKG_RELEASE="${PKG_RELEASE:-1}"
+
+if [[ -z "${PKG_VERSION}" ]]; then
+    PKG_VERSION="$("${BUILD_DIR}/xrpld" --version | awk 'NR==1 {print $3; exit}')"
+fi
+
+if [[ -z "${PKG_VERSION}" ]]; then
+    echo "PKG_VERSION is empty (not provided and could not be derived)." >&2
+    exit 1
+fi
+
+VERSION="${PKG_VERSION}"
+
+if command -v apt-get >/dev/null 2>&1; then
+    pkg_type=deb
+elif command -v dnf >/dev/null 2>&1 || command -v yum >/dev/null 2>&1; then
+    pkg_type=rpm
+else
+    echo "Cannot infer pkg_type: no apt-get, dnf, or yum on PATH." >&2
+    exit 1
+fi
+
+if [[ -z "${SOURCE_DATE_EPOCH}" ]]; then
+    if git -C "$SRC_DIR" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        SOURCE_DATE_EPOCH="$(git -C "$SRC_DIR" log -1 --format=%ct)"
+    else
+        SOURCE_DATE_EPOCH="$(date +%s)"
+    fi
+fi
+
+export SOURCE_DATE_EPOCH
+CHANGELOG_DATE="$(date -u -R -d "@$SOURCE_DATE_EPOCH")"
+
+# Split VERSION at the first '-' into base and optional pre-release suffix.
+# Examples: "3.2.0" -> ("3.2.0", ""); "3.2.0-b1" -> ("3.2.0", "b1").
+VER_BASE="${VERSION%%-*}"
+VER_SUFFIX="${VERSION#*-}"
+[[ "${VER_SUFFIX}" == "${VERSION}" ]] && VER_SUFFIX=""
+
+# Reject multi-segment suffixes (e.g. "beta-1", "rc1-15-gabc123"). The RPM
+# Release field forbids '-', and the convention here is single-token suffixes
+# like b1 or rc2. Fail early with a clear message rather than letting either
+# rpmbuild blow up or silently mangling dashes into dots.
+if [[ "${VER_SUFFIX}" == *-* ]]; then
+    echo "build_pkg.sh: multi-segment pre-release in VERSION='${VERSION}' (suffix '${VER_SUFFIX}')." >&2
+    echo "Use single-token suffixes like 3.2.0-b1 or 3.2.0-rc2." >&2
+    exit 1
+fi
+
+SHARED="${SRC_DIR}/package/shared"
+DEBIAN_DIR="${SRC_DIR}/package/debian"
+
+# Stage files that both packaging systems consume using the same filenames.
+stage_common() {
+    local dest="$1"
+    mkdir -p "${dest}"
+
+    cp "${BUILD_DIR}/xrpld"                     "${dest}/xrpld"
+    cp "${SRC_DIR}/cfg/xrpld-example.cfg"       "${dest}/xrpld.cfg"
+    cp "${SRC_DIR}/cfg/validators-example.txt"  "${dest}/validators.txt"
+    cp "${SRC_DIR}/LICENSE.md"                  "${dest}/LICENSE.md"
+    cp "${SRC_DIR}/README.md"                   "${dest}/README.md"
+
+    cp "${SHARED}/xrpld.service"                "${dest}/xrpld.service"
+    cp "${SHARED}/xrpld.sysusers"               "${dest}/xrpld.sysusers"
+    cp "${SHARED}/xrpld.tmpfiles"               "${dest}/xrpld.tmpfiles"
+    cp "${SHARED}/xrpld.logrotate"              "${dest}/xrpld.logrotate"
+    cp "${SHARED}/update-xrpld"                 "${dest}/update-xrpld"
+    cp "${SHARED}/update-xrpld.service"         "${dest}/update-xrpld.service"
+    cp "${SHARED}/update-xrpld.timer"           "${dest}/update-xrpld.timer"
+    cp "${SHARED}/50-xrpld.preset"              "${dest}/50-xrpld.preset"
+}
+
+build_rpm() {
+    local topdir="${BUILD_DIR}/rpmbuild"
+    rm -rf "${topdir}"
+    mkdir -p "${topdir}"/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+
+    cp "${SRC_DIR}/package/rpm/xrpld.spec" "${topdir}/SPECS/xrpld.spec"
+    stage_common "${topdir}/SOURCES"
+
+    # RPM Version can't contain '-'. A pre-release goes in Release with a
+    # leading "0." so 3.2.0-b1 sorts before the final 3.2.0-<pkg_release>.
+    local rpm_release="${PKG_RELEASE}"
+    [[ -n "${VER_SUFFIX}" ]] && rpm_release="0.${VER_SUFFIX}.${PKG_RELEASE}"
+
+    set -x
+    rpmbuild -bb \
+        --define "_topdir ${topdir}" \
+        --define "xrpld_version ${VER_BASE}" \
+        --define "xrpld_release ${rpm_release}" \
+        "${topdir}/SPECS/xrpld.spec"
+}
+
+build_deb() {
+    local staging="${BUILD_DIR}/debbuild/source"
+    rm -rf "${staging}"
+    mkdir -p "${staging}"
+
+    stage_common "${staging}"
+    cp -r "${DEBIAN_DIR}" "${staging}/debian"
+
+    # Debhelper auto-discovers these only from debian/.
+    cp "${staging}/xrpld.service"        "${staging}/debian/xrpld.service"
+    cp "${staging}/xrpld.sysusers"       "${staging}/debian/xrpld.sysusers"
+    cp "${staging}/xrpld.tmpfiles"       "${staging}/debian/xrpld.tmpfiles"
+    cp "${staging}/xrpld.logrotate"      "${staging}/debian/xrpld.logrotate"
+    cp "${staging}/update-xrpld.service" "${staging}/debian/xrpld.update-xrpld.service"
+    cp "${staging}/update-xrpld.timer"   "${staging}/debian/xrpld.update-xrpld.timer"
+
+    # Debian '~' marks a pre-release; 3.2.0~b1 sorts before 3.2.0.
+    local deb_full_version="${VER_BASE}${VER_SUFFIX:+~${VER_SUFFIX}}-${PKG_RELEASE}"
+
+    # Derive release channel from the version suffix:
+    #   (none)      -> stable    (tagged release)
+    #   b0          -> develop   (develop-branch build)
+    #   b<N>, rc<N> -> unstable  (pre-release)
+    local deb_distribution
+    case "${VER_SUFFIX}" in
+        "")   deb_distribution="stable" ;;
+        b0)   deb_distribution="develop" ;;
+        *)    deb_distribution="unstable" ;;
+    esac
+
+    cat > "${staging}/debian/changelog" <<EOF
+xrpld (${deb_full_version}) ${deb_distribution}; urgency=medium
+  * Release ${VERSION}.
+
+ -- XRPL Foundation <contact@xrplf.org>  ${CHANGELOG_DATE}
+EOF
+
+    chmod +x "${staging}/debian/rules"
+
+    set -x
+    ( cd "${staging}" && dpkg-buildpackage -b --no-sign -d )
+}
+
+"build_${pkg_type}"
diff --git a/package/debian/control b/package/debian/control
new file mode 100644
index 0000000000..45d2acbbea
--- /dev/null
+++ b/package/debian/control
@@ -0,0 +1,23 @@
+Source: xrpld
+Section: net
+Priority: optional
+Maintainer: XRPL Foundation <contact@xrplf.org>
+Rules-Requires-Root: no
+Build-Depends:
+ debhelper-compat (= 13)
+Standards-Version: 4.7.0
+Homepage: https://github.com/XRPLF/rippled
+Vcs-Git: https://github.com/XRPLF/rippled.git
+Vcs-Browser: https://github.com/XRPLF/rippled
+
+Package: xrpld
+Section: net
+Priority: optional
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: XRP Ledger daemon
+ Reference implementation of the XRP Ledger protocol.
+ Participates in the peer-to-peer network, processes transactions,
+ and maintains a local ledger copy.
diff --git a/package/debian/copyright b/package/debian/copyright
new file mode 100644
index 0000000000..ddaa719e3a
--- /dev/null
+++ b/package/debian/copyright
@@ -0,0 +1,18 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: rippled
+Source: https://github.com/XRPLF/rippled
+
+Files: *
+Copyright: 2011-present, the XRP Ledger developers
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/package/debian/rules b/package/debian/rules
new file mode 100644
index 0000000000..0fae101358
--- /dev/null
+++ b/package/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE = 1
+
+%:
+	dh $@
+
+override_dh_auto_configure override_dh_auto_build override_dh_auto_test:
+	@:
+
+override_dh_installsystemd:
+	dh_installsystemd --no-start xrpld.service
+	dh_installsystemd --name=update-xrpld --no-start update-xrpld.service update-xrpld.timer
+
+execute_before_dh_installtmpfiles:
+	dh_installsysusers
+
+override_dh_installsysusers:
+
+override_dh_install:
+	install -D -m 0755 xrpld            debian/xrpld/usr/bin/xrpld
+	install -D -m 0644 xrpld.cfg        debian/xrpld/etc/xrpld/xrpld.cfg
+	install -D -m 0644 validators.txt   debian/xrpld/etc/xrpld/validators.txt
+	install -D -m 0755 update-xrpld     debian/xrpld/usr/libexec/xrpld/update-xrpld
+
+override_dh_dwz:
+	@:
diff --git a/package/debian/source/format b/package/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/package/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/package/debian/xrpld.docs b/package/debian/xrpld.docs
new file mode 100644
index 0000000000..1217b6db43
--- /dev/null
+++ b/package/debian/xrpld.docs
@@ -0,0 +1,2 @@
+README.md
+LICENSE.md
diff --git a/package/debian/xrpld.links b/package/debian/xrpld.links
new file mode 100644
index 0000000000..10d34f5b8c
--- /dev/null
+++ b/package/debian/xrpld.links
@@ -0,0 +1,2 @@
+# Legacy compat symlinks (remove next major release)
+usr/bin/xrpld          usr/local/bin/rippled
diff --git a/package/rpm/xrpld.spec b/package/rpm/xrpld.spec
new file mode 100644
index 0000000000..4933c724f7
--- /dev/null
+++ b/package/rpm/xrpld.spec
@@ -0,0 +1,100 @@
+Name:     xrpld
+Version:  %{xrpld_version}
+Release:  %{xrpld_release}%{?dist}
+Summary:  XRP Ledger daemon
+
+License:  ISC
+URL:      https://github.com/XRPLF/rippled
+
+ExclusiveArch: x86_64 aarch64
+BuildRequires: systemd-rpm-macros
+
+%undefine _debugsource_packages
+%debug_package
+
+%build_mtime_policy clamp_to_source_date_epoch
+
+%{?systemd_requires}
+%{?sysusers_requires_compat}
+
+%description
+xrpld is the reference implementation of the XRP Ledger protocol. It
+participates in the peer-to-peer XRP Ledger network, processes
+transactions, and maintains the ledger database.
+
+%prep
+:
+
+%build
+:
+
+%install
+install -Dm0755 %{_sourcedir}/xrpld                %{buildroot}%{_bindir}/%{name}
+install -Dm0644 %{_sourcedir}/xrpld.cfg            %{buildroot}%{_sysconfdir}/%{name}/xrpld.cfg
+install -Dm0644 %{_sourcedir}/validators.txt       %{buildroot}%{_sysconfdir}/%{name}/validators.txt
+
+# systemd units, sysusers, tmpfiles, preset
+install -Dm0644 %{_sourcedir}/xrpld.service        %{buildroot}%{_unitdir}/xrpld.service
+install -Dm0644 %{_sourcedir}/update-xrpld.service %{buildroot}%{_unitdir}/update-xrpld.service
+install -Dm0644 %{_sourcedir}/update-xrpld.timer   %{buildroot}%{_unitdir}/update-xrpld.timer
+install -Dm0644 %{_sourcedir}/xrpld.sysusers       %{buildroot}%{_sysusersdir}/xrpld.conf
+install -Dm0644 %{_sourcedir}/xrpld.tmpfiles       %{buildroot}%{_tmpfilesdir}/xrpld.conf
+install -Dm0644 %{_sourcedir}/50-xrpld.preset      %{buildroot}%{_presetdir}/50-xrpld.preset
+
+# Logrotate config
+install -Dm0644 %{_sourcedir}/xrpld.logrotate      %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+# Update helper
+install -Dm0755 %{_sourcedir}/update-xrpld         %{buildroot}%{_libexecdir}/%{name}/update-xrpld
+
+# Docs
+install -Dm0644 %{_sourcedir}/LICENSE.md %{buildroot}%{_docdir}/%{name}/LICENSE.md
+install -Dm0644 %{_sourcedir}/README.md  %{buildroot}%{_docdir}/%{name}/README.md
+
+# Legacy compatibility for pre-FHS package layouts.
+# TODO: remove after rippled fully deprecated.
+install -d %{buildroot}/usr/local/bin
+ln -s %{_bindir}/%{name} %{buildroot}/usr/local/bin/rippled
+
+%pre
+%sysusers_create_package %{name} %{_sourcedir}/xrpld.sysusers
+
+%post
+systemd-tmpfiles --create %{_tmpfilesdir}/xrpld.conf || :
+%systemd_post xrpld.service update-xrpld.timer
+
+%preun
+%systemd_preun xrpld.service update-xrpld.timer
+
+%postun
+%systemd_postun_with_restart xrpld.service
+
+%files
+%license %{_docdir}/%{name}/LICENSE.md
+%doc %{_docdir}/%{name}/README.md
+
+%dir %{_sysconfdir}/%{name}
+%dir %{_libexecdir}/%{name}
+
+%{_bindir}/%{name}
+
+%config(noreplace) %{_sysconfdir}/%{name}/xrpld.cfg
+%config(noreplace) %{_sysconfdir}/%{name}/validators.txt
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+
+%{_libexecdir}/%{name}/update-xrpld
+
+%{_unitdir}/xrpld.service
+%{_unitdir}/update-xrpld.service
+%{_unitdir}/update-xrpld.timer
+%{_presetdir}/50-xrpld.preset
+%{_sysusersdir}/xrpld.conf
+%{_tmpfilesdir}/xrpld.conf
+
+%ghost %dir /var/lib/%{name}
+%ghost %dir /var/log/%{name}
+
+
+# Legacy compatibility for pre-FHS package layouts.
+# TODO: remove after rippled fully deprecated.
+/usr/local/bin/rippled
diff --git a/package/shared/50-xrpld.preset b/package/shared/50-xrpld.preset
new file mode 100644
index 0000000000..6264e00131
--- /dev/null
+++ b/package/shared/50-xrpld.preset
@@ -0,0 +1,4 @@
+# /usr/lib/systemd/system-preset/50-xrpld.preset
+enable xrpld.service
+# Don't enable automatic updates
+disable update-xrpld.timer
diff --git a/package/shared/update-xrpld b/package/shared/update-xrpld
new file mode 100755
index 0000000000..86be33118b
--- /dev/null
+++ b/package/shared/update-xrpld
@@ -0,0 +1,152 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Optional: also write logs to a legacy file in addition to journald.
+# By default, this script logs to systemd/journald, viewable via:
+#   journalctl -t update-xrpld
+#
+# Uncomment the line below if you need a flat file for compatibility with
+# external tooling, manual inspection, or environments where journald logs
+# are not persisted or easily accessible.
+#
+# Note: This duplicates all output (stdout/stderr) to both journald and the file.
+# It is generally not needed on modern systems and may cause log file growth
+# if left enabled long-term.
+#
+# Requires /var/log/xrpld/ to exist and be writable by the service (root).
+#
+# exec > >(tee -a /var/log/xrpld/update.log) 2>&1
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+PKG_NAME=${PKG_NAME:-xrpld}
+
+log() {
+# If running under systemd/journald, let it handle timestamps.
+    if [[ -n "${JOURNAL_STREAM:-}" ]]; then
+        printf '%s\n' "$*"
+    else
+        printf '%s %s\n' "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" "$*"
+    fi
+}
+
+require_root() {
+    if [[ ${EUID:-$(id -u)} -ne 0 ]]; then
+        log "RESULT: failed reason=not-root"
+            exit 1
+    fi
+}
+
+get_installed_version() {
+    if command -v dpkg-query >/dev/null 2>&1; then
+        dpkg-query -W -f='${Version}' "$PKG_NAME" 2>/dev/null || printf 'unknown'
+    elif command -v rpm >/dev/null 2>&1; then
+        rpm -q --qf '%{VERSION}-%{RELEASE}' "$PKG_NAME" 2>/dev/null || printf 'unknown'
+    else
+        printf 'unknown'
+    fi
+}
+
+trap 'log "RESULT: failed reason=script-error exit_code=$?"' ERR
+
+apt_can_update() {
+    apt-get update -qq
+    apt-get -s --only-upgrade install "$PKG_NAME" 2>/dev/null | grep -q "^Inst ${PKG_NAME}\b"
+}
+
+apt_apply_update() {
+    DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
+        -o Dpkg::Options::="--force-confdef" \
+        -o Dpkg::Options::="--force-confold" \
+        "$PKG_NAME"
+}
+
+get_rpm_pm() {
+    if command -v dnf >/dev/null 2>&1; then
+        printf 'dnf\n'
+    elif command -v yum >/dev/null 2>&1; then
+        printf 'yum\n'
+    else
+        return 1
+    fi
+}
+
+rpm_refresh_metadata() {
+    local pm=$1
+    if [[ "$pm" == "dnf" ]]; then
+        dnf makecache --refresh -q >/dev/null
+    else
+        yum clean expire-cache -q >/dev/null
+    fi
+}
+
+rpm_can_update() {
+    local pm=$1
+
+    rpm_refresh_metadata "$pm"
+    local rc=0
+    set +e
+    "$pm" check-update -q "$PKG_NAME" >/dev/null 2>&1
+    rc=$?
+    set -e
+
+    if [[ $rc -eq 100 ]]; then
+        return 0
+    elif [[ $rc -eq 0 ]]; then
+        return 1
+    else
+        log "$pm check-update failed with exit code ${rc}."
+        exit 1
+    fi
+}
+
+rpm_apply_update() {
+    local pm=$1
+    "$pm" update -y "$PKG_NAME"
+}
+
+restart_service() {
+    # Preserve the operator's prior service state: if xrpld was intentionally
+    # stopped before the update, don't bring it back up just because the
+    # auto-update timer fired.
+    if systemctl is-active --quiet "${PKG_NAME}.service"; then
+        systemctl restart "${PKG_NAME}.service"
+        log "${PKG_NAME} service restarted successfully."
+    else
+        log "${PKG_NAME} service was not running; skipping restart to preserve prior state."
+    fi
+}
+
+main() {
+    require_root
+    if command -v apt-get >/dev/null 2>&1; then
+        log "Checking for ${PKG_NAME} updates via apt"
+        if apt_can_update; then
+            log "Update available; installing."
+            apt_apply_update
+            restart_service
+            log "RESULT: updated ${PKG_NAME}=$(get_installed_version)"
+        else
+            log "RESULT: no-update ${PKG_NAME}=$(get_installed_version)"
+        fi
+        return
+    fi
+
+    local rpm_pm=""
+    if rpm_pm="$(get_rpm_pm)"; then
+        log "Checking for ${PKG_NAME} updates via ${rpm_pm}"
+        if rpm_can_update "$rpm_pm"; then
+            log "Update available; installing"
+            rpm_apply_update "$rpm_pm"
+            restart_service
+            log "RESULT: updated ${PKG_NAME}=$(get_installed_version)"
+        else
+            log "RESULT: no-update ${PKG_NAME}=$(get_installed_version)"
+        fi
+        return
+    fi
+    log "RESULT: failed reason=no-package-manager"
+    exit 1
+}
+
+main "$@"
diff --git a/package/shared/update-xrpld.service b/package/shared/update-xrpld.service
new file mode 100644
index 0000000000..a964ca5482
--- /dev/null
+++ b/package/shared/update-xrpld.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Check for and install xrpld package updates
+Documentation=man:systemd.service(5)
+Wants=network-online.target
+After=network-online.target
+ConditionPathExists=/usr/libexec/xrpld/update-xrpld
+ConditionPathExists=/usr/bin/xrpld
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/flock -n /run/lock/xrpld-update.lock /usr/libexec/xrpld/update-xrpld
+StandardOutput=journal
+StandardError=journal
+SyslogIdentifier=update-xrpld
+TimeoutStartSec=30min
+PrivateTmp=true
diff --git a/package/shared/update-xrpld.timer b/package/shared/update-xrpld.timer
new file mode 100644
index 0000000000..21dabf1400
--- /dev/null
+++ b/package/shared/update-xrpld.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Daily xrpld update check
+
+[Timer]
+OnCalendar=*-*-* 00:00:00
+RandomizedDelaySec=24h
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/package/shared/xrpld.logrotate b/package/shared/xrpld.logrotate
new file mode 100644
index 0000000000..0ae2b7783b
--- /dev/null
+++ b/package/shared/xrpld.logrotate
@@ -0,0 +1,19 @@
+/var/log/xrpld/*.log {
+  daily
+  minsize 200M
+  rotate 7
+  nocreate
+  missingok
+  notifempty
+  compress
+  compresscmd /usr/bin/gzip
+  compressext .gz
+  postrotate
+    # Only signal the daemon if it's actually running; otherwise the RPC
+    # call returns a transport error and logrotate marks the rotation as
+    # failed, generating recurring errors on stopped nodes.
+    if systemctl is-active --quiet xrpld; then
+      /usr/bin/xrpld --conf /etc/xrpld/xrpld.cfg logrotate
+    fi
+  endscript
+}
diff --git a/package/shared/xrpld.service b/package/shared/xrpld.service
new file mode 100644
index 0000000000..72b6cc9938
--- /dev/null
+++ b/package/shared/xrpld.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=XRP Ledger Daemon
+After=network-online.target
+Wants=network-online.target
+StartLimitIntervalSec=300
+StartLimitBurst=5
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/xrpld --net --silent --conf /etc/xrpld/xrpld.cfg
+Restart=always
+RestartSec=5s
+NoNewPrivileges=true
+ProtectSystem=full
+ProtectHome=true
+PrivateTmp=true
+User=xrpld
+Group=xrpld
+LimitNOFILE=65536
+
+[Install]
+WantedBy=multi-user.target
diff --git a/package/shared/xrpld.sysusers b/package/shared/xrpld.sysusers
new file mode 100644
index 0000000000..4547ac6f3d
--- /dev/null
+++ b/package/shared/xrpld.sysusers
@@ -0,0 +1 @@
+u xrpld - "XRP Ledger daemon" /var/lib/xrpld /sbin/nologin
diff --git a/package/shared/xrpld.tmpfiles b/package/shared/xrpld.tmpfiles
new file mode 100644
index 0000000000..ff9b4d95c2
--- /dev/null
+++ b/package/shared/xrpld.tmpfiles
@@ -0,0 +1,2 @@
+d /var/lib/xrpld    0750 xrpld xrpld -
+d /var/log/xrpld    0750 xrpld xrpld -
diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp
index b10667c467..f7f805faa2 100644
--- a/src/test/app/ValidatorSite_test.cpp
+++ b/src/test/app/ValidatorSite_test.cpp
@@ -78,7 +78,7 @@ private:
              "http://207.261.33.37:8080/validators",
              "https://ripple.com/validators",
              "https://ripple.com:443/validators",
-             "file:///etc/opt/xrpld/validators.txt",
+             "file:///etc/xrpld/validators.txt",
              "file:///C:/Lib/validators.txt"
 #if !_MSC_VER
              ,
diff --git a/src/xrpld/core/detail/Config.cpp b/src/xrpld/core/detail/Config.cpp
index 7830ad9c56..d8789795c0 100644
--- a/src/xrpld/core/detail/Config.cpp
+++ b/src/xrpld/core/detail/Config.cpp
@@ -372,8 +372,8 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
             }
 
             // As a last resort, check the system config directory.
-            dataDir = "/var/opt/" + systemName();
-            CONFIG_DIR = "/etc/opt/" + systemName();
+            dataDir = "/var/lib/" + systemName();
+            CONFIG_DIR = "/etc/" + systemName();
             CONFIG_FILE_ = CONFIG_DIR / kConfigFileName;
             if (boost::filesystem::exists(CONFIG_FILE_))
                 break;

From ad7232cbc52ce472d22c86bf5da8a918de4c2add Mon Sep 17 00:00:00 2001
From: Mayukha Vadari <mvadari@ripple.com>
Date: Mon, 18 May 2026 06:56:54 -0400
Subject: [PATCH 07/12] refactor: Rename `account_` to `accountID_` (#7284)

---
 include/xrpl/tx/Transactor.h                  |  2 +-
 include/xrpl/tx/paths/Offer.h                 |  8 +--
 include/xrpl/tx/transactors/dex/AMMContext.h  |  7 +--
 src/libxrpl/tx/Transactor.cpp                 | 12 ++---
 .../tx/transactors/account/AccountDelete.cpp  | 10 ++--
 .../tx/transactors/account/AccountSet.cpp     |  6 +--
 .../tx/transactors/account/SetRegularKey.cpp  |  4 +-
 .../tx/transactors/account/SignerListSet.cpp  | 18 +++----
 .../tx/transactors/bridge/XChainBridge.cpp    |  6 ++-
 .../tx/transactors/check/CheckCash.cpp        | 28 +++++-----
 .../tx/transactors/check/CheckCreate.cpp      | 12 ++---
 .../credentials/CredentialAccept.cpp          |  4 +-
 .../credentials/CredentialCreate.cpp          | 12 ++---
 .../credentials/CredentialDelete.cpp          |  6 +--
 .../tx/transactors/delegate/DelegateSet.cpp   | 10 ++--
 src/libxrpl/tx/transactors/dex/AMMBid.cpp     |  2 +-
 src/libxrpl/tx/transactors/dex/AMMCreate.cpp  |  2 +-
 src/libxrpl/tx/transactors/dex/AMMDeposit.cpp | 21 +++++---
 src/libxrpl/tx/transactors/dex/AMMVote.cpp    |  2 +-
 .../tx/transactors/dex/AMMWithdraw.cpp        |  8 +--
 .../tx/transactors/dex/OfferCancel.cpp        |  4 +-
 .../tx/transactors/dex/OfferCreate.cpp        | 22 ++++----
 src/libxrpl/tx/transactors/did/DIDDelete.cpp  |  2 +-
 src/libxrpl/tx/transactors/did/DIDSet.cpp     |  6 +--
 .../tx/transactors/escrow/EscrowCancel.cpp    |  2 +-
 .../tx/transactors/escrow/EscrowCreate.cpp    | 14 ++---
 .../tx/transactors/escrow/EscrowFinish.cpp    |  5 +-
 .../lending/LoanBrokerCoverDeposit.cpp        |  3 +-
 .../lending/LoanBrokerCoverWithdraw.cpp       |  4 +-
 .../transactors/lending/LoanBrokerDelete.cpp  |  6 +--
 .../tx/transactors/lending/LoanBrokerSet.cpp  |  8 +--
 .../tx/transactors/lending/LoanPay.cpp        | 51 ++++++++++---------
 .../tx/transactors/lending/LoanSet.cpp        |  8 +--
 .../tx/transactors/nft/NFTokenAcceptOffer.cpp |  6 +--
 .../tx/transactors/nft/NFTokenMint.cpp        |  8 +--
 .../tx/transactors/oracle/OracleDelete.cpp    |  4 +-
 .../tx/transactors/oracle/OracleSet.cpp       |  4 +-
 .../tx/transactors/payment/DepositPreauth.cpp | 24 ++++-----
 .../tx/transactors/payment/Payment.cpp        | 28 +++++-----
 .../PermissionedDomainDelete.cpp              |  4 +-
 .../PermissionedDomainSet.cpp                 |  8 +--
 src/libxrpl/tx/transactors/system/Change.cpp  |  2 +-
 .../tx/transactors/system/TicketCreate.cpp    | 10 ++--
 .../tx/transactors/token/MPTokenAuthorize.cpp |  2 +-
 .../token/MPTokenIssuanceCreate.cpp           |  2 +-
 .../token/MPTokenIssuanceDestroy.cpp          |  6 +--
 src/libxrpl/tx/transactors/token/TrustSet.cpp | 16 +++---
 .../tx/transactors/vault/VaultClawback.cpp    |  6 +--
 .../tx/transactors/vault/VaultCreate.cpp      | 12 ++---
 .../tx/transactors/vault/VaultDelete.cpp      |  8 +--
 .../tx/transactors/vault/VaultDeposit.cpp     | 24 ++++-----
 .../tx/transactors/vault/VaultWithdraw.cpp    | 18 +++----
 52 files changed, 259 insertions(+), 248 deletions(-)

diff --git a/include/xrpl/tx/Transactor.h b/include/xrpl/tx/Transactor.h
index bee2e2942c..61d943c4d5 100644
--- a/include/xrpl/tx/Transactor.h
+++ b/include/xrpl/tx/Transactor.h
@@ -115,7 +115,7 @@ protected:
     beast::WrappedSink sink_;
     beast::Journal const j_;
 
-    AccountID const account_;
+    AccountID const accountID_;
     XRPAmount preFeeBalance_{};  // Balance before fees.
 
 public:
diff --git a/include/xrpl/tx/paths/Offer.h b/include/xrpl/tx/paths/Offer.h
index bbed179bc7..2dab5bcebf 100644
--- a/include/xrpl/tx/paths/Offer.h
+++ b/include/xrpl/tx/paths/Offer.h
@@ -21,7 +21,7 @@ class TOffer
 private:
     SLE::pointer entry_;
     Quality quality_{};
-    AccountID account_;
+    AccountID accountID_;
     Asset assetIn_;
     Asset assetOut_;
 
@@ -53,7 +53,7 @@ public:
     [[nodiscard]] AccountID const&
     owner() const
     {
-        return account_;
+        return accountID_;
     }
 
     /** Returns the in and out amounts.
@@ -122,7 +122,7 @@ public:
     isFunded() const
     {
         // Offer owner is issuer; they have unlimited funds if IOU
-        return account_ == assetOut_.getIssuer() && assetOut_.holds<Issue>();
+        return accountID_ == assetOut_.getIssuer() && assetOut_.holds<Issue>();
     }
 
     static std::pair<std::uint32_t, std::uint32_t>
@@ -159,7 +159,7 @@ public:
 
 template <StepAmount TIn, StepAmount TOut>
 TOffer<TIn, TOut>::TOffer(SLE::pointer entry, Quality quality)
-    : entry_(std::move(entry)), quality_(quality), account_(entry_->getAccountID(sfAccount))
+    : entry_(std::move(entry)), quality_(quality), accountID_(entry_->getAccountID(sfAccount))
 {
     auto const tp = entry_->getFieldAmount(sfTakerPays);
     auto const tg = entry_->getFieldAmount(sfTakerGets);
diff --git a/include/xrpl/tx/transactors/dex/AMMContext.h b/include/xrpl/tx/transactors/dex/AMMContext.h
index 92de3f7b97..65954044be 100644
--- a/include/xrpl/tx/transactors/dex/AMMContext.h
+++ b/include/xrpl/tx/transactors/dex/AMMContext.h
@@ -22,7 +22,7 @@ public:
 
 private:
     // Tx account owner is required to get the AMM trading fee in BookStep
-    AccountID account_;
+    AccountID accountID_;
     // true if payment has multiple paths
     bool multiPath_{false};
     // Is true if AMM offer is consumed during a payment engine iteration.
@@ -31,7 +31,8 @@ private:
     std::uint16_t ammIters_{0};
 
 public:
-    AMMContext(AccountID const& account, bool multiPath) : account_(account), multiPath_(multiPath)
+    AMMContext(AccountID const& account, bool multiPath)
+        : accountID_(account), multiPath_(multiPath)
     {
     }
     ~AMMContext() = default;
@@ -80,7 +81,7 @@ public:
     [[nodiscard]] AccountID
     account() const
     {
-        return account_;
+        return accountID_;
     }
 
     /** Strand execution may fail. Reset the flag at the start
diff --git a/src/libxrpl/tx/Transactor.cpp b/src/libxrpl/tx/Transactor.cpp
index 995013a3ca..97f2cabff2 100644
--- a/src/libxrpl/tx/Transactor.cpp
+++ b/src/libxrpl/tx/Transactor.cpp
@@ -262,7 +262,7 @@ Transactor::Transactor(ApplyContext& ctx)
     : ctx_(ctx)
     , sink_(ctx.journal, toShortString(ctx.tx.getTransactionID()) + " ")
     , j_(sink_)
-    , account_(ctx.tx.getAccountID(sfAccount))
+    , accountID_(ctx.tx.getAccountID(sfAccount))
 {
 }
 
@@ -431,7 +431,7 @@ Transactor::payFee()
     // Deduct the fee, so it's not available during the transaction.
     // Will only write the account back if the transaction succeeds.
     sle->setFieldAmount(sfBalance, sle->getFieldAmount(sfBalance) - feePaid);
-    if (feePayer != account_)
+    if (feePayer != accountID_)
         view().update(sle);  // done in `apply()` for the account
 
     // VFALCO Should we call view().rawDestroyXRP() here as well?
@@ -544,7 +544,7 @@ Transactor::consumeSeqProxy(SLE::pointer const& sleAccount)
         sleAccount->setFieldU32(sfSequence, seqProx.value() + 1);
         return tesSUCCESS;
     }
-    return ticketDelete(view(), account_, getTicketIndex(account_, seqProx), j_);
+    return ticketDelete(view(), accountID_, getTicketIndex(accountID_, seqProx), j_);
 }
 
 // Remove a single Ticket from the ledger.
@@ -617,7 +617,7 @@ Transactor::ticketDelete(
 void
 Transactor::preCompute()
 {
-    XRPL_ASSERT(account_ != beast::kZero, "xrpl::Transactor::preCompute : nonzero account");
+    XRPL_ASSERT(accountID_ != beast::kZero, "xrpl::Transactor::preCompute : nonzero account");
 }
 
 TER
@@ -627,12 +627,12 @@ Transactor::apply()
 
     // If the transactor requires a valid account and the transaction doesn't
     // list one, preflight will have already a flagged a failure.
-    auto const sle = view().peek(keylet::account(account_));
+    auto const sle = view().peek(keylet::account(accountID_));
 
     // sle must exist except for transactions
     // that allow zero account.
     XRPL_ASSERT(
-        sle != nullptr || account_ == beast::kZero,
+        sle != nullptr || accountID_ == beast::kZero,
         "xrpl::Transactor::apply : non-null SLE or zero account");
 
     if (sle)
diff --git a/src/libxrpl/tx/transactors/account/AccountDelete.cpp b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
index 809888e1f7..c0e8fe05c6 100644
--- a/src/libxrpl/tx/transactors/account/AccountDelete.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
@@ -344,7 +344,7 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
 TER
 AccountDelete::doApply()
 {
-    auto src = view().peek(keylet::account(account_));
+    auto src = view().peek(keylet::account(accountID_));
     XRPL_ASSERT(src, "xrpl::AccountDelete::doApply : non-null source account");
 
     auto const dstID = ctx_.tx[sfDestination];
@@ -357,12 +357,12 @@ AccountDelete::doApply()
     if (ctx_.tx.isFieldPresent(sfCredentialIDs))
     {
         if (auto err =
-                verifyDepositPreauth(ctx_.tx, ctx_.view(), account_, dstID, dst, ctx_.journal);
+                verifyDepositPreauth(ctx_.tx, ctx_.view(), accountID_, dstID, dst, ctx_.journal);
             !isTesSuccess(err))
             return err;
     }
 
-    Keylet const ownerDirKeylet{keylet::ownerDir(account_)};
+    Keylet const ownerDirKeylet{keylet::ownerDir(accountID_)};
     auto const ter = cleanupOnAccountDelete(
         view(),
         ownerDirKeylet,
@@ -371,7 +371,7 @@ AccountDelete::doApply()
             std::shared_ptr<SLE>& sleItem) -> std::pair<TER, SkipEntry> {
             if (auto deleter = nonObligationDeleter(nodeType))
             {
-                TER const result{deleter(ctx_.registry, view(), account_, dirEntry, sleItem, j_)};
+                TER const result{deleter(ctx_.registry, view(), accountID_, dirEntry, sleItem, j_)};
 
                 return {result, SkipEntry::No};
             }
@@ -402,7 +402,7 @@ AccountDelete::doApply()
     // delete it.
     if (view().exists(ownerDirKeylet) && !view().emptyDirDelete(ownerDirKeylet))
     {
-        JLOG(j_.error()) << "AccountDelete cannot delete root dir node of " << toBase58(account_);
+        JLOG(j_.error()) << "AccountDelete cannot delete root dir node of " << toBase58(accountID_);
         return tecHAS_OBLIGATIONS;
     }
 
diff --git a/src/libxrpl/tx/transactors/account/AccountSet.cpp b/src/libxrpl/tx/transactors/account/AccountSet.cpp
index 69db85d8df..b52db14720 100644
--- a/src/libxrpl/tx/transactors/account/AccountSet.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountSet.cpp
@@ -279,7 +279,7 @@ AccountSet::preclaim(PreclaimContext const& ctx)
 TER
 AccountSet::doApply()
 {
-    auto const sle = view().peek(keylet::account(account_));
+    auto const sle = view().peek(keylet::account(accountID_));
     if (!sle)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -298,7 +298,7 @@ AccountSet::doApply()
     bool const bSetDisallowXRP{tx.isFlag(tfDisallowXRP) || (uSetFlag == asfDisallowXRP)};
     bool const bClearDisallowXRP{tx.isFlag(tfAllowXRP) || (uClearFlag == asfDisallowXRP)};
 
-    bool const sigWithMaster{[&tx, &acct = account_]() {
+    bool const sigWithMaster{[&tx, &acct = accountID_]() {
         auto const spk = tx.getSigningPubKey();
 
         if (publicKeyType(makeSlice(spk)))
@@ -367,7 +367,7 @@ AccountSet::doApply()
             return tecNEED_MASTER_KEY;
         }
 
-        if ((!sle->isFieldPresent(sfRegularKey)) && (!view().peek(keylet::signers(account_))))
+        if ((!sle->isFieldPresent(sfRegularKey)) && (!view().peek(keylet::signers(accountID_))))
         {
             // Account has no regular key or multi-signer signer list.
             return tecNO_ALTERNATIVE_KEY;
diff --git a/src/libxrpl/tx/transactors/account/SetRegularKey.cpp b/src/libxrpl/tx/transactors/account/SetRegularKey.cpp
index f74407b433..66a0bef336 100644
--- a/src/libxrpl/tx/transactors/account/SetRegularKey.cpp
+++ b/src/libxrpl/tx/transactors/account/SetRegularKey.cpp
@@ -55,7 +55,7 @@ SetRegularKey::preflight(PreflightContext const& ctx)
 TER
 SetRegularKey::doApply()
 {
-    auto const sle = view().peek(keylet::account(account_));
+    auto const sle = view().peek(keylet::account(accountID_));
     if (!sle)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -69,7 +69,7 @@ SetRegularKey::doApply()
     else
     {
         // Account has disabled master key and no multi-signer signer list.
-        if (sle->isFlag(lsfDisableMaster) && !view().peek(keylet::signers(account_)))
+        if (sle->isFlag(lsfDisableMaster) && !view().peek(keylet::signers(accountID_)))
             return tecNO_ALTERNATIVE_KEY;
 
         sle->makeFieldAbsent(sfRegularKey);
diff --git a/src/libxrpl/tx/transactors/account/SignerListSet.cpp b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
index 5a399fee7c..7a5d2c60b0 100644
--- a/src/libxrpl/tx/transactors/account/SignerListSet.cpp
+++ b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
@@ -300,9 +300,9 @@ SignerListSet::validateQuorumAndSignerEntries(
 TER
 SignerListSet::replaceSignerList()
 {
-    auto const accountKeylet = keylet::account(account_);
-    auto const ownerDirKeylet = keylet::ownerDir(account_);
-    auto const signerListKeylet = keylet::signers(account_);
+    auto const accountKeylet = keylet::account(accountID_);
+    auto const ownerDirKeylet = keylet::ownerDir(accountID_);
+    auto const signerListKeylet = keylet::signers(accountID_);
 
     // This may be either a create or a replace.  Preemptively remove any
     // old signer list.  May reduce the reserve, so this is done before
@@ -337,9 +337,9 @@ SignerListSet::replaceSignerList()
     auto viewJ = ctx_.registry.get().getJournal("View");
     // Add the signer list to the account's directory.
     auto const page =
-        ctx_.view().dirInsert(ownerDirKeylet, signerListKeylet, describeOwnerDir(account_));
+        ctx_.view().dirInsert(ownerDirKeylet, signerListKeylet, describeOwnerDir(accountID_));
 
-    JLOG(j_.trace()) << "Create signer list for account " << toBase58(account_) << ": "
+    JLOG(j_.trace()) << "Create signer list for account " << toBase58(accountID_) << ": "
                      << (page ? "success" : "failure");
 
     if (!page)
@@ -356,7 +356,7 @@ SignerListSet::replaceSignerList()
 TER
 SignerListSet::destroySignerList()
 {
-    auto const accountKeylet = keylet::account(account_);
+    auto const accountKeylet = keylet::account(accountID_);
     // Destroying the signer list is only allowed if either the master key
     // is enabled or there is a regular key.
     SLE::pointer const ledgerEntry = view().peek(accountKeylet);
@@ -366,8 +366,8 @@ SignerListSet::destroySignerList()
     if ((ledgerEntry->isFlag(lsfDisableMaster)) && (!ledgerEntry->isFieldPresent(sfRegularKey)))
         return tecNO_ALTERNATIVE_KEY;
 
-    auto const ownerDirKeylet = keylet::ownerDir(account_);
-    auto const signerListKeylet = keylet::signers(account_);
+    auto const ownerDirKeylet = keylet::ownerDir(accountID_);
+    auto const signerListKeylet = keylet::signers(accountID_);
     return removeSignersFromLedger(
         ctx_.registry, view(), accountKeylet, ownerDirKeylet, signerListKeylet, j_);
 }
@@ -378,7 +378,7 @@ SignerListSet::writeSignersToSLE(SLE::pointer const& ledgerEntry, std::uint32_t
     // Assign the quorum, default SignerListID, and flags.
     if (ctx_.view().rules().enabled(fixIncludeKeyletFields))
     {
-        ledgerEntry->setAccountID(sfOwner, account_);
+        ledgerEntry->setAccountID(sfOwner, accountID_);
     }
     ledgerEntry->setFieldU32(sfSignerQuorum, quorum_);
     ledgerEntry->setFieldU32(sfSignerListID, kDefaultSignerListId);
diff --git a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
index 9d72311b2b..76b274a609 100644
--- a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
+++ b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
@@ -1920,7 +1920,7 @@ XChainCommit::doApply()
 
     // Support dipping into reserves to pay the fee
     TransferHelperSubmittingAccountInfo submittingAccountInfo{
-        .account = account_,
+        .account = accountID_,
         .preFeeBalance = preFeeBalance_,
         .postFeeBalance = (*sleAccount)[sfBalance]};
 
@@ -2197,7 +2197,9 @@ XChainCreateAccountCommit::doApply()
 
     // Support dipping into reserves to pay the fee
     TransferHelperSubmittingAccountInfo submittingAccountInfo{
-        .account = account_, .preFeeBalance = preFeeBalance_, .postFeeBalance = (*sle)[sfBalance]};
+        .account = accountID_,
+        .preFeeBalance = preFeeBalance_,
+        .postFeeBalance = (*sle)[sfBalance]};
     STAmount const toTransfer = amount + reward;
     auto const thTer = transferHelper(
         psb,
diff --git a/src/libxrpl/tx/transactors/check/CheckCash.cpp b/src/libxrpl/tx/transactors/check/CheckCash.cpp
index 9ec4d0b5b0..f8dbae66fc 100644
--- a/src/libxrpl/tx/transactors/check/CheckCash.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCash.cpp
@@ -294,7 +294,7 @@ CheckCash::doApply()
     }
 
     AccountID const srcId{sleCheck->getAccountID(sfAccount)};
-    if (!psb.exists(keylet::account(srcId)) || !psb.exists(keylet::account(account_)))
+    if (!psb.exists(keylet::account(srcId)) || !psb.exists(keylet::account(accountID_)))
     {
         // LCOV_EXCL_START
         JLOG(ctx_.journal.fatal()) << "Precheck did not verify source or destination's existence.";
@@ -315,7 +315,7 @@ CheckCash::doApply()
     auto viewJ = ctx_.registry.get().getJournal("View");
     auto const optDeliverMin = ctx_.tx[~sfDeliverMin];
 
-    if (srcId != account_)
+    if (srcId != accountID_)
     {
         STAmount const sendMax = sleCheck->at(sfSendMax);
 
@@ -353,7 +353,7 @@ CheckCash::doApply()
             }
 
             // The source account has enough XRP so make the ledger change.
-            if (TER const ter{transferXRP(psb, srcId, account_, xrpDeliver, viewJ)};
+            if (TER const ter{transferXRP(psb, srcId, accountID_, xrpDeliver, viewJ)};
                 !isTesSuccess(ter))
             {
                 // The transfer failed.  Return the error code.
@@ -383,7 +383,7 @@ CheckCash::doApply()
             // Check reserve. Return destination account SLE if enough reserve,
             // otherwise return nullptr.
             auto checkReserve = [&]() -> std::shared_ptr<SLE> {
-                auto sleDst = psb.peek(keylet::account(account_));
+                auto sleDst = psb.peek(keylet::account(accountID_));
 
                 // Can the account cover the trust line's or MPT reserve?
                 if (std::uint32_t const ownerCount = {sleDst->at(sfOwnerCount)};
@@ -405,9 +405,9 @@ CheckCash::doApply()
                 [&](Issue const& issue) -> std::optional<TER> {
                     // If a trust line does not exist yet create one.
                     Issue const& trustLineIssue = issue;
-                    AccountID const truster = deliverIssuer == account_ ? srcId : account_;
+                    AccountID const truster = deliverIssuer == accountID_ ? srcId : accountID_;
                     trustLineKey = keylet::line(truster, trustLineIssue);
-                    destLow = deliverIssuer > account_;
+                    destLow = deliverIssuer > accountID_;
 
                     if (!psb.exists(*trustLineKey))
                     {
@@ -433,7 +433,7 @@ CheckCash::doApply()
                                 psb,                                // payment sandbox
                                 destLow,                            // is dest low?
                                 deliverIssuer,                      // source
-                                account_,                           // destination
+                                accountID_,                         // destination
                                 trustLineKey->key,                  // ledger index
                                 sleDst,                             // Account to add to
                                 false,                              // authorize account
@@ -441,7 +441,7 @@ CheckCash::doApply()
                                 false,                              // freeze trust line
                                 false,                              // deep freeze trust line
                                 initialBalance,                     // zero initial balance
-                                Issue(currency, account_),          // limit of zero
+                                Issue(currency, accountID_),        // limit of zero
                                 0,                                  // quality in
                                 0,                                  // quality out
                                 viewJ);                             // journal
@@ -479,18 +479,18 @@ CheckCash::doApply()
                     return std::nullopt;
                 },
                 [&](MPTIssue const& issue) -> std::optional<TER> {
-                    if (account_ != deliverIssuer)
+                    if (accountID_ != deliverIssuer)
                     {
                         auto const& mptID = issue.getMptID();
                         // Create MPT if it doesn't exist
-                        auto const mptokenKey = keylet::mptoken(mptID, account_);
+                        auto const mptokenKey = keylet::mptoken(mptID, accountID_);
                         if (!psb.exists(mptokenKey))
                         {
                             auto sleDst = checkReserve();
                             if (sleDst == nullptr)
                                 return tecINSUFFICIENT_RESERVE;
 
-                            if (auto const err = checkCreateMPT(psb, mptID, account_, j_);
+                            if (auto const err = checkCreateMPT(psb, mptID, accountID_, j_);
                                 !isTesSuccess(err))
                             {
                                 return err;
@@ -518,7 +518,7 @@ CheckCash::doApply()
                 psb,
                 flowDeliver,
                 srcId,
-                account_,
+                accountID_,
                 STPathSet{},
                 true,                              // default path
                 static_cast<bool>(optDeliverMin),  // partial payment
@@ -556,9 +556,9 @@ CheckCash::doApply()
 
     // Check was cashed.  If not a self send (and it shouldn't be), remove
     // check link from destination directory.
-    if (srcId != account_ &&
+    if (srcId != accountID_ &&
         !psb.dirRemove(
-            keylet::ownerDir(account_), sleCheck->at(sfDestinationNode), sleCheck->key(), true))
+            keylet::ownerDir(accountID_), sleCheck->at(sfDestinationNode), sleCheck->key(), true))
     {
         // LCOV_EXCL_START
         JLOG(j_.fatal()) << "Unable to delete check from destination.";
diff --git a/src/libxrpl/tx/transactors/check/CheckCreate.cpp b/src/libxrpl/tx/transactors/check/CheckCreate.cpp
index b94a44c65f..6373d7e343 100644
--- a/src/libxrpl/tx/transactors/check/CheckCreate.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCreate.cpp
@@ -175,7 +175,7 @@ CheckCreate::preclaim(PreclaimContext const& ctx)
 TER
 CheckCreate::doApply()
 {
-    auto const sle = view().peek(keylet::account(account_));
+    auto const sle = view().peek(keylet::account(accountID_));
     if (!sle)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -192,10 +192,10 @@ CheckCreate::doApply()
     // Note that we use the value from the sequence or ticket as the
     // Check sequence.  For more explanation see comments in SeqProxy.h.
     std::uint32_t const seq = ctx_.tx.getSeqValue();
-    Keylet const checkKeylet = keylet::check(account_, seq);
+    Keylet const checkKeylet = keylet::check(accountID_, seq);
     auto sleCheck = std::make_shared<SLE>(checkKeylet);
 
-    sleCheck->setAccountID(sfAccount, account_);
+    sleCheck->setAccountID(sfAccount, accountID_);
     AccountID const dstAccountId = ctx_.tx[sfDestination];
     sleCheck->setAccountID(sfDestination, dstAccountId);
     sleCheck->setFieldU32(sfSequence, seq);
@@ -214,7 +214,7 @@ CheckCreate::doApply()
     auto viewJ = ctx_.registry.get().getJournal("View");
     // If it's not a self-send (and it shouldn't be), add Check to the
     // destination's owner directory.
-    if (dstAccountId != account_)
+    if (dstAccountId != accountID_)
     {
         auto const page = view().dirInsert(
             keylet::ownerDir(dstAccountId), checkKeylet, describeOwnerDir(dstAccountId));
@@ -229,8 +229,8 @@ CheckCreate::doApply()
     }
 
     {
-        auto const page =
-            view().dirInsert(keylet::ownerDir(account_), checkKeylet, describeOwnerDir(account_));
+        auto const page = view().dirInsert(
+            keylet::ownerDir(accountID_), checkKeylet, describeOwnerDir(accountID_));
 
         JLOG(j_.trace()) << "Adding Check to owner directory " << to_string(checkKeylet.key) << ": "
                          << (page ? "success" : "failure");
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
index 325425c46a..4e9857d782 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
@@ -89,7 +89,7 @@ CredentialAccept::doApply()
     AccountID const issuer{ctx_.tx[sfIssuer]};
 
     // Both exist as credential object exist itself (checked in preclaim)
-    auto const sleSubject = view().peek(keylet::account(account_));
+    auto const sleSubject = view().peek(keylet::account(accountID_));
     auto const sleIssuer = view().peek(keylet::account(issuer));
 
     if (!sleSubject || !sleIssuer)
@@ -103,7 +103,7 @@ CredentialAccept::doApply()
     }
 
     auto const credType(ctx_.tx[sfCredentialType]);
-    Keylet const credentialKey = keylet::credential(account_, issuer, credType);
+    Keylet const credentialKey = keylet::credential(accountID_, issuer, credType);
     auto const sleCred = view().peek(credentialKey);  // Checked in preclaim()
     if (!sleCred)
         return tefINTERNAL;  // LCOV_EXCL_LINE
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp b/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
index ec4a5c7eaa..bcb0a6fefa 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialCreate.cpp
@@ -104,7 +104,7 @@ CredentialCreate::doApply()
 {
     auto const subject = ctx_.tx[sfSubject];
     auto const credType(ctx_.tx[sfCredentialType]);
-    Keylet const credentialKey = keylet::credential(subject, account_, credType);
+    Keylet const credentialKey = keylet::credential(subject, accountID_, credType);
 
     auto const sleCred = std::make_shared<SLE>(credentialKey);
     if (!sleCred)
@@ -126,7 +126,7 @@ CredentialCreate::doApply()
         sleCred->setFieldU32(sfExpiration, *optExp);
     }
 
-    auto const sleIssuer = view().peek(keylet::account(account_));
+    auto const sleIssuer = view().peek(keylet::account(accountID_));
     if (!sleIssuer)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -138,15 +138,15 @@ CredentialCreate::doApply()
     }
 
     sleCred->setAccountID(sfSubject, subject);
-    sleCred->setAccountID(sfIssuer, account_);
+    sleCred->setAccountID(sfIssuer, accountID_);
     sleCred->setFieldVL(sfCredentialType, credType);
 
     if (ctx_.tx.isFieldPresent(sfURI))
         sleCred->setFieldVL(sfURI, ctx_.tx.getFieldVL(sfURI));
 
     {
-        auto const page =
-            view().dirInsert(keylet::ownerDir(account_), credentialKey, describeOwnerDir(account_));
+        auto const page = view().dirInsert(
+            keylet::ownerDir(accountID_), credentialKey, describeOwnerDir(accountID_));
         JLOG(j_.trace()) << "Adding Credential to owner directory " << to_string(credentialKey.key)
                          << ": " << (page ? "success" : "failure");
         if (!page)
@@ -156,7 +156,7 @@ CredentialCreate::doApply()
         adjustOwnerCount(view(), sleIssuer, 1, j_);
     }
 
-    if (subject == account_)
+    if (subject == accountID_)
     {
         sleCred->setFieldU32(sfFlags, lsfAccepted);
     }
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialDelete.cpp b/src/libxrpl/tx/transactors/credentials/CredentialDelete.cpp
index da1b91b2f5..fcd1848cbe 100644
--- a/src/libxrpl/tx/transactors/credentials/CredentialDelete.cpp
+++ b/src/libxrpl/tx/transactors/credentials/CredentialDelete.cpp
@@ -78,15 +78,15 @@ CredentialDelete::preclaim(PreclaimContext const& ctx)
 TER
 CredentialDelete::doApply()
 {
-    auto const subject = ctx_.tx[~sfSubject].value_or(account_);
-    auto const issuer = ctx_.tx[~sfIssuer].value_or(account_);
+    auto const subject = ctx_.tx[~sfSubject].value_or(accountID_);
+    auto const issuer = ctx_.tx[~sfIssuer].value_or(accountID_);
 
     auto const credType(ctx_.tx[sfCredentialType]);
     auto const sleCred = view().peek(keylet::credential(subject, issuer, credType));
     if (!sleCred)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
-    if ((subject != account_) && (issuer != account_) &&
+    if ((subject != accountID_) && (issuer != accountID_) &&
         !checkExpired(*sleCred, ctx_.view().header().parentCloseTime))
     {
         JLOG(j_.trace()) << "Can't delete non-expired credential.";
diff --git a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
index 990767c819..30d703686c 100644
--- a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
+++ b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
@@ -68,12 +68,12 @@ DelegateSet::preclaim(PreclaimContext const& ctx)
 TER
 DelegateSet::doApply()
 {
-    auto const sleOwner = ctx_.view().peek(keylet::account(account_));
+    auto const sleOwner = ctx_.view().peek(keylet::account(accountID_));
     if (!sleOwner)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
     auto const& authAccount = ctx_.tx[sfAuthorize];
-    auto const delegateKey = keylet::delegate(account_, authAccount);
+    auto const delegateKey = keylet::delegate(accountID_, authAccount);
 
     auto sle = ctx_.view().peek(delegateKey);
     if (sle)
@@ -101,14 +101,14 @@ DelegateSet::doApply()
         return tecINSUFFICIENT_RESERVE;
 
     sle = std::make_shared<SLE>(delegateKey);
-    sle->setAccountID(sfAccount, account_);
+    sle->setAccountID(sfAccount, accountID_);
     sle->setAccountID(sfAuthorize, authAccount);
 
     sle->setFieldArray(sfPermissions, permissions);
 
     // Add to delegating account's owner directory
-    auto const page =
-        ctx_.view().dirInsert(keylet::ownerDir(account_), delegateKey, describeOwnerDir(account_));
+    auto const page = ctx_.view().dirInsert(
+        keylet::ownerDir(accountID_), delegateKey, describeOwnerDir(accountID_));
 
     if (!page)
         return tecDIR_FULL;  // LCOV_EXCL_LINE
diff --git a/src/libxrpl/tx/transactors/dex/AMMBid.cpp b/src/libxrpl/tx/transactors/dex/AMMBid.cpp
index 9b1acc5571..b3b41fbfa2 100644
--- a/src/libxrpl/tx/transactors/dex/AMMBid.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMBid.cpp
@@ -371,7 +371,7 @@ AMMBid::doApply()
     // as we go on processing transactions.
     Sandbox sb(&ctx_.view());
 
-    auto const result = applyBid(ctx_, sb, account_, j_);
+    auto const result = applyBid(ctx_, sb, accountID_, j_);
     if (result.second)
         sb.apply(ctx_.rawView());
 
diff --git a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
index 325ca2988d..3e1fe97a76 100644
--- a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
@@ -385,7 +385,7 @@ AMMCreate::doApply()
     // as we go on processing transactions.
     Sandbox sb(&ctx_.view());
 
-    auto const result = applyCreate(ctx_, sb, account_, j_);
+    auto const result = applyCreate(ctx_, sb, accountID_, j_);
     if (result.second)
         sb.apply(ctx_.rawView());
 
diff --git a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
index b19b6eff6c..86cd52300d 100644
--- a/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMDeposit.cpp
@@ -403,7 +403,7 @@ AMMDeposit::applyGuts(Sandbox& sb)
     auto const [amountBalance, amount2Balance, lptAMMBalance] = *expected;
     auto const tfee = (lptAMMBalance == beast::kZero)
         ? ctx_.tx[~sfTradingFee].value_or(0)
-        : getTradingFee(ctx_.view(), *ammSle, account_);
+        : getTradingFee(ctx_.view(), *ammSle, accountID_);
 
     auto const subTxType = ctx_.tx.getFlags() & tfDepositSubTx;
 
@@ -474,7 +474,7 @@ AMMDeposit::applyGuts(Sandbox& sb)
         // LP depositing into AMM empty state gets the auction slot
         // and the voting
         if (lptAMMBalance == beast::kZero)
-            initializeFeeAuctionVote(sb, ammSle, account_, lptAMMBalance.asset(), tfee);
+            initializeFeeAuctionVote(sb, ammSle, accountID_, lptAMMBalance.asset(), tfee);
 
         sb.update(ammSle);
     }
@@ -519,14 +519,14 @@ AMMDeposit::deposit(
         {
             auto const& lpIssue = lpTokensDeposit.get<Issue>();
             // Adjust the reserve if LP doesn't have LPToken trustline
-            auto const sle = view.read(keylet::line(account_, lpIssue.account, lpIssue.currency));
-            if (xrpLiquid(view, account_, !sle, j_) >= depositAmount)
+            auto const sle = view.read(keylet::line(accountID_, lpIssue.account, lpIssue.currency));
+            if (xrpLiquid(view, accountID_, !sle, j_) >= depositAmount)
                 return tesSUCCESS;
         }
         else if (
             accountFunds(
                 view,
-                account_,
+                accountID_,
                 depositAmount,
                 FreezeHandling::IgnoreFreeze,
                 AuthHandling::IgnoreAuth,
@@ -574,7 +574,7 @@ AMMDeposit::deposit(
     }
 
     auto res = accountSend(
-        view, account_, ammAccount, amountDepositActual, ctx_.journal, WaiveTransferFee::Yes);
+        view, accountID_, ammAccount, amountDepositActual, ctx_.journal, WaiveTransferFee::Yes);
     if (!isTesSuccess(res))
     {
         JLOG(ctx_.journal.debug()) << "AMM Deposit: failed to deposit " << amountDepositActual;
@@ -593,7 +593,12 @@ AMMDeposit::deposit(
         }
 
         res = accountSend(
-            view, account_, ammAccount, *amount2DepositActual, ctx_.journal, WaiveTransferFee::Yes);
+            view,
+            accountID_,
+            ammAccount,
+            *amount2DepositActual,
+            ctx_.journal,
+            WaiveTransferFee::Yes);
         if (!isTesSuccess(res))
         {
             JLOG(ctx_.journal.debug())
@@ -603,7 +608,7 @@ AMMDeposit::deposit(
     }
 
     // Deposit LP tokens
-    res = accountSend(view, ammAccount, account_, lpTokensDepositActual, ctx_.journal);
+    res = accountSend(view, ammAccount, accountID_, lpTokensDepositActual, ctx_.journal);
     if (!isTesSuccess(res))
     {
         JLOG(ctx_.journal.debug()) << "AMM Deposit: failed to deposit LPTokens";
diff --git a/src/libxrpl/tx/transactors/dex/AMMVote.cpp b/src/libxrpl/tx/transactors/dex/AMMVote.cpp
index a4afb5392e..391f7e1ecc 100644
--- a/src/libxrpl/tx/transactors/dex/AMMVote.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMVote.cpp
@@ -241,7 +241,7 @@ AMMVote::doApply()
     // as we go on processing transactions.
     Sandbox sb(&ctx_.view());
 
-    auto const result = applyVote(ctx_, sb, account_, j_);
+    auto const result = applyVote(ctx_, sb, accountID_, j_);
     if (result.second)
         sb.apply(ctx_.rawView());
 
diff --git a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
index 60968227ea..a4fd1518f5 100644
--- a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
@@ -329,11 +329,11 @@ AMMWithdraw::applyGuts(Sandbox& sb)
     // might not match the LP's trustline balance
     if (sb.rules().enabled(fixAMMv1_1))
     {
-        if (auto const res = verifyAndAdjustLPTokenBalance(sb, lpTokens, ammSle, account_); !res)
+        if (auto const res = verifyAndAdjustLPTokenBalance(sb, lpTokens, ammSle, accountID_); !res)
             return {res.error(), false};
     }
 
-    auto const tfee = getTradingFee(ctx_.view(), *ammSle, account_);
+    auto const tfee = getTradingFee(ctx_.view(), *ammSle, accountID_);
 
     auto const expected = ammHolds(
         sb,
@@ -458,7 +458,7 @@ AMMWithdraw::withdraw(
         view,
         ammSle,
         ammAccount,
-        account_,
+        accountID_,
         amountBalance,
         amountWithdraw,
         amount2Withdraw,
@@ -748,7 +748,7 @@ AMMWithdraw::equalWithdrawTokens(
     std::tie(ter, newLPTokenBalance, std::ignore, std::ignore) = equalWithdrawTokens(
         view,
         ammSle,
-        account_,
+        accountID_,
         ammAccount,
         amountBalance,
         amount2Balance,
diff --git a/src/libxrpl/tx/transactors/dex/OfferCancel.cpp b/src/libxrpl/tx/transactors/dex/OfferCancel.cpp
index 547db00dca..42692b59cc 100644
--- a/src/libxrpl/tx/transactors/dex/OfferCancel.cpp
+++ b/src/libxrpl/tx/transactors/dex/OfferCancel.cpp
@@ -55,11 +55,11 @@ OfferCancel::doApply()
 {
     auto const offerSequence = ctx_.tx[sfOfferSequence];
 
-    auto const sle = view().read(keylet::account(account_));
+    auto const sle = view().read(keylet::account(accountID_));
     if (!sle)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
-    if (auto sleOffer = view().peek(keylet::offer(account_, offerSequence)))
+    if (auto sleOffer = view().peek(keylet::offer(accountID_, offerSequence)))
     {
         JLOG(j_.debug()) << "Trying to cancel offer #" << offerSequence;
         return offerDelete(view(), sleOffer, ctx_.registry.get().getJournal("View"));
diff --git a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
index 97121ce398..69c101644c 100644
--- a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
@@ -341,14 +341,14 @@ OfferCreate::flowCross(
         // below the reserve) so we check this case again.
         STAmount const inStartBalance = accountFunds(
             psb,
-            account_,
+            accountID_,
             takerAmount.in,
             FreezeHandling::ZeroIfFrozen,
             AuthHandling::ZeroIfUnauthorized,
             j_);
         // Allow unfunded MPT issuer
         auto const disallowUnfunded =
-            !inStartBalance.holds<MPTIssue>() || inStartBalance.getIssuer() != account_;
+            !inStartBalance.holds<MPTIssue>() || inStartBalance.getIssuer() != accountID_;
         if (disallowUnfunded && inStartBalance <= beast::kZero)
         {
             // The account balance can't cover even part of the offer.
@@ -361,7 +361,7 @@ OfferCreate::flowCross(
         // offer taker.  Set sendMax to allow for the gateway's cut.
         Rate gatewayXferRate{QUALITY_ONE};
         STAmount sendMax = takerAmount.in;
-        if (!sendMax.native() && (account_ != sendMax.getIssuer()))
+        if (!sendMax.native() && (accountID_ != sendMax.getIssuer()))
         {
             gatewayXferRate = transferRate(psb, sendMax);
             if (gatewayXferRate.value != QUALITY_ONE)
@@ -428,8 +428,8 @@ OfferCreate::flowCross(
         auto const result = flow(
             psb,
             deliver,
-            account_,
-            account_,
+            accountID_,
+            accountID_,
             paths,
             true,                           // default path
             !ctx_.tx.isFlag(tfFillOrKill),  // partial payment
@@ -455,7 +455,7 @@ OfferCreate::flowCross(
         {
             STAmount const takerInBalance = accountFunds(
                 psb,
-                account_,
+                accountID_,
                 takerAmount.in,
                 FreezeHandling::ZeroIfFrozen,
                 AuthHandling::ZeroIfUnauthorized,
@@ -619,7 +619,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
     // Process a cancellation request that's passed along with an offer.
     if (cancelSequence)
     {
-        auto const sleCancel = sb.peek(keylet::offer(account_, *cancelSequence));
+        auto const sleCancel = sb.peek(keylet::offer(accountID_, *cancelSequence));
 
         // It's not an error to not find the offer to cancel: it might have
         // been consumed or removed. If it is found, however, it's an error
@@ -810,7 +810,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
         return {tesSUCCESS, true};
     }
 
-    auto const sleCreator = sb.peek(keylet::account(account_));
+    auto const sleCreator = sb.peek(keylet::account(accountID_));
     if (!sleCreator)
         return {tefINTERNAL, false};
 
@@ -836,11 +836,11 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
     }
 
     // We need to place the remainder of the offer into its order book.
-    auto const offerIndex = keylet::offer(account_, offerSequence);
+    auto const offerIndex = keylet::offer(accountID_, offerSequence);
 
     // Add offer to owner's directory.
     auto const ownerNode =
-        sb.dirInsert(keylet::ownerDir(account_), offerIndex, describeOwnerDir(account_));
+        sb.dirInsert(keylet::ownerDir(accountID_), offerIndex, describeOwnerDir(accountID_));
 
     if (!ownerNode)
     {
@@ -905,7 +905,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
     }
 
     auto sleOffer = std::make_shared<SLE>(offerIndex);
-    sleOffer->setAccountID(sfAccount, account_);
+    sleOffer->setAccountID(sfAccount, accountID_);
     sleOffer->setFieldU32(sfSequence, offerSequence);
     sleOffer->setFieldH256(sfBookDirectory, dir.key);
     sleOffer->setFieldAmount(sfTakerPays, saTakerPays);
diff --git a/src/libxrpl/tx/transactors/did/DIDDelete.cpp b/src/libxrpl/tx/transactors/did/DIDDelete.cpp
index 9f9f54e6f6..4b4fb47169 100644
--- a/src/libxrpl/tx/transactors/did/DIDDelete.cpp
+++ b/src/libxrpl/tx/transactors/did/DIDDelete.cpp
@@ -67,7 +67,7 @@ DIDDelete::deleteSLE(
 TER
 DIDDelete::doApply()
 {
-    return deleteSLE(ctx_, keylet::did(account_), account_);
+    return deleteSLE(ctx_, keylet::did(accountID_), accountID_);
 }
 
 void
diff --git a/src/libxrpl/tx/transactors/did/DIDSet.cpp b/src/libxrpl/tx/transactors/did/DIDSet.cpp
index f7276eac04..a930c3c754 100644
--- a/src/libxrpl/tx/transactors/did/DIDSet.cpp
+++ b/src/libxrpl/tx/transactors/did/DIDSet.cpp
@@ -99,7 +99,7 @@ TER
 DIDSet::doApply()
 {
     // Edit ledger object if it already exists
-    Keylet const didKeylet = keylet::did(account_);
+    Keylet const didKeylet = keylet::did(accountID_);
     if (auto const sleDID = ctx_.view().peek(didKeylet))
     {
         auto update = [&](auto const& sField) {
@@ -130,7 +130,7 @@ DIDSet::doApply()
 
     // Create new ledger object otherwise
     auto const sleDID = std::make_shared<SLE>(didKeylet);
-    (*sleDID)[sfAccount] = account_;
+    (*sleDID)[sfAccount] = accountID_;
 
     auto set = [&](auto const& sField) {
         if (auto const field = ctx_.tx[~sField]; field && !field->empty())
@@ -146,7 +146,7 @@ DIDSet::doApply()
         return tecEMPTY_DID;
     }
 
-    return addSLE(ctx_, sleDID, account_);
+    return addSLE(ctx_, sleDID, accountID_);
 }
 
 void
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
index d249bb8379..99cf467ee9 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
@@ -178,7 +178,7 @@ EscrowCancel::doApply()
             return temDISABLED;  // LCOV_EXCL_LINE
 
         auto const issuer = amount.getIssuer();
-        bool const createAsset = account == account_;
+        bool const createAsset = account == accountID_;
         if (auto const ret = std::visit(
                 [&]<typename T>(T const&) {
                     return escrowUnlockApplyHelper<T>(
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
index 2e738d0de5..0b1db125f6 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
@@ -417,7 +417,7 @@ EscrowCreate::doApply()
     if (ctx_.tx[~sfFinishAfter] && after(closeTime, ctx_.tx[sfFinishAfter]))
         return tecNO_PERMISSION;
 
-    auto const sle = ctx_.view().peek(keylet::account(account_));
+    auto const sle = ctx_.view().peek(keylet::account(accountID_));
     if (!sle)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -448,10 +448,10 @@ EscrowCreate::doApply()
 
     // Create escrow in ledger.  Note that we use the value from the
     // sequence or ticket.  For more explanation see comments in SeqProxy.h.
-    Keylet const escrowKeylet = keylet::escrow(account_, ctx_.tx.getSeqValue());
+    Keylet const escrowKeylet = keylet::escrow(accountID_, ctx_.tx.getSeqValue());
     auto const slep = std::make_shared<SLE>(escrowKeylet);
     (*slep)[sfAmount] = amount;
-    (*slep)[sfAccount] = account_;
+    (*slep)[sfAccount] = accountID_;
     (*slep)[~sfCondition] = ctx_.tx[~sfCondition];
     (*slep)[~sfSourceTag] = ctx_.tx[~sfSourceTag];
     (*slep)[sfDestination] = ctx_.tx[sfDestination];
@@ -476,7 +476,7 @@ EscrowCreate::doApply()
     // Add escrow to sender's owner directory
     {
         auto page = ctx_.view().dirInsert(
-            keylet::ownerDir(account_), escrowKeylet, describeOwnerDir(account_));
+            keylet::ownerDir(accountID_), escrowKeylet, describeOwnerDir(accountID_));
         if (!page)
             return tecDIR_FULL;  // LCOV_EXCL_LINE
         (*slep)[sfOwnerNode] = *page;
@@ -484,7 +484,7 @@ EscrowCreate::doApply()
 
     // If it's not a self-send, add escrow to recipient's owner directory.
     AccountID const dest = ctx_.tx[sfDestination];
-    if (dest != account_)
+    if (dest != accountID_)
     {
         auto page =
             ctx_.view().dirInsert(keylet::ownerDir(dest), escrowKeylet, describeOwnerDir(dest));
@@ -497,7 +497,7 @@ EscrowCreate::doApply()
     // track the total locked balance. For MPT, this isn't necessary because the
     // locked balance is already stored directly in the MPTokenIssuance object.
     AccountID const issuer = amount.getIssuer();
-    if (!isXRP(amount) && issuer != account_ && issuer != dest && !amount.holds<MPTIssue>())
+    if (!isXRP(amount) && issuer != accountID_ && issuer != dest && !amount.holds<MPTIssue>())
     {
         auto page =
             ctx_.view().dirInsert(keylet::ownerDir(issuer), escrowKeylet, describeOwnerDir(issuer));
@@ -515,7 +515,7 @@ EscrowCreate::doApply()
     {
         if (auto const ret = std::visit(
                 [&]<typename T>(T const&) {
-                    return escrowLockApplyHelper<T>(ctx_.view(), issuer, account_, amount, j_);
+                    return escrowLockApplyHelper<T>(ctx_.view(), issuer, accountID_, amount, j_);
                 },
                 amount.asset().value());
             !isTesSuccess(ret))
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
index 499db45794..13bd4b1682 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
@@ -310,7 +310,8 @@ EscrowFinish::doApply()
     if (!sled)
         return tecNO_DST;
 
-    if (auto err = verifyDepositPreauth(ctx_.tx, ctx_.view(), account_, destID, sled, ctx_.journal);
+    if (auto err =
+            verifyDepositPreauth(ctx_.tx, ctx_.view(), accountID_, destID, sled, ctx_.journal);
         !isTesSuccess(err))
         return err;
 
@@ -355,7 +356,7 @@ EscrowFinish::doApply()
             ? xrpl::Rate(slep->getFieldU32(sfTransferRate))
             : kParityRate;
         auto const issuer = amount.getIssuer();
-        bool const createAsset = destID == account_;
+        bool const createAsset = destID == accountID_;
         if (auto const ret = std::visit(
                 [&]<typename T>(T const&) {
                     return escrowUnlockApplyHelper<T>(
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
index 3ea37bbf27..04905d5ea3 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
@@ -121,7 +121,8 @@ LoanBrokerCoverDeposit::doApply()
     auto const brokerPseudoID = broker->at(sfAccount);
 
     // Transfer assets from depositor to pseudo-account.
-    if (auto ter = accountSend(view(), account_, brokerPseudoID, amount, j_, WaiveTransferFee::Yes))
+    if (auto ter =
+            accountSend(view(), accountID_, brokerPseudoID, amount, j_, WaiveTransferFee::Yes))
         return ter;
 
     // Increase the LoanBroker's CoverAvailable by Amount
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
index 824c6ea25c..17a9683690 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
@@ -163,7 +163,7 @@ LoanBrokerCoverWithdraw::doApply()
 
     auto const brokerID = tx[sfLoanBrokerID];
     auto const amount = tx[sfAmount];
-    auto const dstAcct = tx[~sfDestination].value_or(account_);
+    auto const dstAcct = tx[~sfDestination].value_or(accountID_);
 
     auto broker = view().peek(keylet::loanbroker(brokerID));
     if (!broker)
@@ -183,7 +183,7 @@ LoanBrokerCoverWithdraw::doApply()
 
     associateAsset(*broker, vaultAsset);
 
-    return doWithdraw(view(), tx, account_, dstAcct, brokerPseudoID, preFeeBalance_, amount, j_);
+    return doWithdraw(view(), tx, accountID_, dstAcct, brokerPseudoID, preFeeBalance_, amount, j_);
 }
 
 void
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
index 134e0090fa..805a4612f2 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
@@ -130,7 +130,7 @@ LoanBrokerDelete::doApply()
     auto const brokerPseudoID = broker->at(sfAccount);
 
     if (!view().dirRemove(
-            keylet::ownerDir(account_), broker->at(sfOwnerNode), broker->key(), false))
+            keylet::ownerDir(accountID_), broker->at(sfOwnerNode), broker->key(), false))
     {
         return tefBAD_LEDGER;  // LCOV_EXCL_LINE
     }
@@ -143,7 +143,7 @@ LoanBrokerDelete::doApply()
     {
         auto const coverAvailable = STAmount{vaultAsset, broker->at(sfCoverAvailable)};
         if (auto const ter = accountSend(
-                view(), brokerPseudoID, account_, coverAvailable, j_, WaiveTransferFee::Yes))
+                view(), brokerPseudoID, accountID_, coverAvailable, j_, WaiveTransferFee::Yes))
             return ter;
     }
 
@@ -177,7 +177,7 @@ LoanBrokerDelete::doApply()
     view().erase(broker);
 
     {
-        auto owner = view().peek(keylet::account(account_));
+        auto owner = view().peek(keylet::account(accountID_));
         if (!owner)
             return tefBAD_LEDGER;  // LCOV_EXCL_LINE
 
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
index 2a40ed1429..6e3d2ad0a8 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerSet.cpp
@@ -220,7 +220,7 @@ LoanBrokerSet::doApply()
         auto const vaultAsset = sleVault->at(sfAsset);
         auto const sequence = tx.getSeqValue();
 
-        auto owner = view.peek(keylet::account(account_));
+        auto owner = view.peek(keylet::account(accountID_));
         if (!owner)
         {
             // This should be impossible
@@ -229,9 +229,9 @@ LoanBrokerSet::doApply()
             return tefBAD_LEDGER;
             // LCOV_EXCL_STOP
         }
-        auto broker = std::make_shared<SLE>(keylet::loanbroker(account_, sequence));
+        auto broker = std::make_shared<SLE>(keylet::loanbroker(accountID_, sequence));
 
-        if (auto const ter = dirLink(view, account_, broker))
+        if (auto const ter = dirLink(view, accountID_, broker))
             return ter;  // LCOV_EXCL_LINE
         if (auto const ter = dirLink(view, vaultPseudoID, broker, sfVaultNode))
             return ter;  // LCOV_EXCL_LINE
@@ -255,7 +255,7 @@ LoanBrokerSet::doApply()
         // Initialize data fields:
         broker->at(sfSequence) = sequence;
         broker->at(sfVaultID) = vaultID;
-        broker->at(sfOwner) = account_;
+        broker->at(sfOwner) = accountID_;
         broker->at(sfAccount) = pseudoId;
         // The LoanSequence indexes loans created by this broker, starting at 1
         broker->at(sfLoanSequence) = 1;
diff --git a/src/libxrpl/tx/transactors/lending/LoanPay.cpp b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
index 12a0212b72..b8b940f3e3 100644
--- a/src/libxrpl/tx/transactors/lending/LoanPay.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
@@ -581,13 +581,13 @@ LoanPay::doApply()
     // These three values are used to check that funds are conserved after the transfers
     auto const accountBalanceBefore = accountHolds(
         view,
-        account_,
+        accountID_,
         asset,
         FreezeHandling::IgnoreFreeze,
         AuthHandling::IgnoreAuth,
         j_,
         SpendableHandling::FullBalance);
-    auto const vaultBalanceBefore = account_ == vaultPseudoAccount
+    auto const vaultBalanceBefore = accountID_ == vaultPseudoAccount
         ? STAmount{asset, 0}
         : accountHolds(
               view,
@@ -597,15 +597,16 @@ LoanPay::doApply()
               AuthHandling::IgnoreAuth,
               j_,
               SpendableHandling::FullBalance);
-    auto const brokerBalanceBefore = account_ == brokerPayee ? STAmount{asset, 0}
-                                                             : accountHolds(
-                                                                   view,
-                                                                   brokerPayee,
-                                                                   asset,
-                                                                   FreezeHandling::IgnoreFreeze,
-                                                                   AuthHandling::IgnoreAuth,
-                                                                   j_,
-                                                                   SpendableHandling::FullBalance);
+    auto const brokerBalanceBefore = accountID_ == brokerPayee
+        ? STAmount{asset, 0}
+        : accountHolds(
+              view,
+              brokerPayee,
+              asset,
+              FreezeHandling::IgnoreFreeze,
+              AuthHandling::IgnoreAuth,
+              j_,
+              SpendableHandling::FullBalance);
 
     if (totalPaidToVaultRounded != beast::kZero)
     {
@@ -615,7 +616,7 @@ LoanPay::doApply()
 
     if (totalPaidToBroker != beast::kZero)
     {
-        if (brokerPayee == account_)
+        if (brokerPayee == accountID_)
         {
             // The broker may have deleted their holding. Recreate it if needed
             if (auto const ter = addEmptyHolding(
@@ -633,7 +634,7 @@ LoanPay::doApply()
 
     if (auto const ter = accountSendMulti(
             view,
-            account_,
+            accountID_,
             asset,
             {{vaultPseudoAccount, totalPaidToVaultRounded}, {brokerPayee, totalPaidToBroker}},
             j_,
@@ -659,13 +660,13 @@ LoanPay::doApply()
     // Check that funds are conserved
     auto const accountBalanceAfter = accountHolds(
         view,
-        account_,
+        accountID_,
         asset,
         FreezeHandling::IgnoreFreeze,
         AuthHandling::IgnoreAuth,
         j_,
         SpendableHandling::FullBalance);
-    auto const vaultBalanceAfter = account_ == vaultPseudoAccount
+    auto const vaultBalanceAfter = accountID_ == vaultPseudoAccount
         ? STAmount{asset, 0}
         : accountHolds(
               view,
@@ -675,15 +676,15 @@ LoanPay::doApply()
               AuthHandling::IgnoreAuth,
               j_,
               SpendableHandling::FullBalance);
-    auto const brokerBalanceAfter = account_ == brokerPayee ? STAmount{asset, 0}
-                                                            : accountHolds(
-                                                                  view,
-                                                                  brokerPayee,
-                                                                  asset,
-                                                                  FreezeHandling::IgnoreFreeze,
-                                                                  AuthHandling::IgnoreAuth,
-                                                                  j_,
-                                                                  SpendableHandling::FullBalance);
+    auto const brokerBalanceAfter = accountID_ == brokerPayee ? STAmount{asset, 0}
+                                                              : accountHolds(
+                                                                    view,
+                                                                    brokerPayee,
+                                                                    asset,
+                                                                    FreezeHandling::IgnoreFreeze,
+                                                                    AuthHandling::IgnoreAuth,
+                                                                    j_,
+                                                                    SpendableHandling::FullBalance);
     auto const balanceScale = [&]() {
         // Find a reasonable scale to use for the balance comparisons.
         //
@@ -800,7 +801,7 @@ LoanPay::doApply()
         goodRounding, "xrpl::LoanPay::doApply", "funds are conserved (with rounding)");
 
     XRPL_ASSERT_PARTS(
-        accountBalanceAfter < accountBalanceBefore || account_ == asset.getIssuer(),
+        accountBalanceAfter < accountBalanceBefore || accountID_ == asset.getIssuer(),
         "xrpl::LoanPay::doApply",
         "account balance decreased");
     XRPL_ASSERT_PARTS(
diff --git a/src/libxrpl/tx/transactors/lending/LoanSet.cpp b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
index 83eccf1809..a3b71fd20d 100644
--- a/src/libxrpl/tx/transactors/lending/LoanSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
@@ -388,7 +388,7 @@ LoanSet::doApply()
     Asset const vaultAsset = vaultSle->at(sfAsset);
 
     auto const counterparty = tx[~sfCounterparty].value_or(brokerOwner);
-    auto const borrower = counterparty == brokerOwner ? account_ : counterparty;
+    auto const borrower = counterparty == brokerOwner ? accountID_ : counterparty;
     auto const borrowerSle = view.peek(keylet::account(borrower));
     if (!borrowerSle)
     {
@@ -508,7 +508,7 @@ LoanSet::doApply()
     {
         auto const ownerCount = borrowerSle->at(sfOwnerCount);
         auto const balance =
-            account_ == borrower ? preFeeBalance_ : borrowerSle->at(sfBalance).value().xrp();
+            accountID_ == borrower ? preFeeBalance_ : borrowerSle->at(sfBalance).value().xrp();
         if (balance < view.fees().accountReserve(ownerCount))
             return tecINSUFFICIENT_RESERVE;
     }
@@ -520,7 +520,7 @@ LoanSet::doApply()
     // Create a holding for the borrower if one does not already exist.
 
     XRPL_ASSERT_PARTS(
-        borrower == account_ || borrower == counterparty,
+        borrower == accountID_ || borrower == counterparty,
         "xrpl::LoanSet::doApply",
         "borrower signed transaction");
     if (auto const ter = addEmptyHolding(
@@ -542,7 +542,7 @@ LoanSet::doApply()
         // Create the holding if it doesn't already exist (necessary for MPTs).
         // The owner may have deleted their MPT / line at some point.
         XRPL_ASSERT_PARTS(
-            brokerOwner == account_ || brokerOwner == counterparty,
+            brokerOwner == accountID_ || brokerOwner == counterparty,
             "xrpl::LoanSet::doApply",
             "broker owner signed transaction");
 
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
index 00441795e2..b80d282d70 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
@@ -407,8 +407,8 @@ NFTokenAcceptOffer::acceptOffer(std::shared_ptr<SLE> const& offer)
 {
     bool const isSell = offer->isFlag(lsfSellNFToken);
     AccountID const owner = (*offer)[sfOwner];
-    AccountID const& seller = isSell ? owner : account_;
-    AccountID const& buyer = isSell ? account_ : owner;
+    AccountID const& seller = isSell ? owner : accountID_;
+    AccountID const& buyer = isSell ? accountID_ : owner;
 
     auto const nftokenID = (*offer)[sfNFTokenID];
 
@@ -528,7 +528,7 @@ NFTokenAcceptOffer::doApply()
         // Send the broker the amount they requested.
         if (auto const cut = ctx_.tx[~sfNFTokenBrokerFee]; cut && cut.value() != beast::kZero)
         {
-            if (auto const r = pay(buyer, account_, cut.value()); !isTesSuccess(r))
+            if (auto const r = pay(buyer, accountID_, cut.value()); !isTesSuccess(r))
                 return r;
 
             amount -= cut.value();
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
index 621364dc79..e7faa30df8 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenMint.cpp
@@ -222,7 +222,7 @@ NFTokenMint::preclaim(PreclaimContext const& ctx)
 TER
 NFTokenMint::doApply()
 {
-    auto const issuer = ctx_.tx[~sfIssuer].value_or(account_);
+    auto const issuer = ctx_.tx[~sfIssuer].value_or(accountID_);
 
     auto const tokenSeq = [this, &issuer]() -> Expected<std::uint32_t, TER> {
         auto const root = view().peek(keylet::account(issuer));
@@ -279,7 +279,7 @@ NFTokenMint::doApply()
         return (tokenSeq.error());
 
     std::uint32_t const ownerCountBefore =
-        view().read(keylet::account(account_))->getFieldU32(sfOwnerCount);
+        view().read(keylet::account(accountID_))->getFieldU32(sfOwnerCount);
 
     // Assemble the new NFToken.
     SOTemplate const* nfTokenTemplate =
@@ -305,7 +305,7 @@ NFTokenMint::doApply()
             object.setFieldVL(sfURI, *uri);
     });
 
-    if (TER const ret = nft::insertToken(ctx_.view(), account_, std::move(newToken));
+    if (TER const ret = nft::insertToken(ctx_.view(), accountID_, std::move(newToken));
         !isTesSuccess(ret))
         return ret;
 
@@ -333,7 +333,7 @@ NFTokenMint::doApply()
     // requiring the reserve to be met each time.  The reserve is
     // only managed when a new NFT page or sell offer is added.
     if (auto const ownerCountAfter =
-            view().read(keylet::account(account_))->getFieldU32(sfOwnerCount);
+            view().read(keylet::account(accountID_))->getFieldU32(sfOwnerCount);
         ownerCountAfter > ownerCountBefore)
     {
         if (auto const reserve = view().fees().accountReserve(ownerCountAfter);
diff --git a/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp b/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp
index 99f2a14900..839b2b4e24 100644
--- a/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp
+++ b/src/libxrpl/tx/transactors/oracle/OracleDelete.cpp
@@ -82,8 +82,8 @@ OracleDelete::deleteOracle(
 TER
 OracleDelete::doApply()
 {
-    if (auto sle = ctx_.view().peek(keylet::oracle(account_, ctx_.tx[sfOracleDocumentID])))
-        return deleteOracle(ctx_.view(), sle, account_, j_);
+    if (auto sle = ctx_.view().peek(keylet::oracle(accountID_, ctx_.tx[sfOracleDocumentID])))
+        return deleteOracle(ctx_.view(), sle, accountID_, j_);
 
     return tecINTERNAL;  // LCOV_EXCL_LINE
 }
diff --git a/src/libxrpl/tx/transactors/oracle/OracleSet.cpp b/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
index d0d488bbec..66ce95f46c 100644
--- a/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
+++ b/src/libxrpl/tx/transactors/oracle/OracleSet.cpp
@@ -201,7 +201,7 @@ setPriceDataInnerObjTemplate(STObject& obj)
 TER
 OracleSet::doApply()
 {
-    auto const oracleID = keylet::oracle(account_, ctx_.tx[sfOracleDocumentID]);
+    auto const oracleID = keylet::oracle(accountID_, ctx_.tx[sfOracleDocumentID]);
 
     auto populatePriceData = [](STObject& priceData, STObject const& entry) {
         setPriceDataInnerObjTemplate(priceData);
@@ -311,7 +311,7 @@ OracleSet::doApply()
         sle->setFieldU32(sfLastUpdateTime, ctx_.tx[sfLastUpdateTime]);
 
         auto page = ctx_.view().dirInsert(
-            keylet::ownerDir(account_), sle->key(), describeOwnerDir(account_));
+            keylet::ownerDir(accountID_), sle->key(), describeOwnerDir(accountID_));
         if (!page)
             return tecDIR_FULL;  // LCOV_EXCL_LINE
 
diff --git a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
index ed6699936e..8b4ad2f025 100644
--- a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
+++ b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
@@ -153,7 +153,7 @@ DepositPreauth::doApply()
 {
     if (ctx_.tx.isFieldPresent(sfAuthorize))
     {
-        auto const sleOwner = view().peek(keylet::account(account_));
+        auto const sleOwner = view().peek(keylet::account(accountID_));
         if (!sleOwner)
             return {tefINTERNAL};
 
@@ -171,15 +171,15 @@ DepositPreauth::doApply()
         // Preclaim already verified that the Preauth entry does not yet exist.
         // Create and populate the Preauth entry.
         AccountID const auth{ctx_.tx[sfAuthorize]};
-        Keylet const preauthKeylet = keylet::depositPreauth(account_, auth);
+        Keylet const preauthKeylet = keylet::depositPreauth(accountID_, auth);
         auto slePreauth = std::make_shared<SLE>(preauthKeylet);
 
-        slePreauth->setAccountID(sfAccount, account_);
+        slePreauth->setAccountID(sfAccount, accountID_);
         slePreauth->setAccountID(sfAuthorize, auth);
         view().insert(slePreauth);
 
-        auto const page =
-            view().dirInsert(keylet::ownerDir(account_), preauthKeylet, describeOwnerDir(account_));
+        auto const page = view().dirInsert(
+            keylet::ownerDir(accountID_), preauthKeylet, describeOwnerDir(accountID_));
 
         JLOG(j_.trace()) << "Adding DepositPreauth to owner directory "
                          << to_string(preauthKeylet.key) << ": " << (page ? "success" : "failure");
@@ -194,13 +194,13 @@ DepositPreauth::doApply()
     }
     else if (ctx_.tx.isFieldPresent(sfUnauthorize))
     {
-        auto const preauth = keylet::depositPreauth(account_, ctx_.tx[sfUnauthorize]);
+        auto const preauth = keylet::depositPreauth(accountID_, ctx_.tx[sfUnauthorize]);
 
         return DepositPreauth::removeFromLedger(view(), preauth.key, j_);
     }
     else if (ctx_.tx.isFieldPresent(sfAuthorizeCredentials))
     {
-        auto const sleOwner = view().peek(keylet::account(account_));
+        auto const sleOwner = view().peek(keylet::account(accountID_));
         if (!sleOwner)
             return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -229,18 +229,18 @@ DepositPreauth::doApply()
             sortedLE.pushBack(std::move(cred));
         }
 
-        Keylet const preauthKey = keylet::depositPreauth(account_, sortedTX);
+        Keylet const preauthKey = keylet::depositPreauth(accountID_, sortedTX);
         auto slePreauth = std::make_shared<SLE>(preauthKey);
         if (!slePreauth)
             return tefINTERNAL;  // LCOV_EXCL_LINE
 
-        slePreauth->setAccountID(sfAccount, account_);
+        slePreauth->setAccountID(sfAccount, accountID_);
         slePreauth->peekFieldArray(sfAuthorizeCredentials) = std::move(sortedLE);
 
         view().insert(slePreauth);
 
-        auto const page =
-            view().dirInsert(keylet::ownerDir(account_), preauthKey, describeOwnerDir(account_));
+        auto const page = view().dirInsert(
+            keylet::ownerDir(accountID_), preauthKey, describeOwnerDir(accountID_));
 
         JLOG(j_.trace()) << "Adding DepositPreauth to owner directory " << to_string(preauthKey.key)
                          << ": " << (page ? "success" : "failure");
@@ -256,7 +256,7 @@ DepositPreauth::doApply()
     else if (ctx_.tx.isFieldPresent(sfUnauthorizeCredentials))
     {
         auto const preauthKey = keylet::depositPreauth(
-            account_, credentials::makeSorted(ctx_.tx.getFieldArray(sfUnauthorizeCredentials)));
+            accountID_, credentials::makeSorted(ctx_.tx.getFieldArray(sfUnauthorizeCredentials)));
         return DepositPreauth::removeFromLedger(view(), preauthKey.key, j_);
     }
 
diff --git a/src/libxrpl/tx/transactors/payment/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp
index fa5f30785c..1848d34786 100644
--- a/src/libxrpl/tx/transactors/payment/Payment.cpp
+++ b/src/libxrpl/tx/transactors/payment/Payment.cpp
@@ -410,7 +410,7 @@ Payment::doApply()
     AccountID const dstAccountID(ctx_.tx.getAccountID(sfDestination));
     STAmount const dstAmount(ctx_.tx.getFieldAmount(sfAmount));
     bool const isDstMPT = dstAmount.holds<MPTIssue>();
-    STAmount const maxSourceAmount = getMaxSourceAmount(account_, dstAmount, sendMax);
+    STAmount const maxSourceAmount = getMaxSourceAmount(accountID_, dstAmount, sendMax);
 
     JLOG(j_.trace()) << "maxSourceAmount=" << maxSourceAmount.getFullText()
                      << " dstAmount=" << dstAmount.getFullText();
@@ -453,7 +453,7 @@ Payment::doApply()
         //  2. If Account is deposit preauthorized by destination.
 
         if (auto err = verifyDepositPreauth(
-                ctx_.tx, ctx_.view(), account_, dstAccountID, sleDst, ctx_.journal);
+                ctx_.tx, ctx_.view(), accountID_, dstAccountID, sleDst, ctx_.journal);
             !isTesSuccess(err))
             return err;
 
@@ -472,7 +472,7 @@ Payment::doApply()
                 maxSourceAmount,
                 dstAmount,
                 dstAccountID,
-                account_,
+                accountID_,
                 ctx_.tx.getFieldPathSet(sfPaths),
                 ctx_.tx[~sfDomainID],
                 ctx_.registry,
@@ -512,18 +512,18 @@ Payment::doApply()
         JLOG(j_.trace()) << " dstAmount=" << dstAmount.getFullText();
         auto const& mptIssue = dstAmount.get<MPTIssue>();
 
-        if (auto const ter = requireAuth(view(), mptIssue, account_); !isTesSuccess(ter))
+        if (auto const ter = requireAuth(view(), mptIssue, accountID_); !isTesSuccess(ter))
             return ter;
 
         if (auto const ter = requireAuth(view(), mptIssue, dstAccountID); !isTesSuccess(ter))
             return ter;
 
-        if (auto const ter = canTransfer(view(), mptIssue, account_, dstAccountID);
+        if (auto const ter = canTransfer(view(), mptIssue, accountID_, dstAccountID);
             !isTesSuccess(ter))
             return ter;
 
         if (auto err = verifyDepositPreauth(
-                ctx_.tx, ctx_.view(), account_, dstAccountID, sleDst, ctx_.journal);
+                ctx_.tx, ctx_.view(), accountID_, dstAccountID, sleDst, ctx_.journal);
             !isTesSuccess(err))
             return err;
 
@@ -532,13 +532,13 @@ Payment::doApply()
         // Transfer rate
         Rate rate{QUALITY_ONE};
         // Payment between the holders
-        if (account_ != issuer && dstAccountID != issuer)
+        if (accountID_ != issuer && dstAccountID != issuer)
         {
             // If globally/individually locked then
             //   - can't send between holders
             //   - holder can send back to issuer
             //   - issuer can send to holder
-            if (isAnyFrozen(view(), {account_, dstAccountID}, mptIssue))
+            if (isAnyFrozen(view(), {accountID_, dstAccountID}, mptIssue))
                 return tecLOCKED;
 
             // Get the rate for a payment between the holders.
@@ -566,7 +566,7 @@ Payment::doApply()
             return tecPATH_PARTIAL;
 
         PaymentSandbox pv(&view());
-        auto res = accountSend(pv, account_, dstAccountID, amountDeliver, ctx_.journal);
+        auto res = accountSend(pv, accountID_, dstAccountID, amountDeliver, ctx_.journal);
         if (isTesSuccess(res))
         {
             pv.apply(ctx_.rawView());
@@ -589,7 +589,7 @@ Payment::doApply()
 
     // Direct XRP payment.
 
-    auto const sleSrc = view().peek(keylet::account(account_));
+    auto const sleSrc = view().peek(keylet::account(accountID_));
     if (!sleSrc)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -601,10 +601,10 @@ Payment::doApply()
     auto const reserve = view().fees().accountReserve(ownerCount);
 
     // In a delegated payment, the fee payer is the delegated account,
-    // not the source account (account_).
-    bool const accountIsPayer = (ctx_.tx.getFeePayer() == account_);
+    // not the source account (accountID_).
+    bool const accountIsPayer = (ctx_.tx.getFeePayer() == accountID_);
 
-    // preFeeBalance_ is the balance on the source account (account_) BEFORE the fees
+    // preFeeBalance_ is the balance on the source account (accountID_) BEFORE the fees
     // were charged. If source account is the fee payer, it must also cover the fee.
     // The final spend may use the reserve to cover fees.
     auto const minRequiredFunds =
@@ -656,7 +656,7 @@ Payment::doApply()
     if (dstAmount > dstReserve || sleDst->getFieldAmount(sfBalance) > dstReserve)
     {
         if (auto err = verifyDepositPreauth(
-                ctx_.tx, ctx_.view(), account_, dstAccountID, sleDst, ctx_.journal);
+                ctx_.tx, ctx_.view(), accountID_, dstAccountID, sleDst, ctx_.journal);
             !isTesSuccess(err))
             return err;
     }
diff --git a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
index b8de9b911e..e36a0eb584 100644
--- a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
+++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.cpp
@@ -55,7 +55,7 @@ PermissionedDomainDelete::doApply()
     auto const slePd = view().peek(keylet::permissionedDomain(ctx_.tx.at(sfDomainID)));
     auto const page = (*slePd)[sfOwnerNode];
 
-    if (!view().dirRemove(keylet::ownerDir(account_), page, slePd->key(), true))
+    if (!view().dirRemove(keylet::ownerDir(accountID_), page, slePd->key(), true))
     {
         // LCOV_EXCL_START
         JLOG(j_.fatal()) << "Unable to delete permissioned domain directory entry.";
@@ -63,7 +63,7 @@ PermissionedDomainDelete::doApply()
         // LCOV_EXCL_STOP
     }
 
-    auto const ownerSle = view().peek(keylet::account(account_));
+    auto const ownerSle = view().peek(keylet::account(accountID_));
     XRPL_ASSERT(
         ownerSle && ownerSle->getFieldU32(sfOwnerCount) > 0,
         "xrpl::PermissionedDomainDelete::doApply : nonzero owner count");
diff --git a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
index bd7f6a33a1..ff4019ec59 100644
--- a/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
+++ b/src/libxrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.cpp
@@ -77,7 +77,7 @@ PermissionedDomainSet::preclaim(PreclaimContext const& ctx)
 TER
 PermissionedDomainSet::doApply()
 {
-    auto const ownerSle = view().peek(keylet::account(account_));
+    auto const ownerSle = view().peek(keylet::account(accountID_));
     if (!ownerSle)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -112,14 +112,14 @@ PermissionedDomainSet::doApply()
 
         bool const fixEnabled = view().rules().enabled(fixCleanup3_1_3);
         auto const seq = fixEnabled ? ctx_.tx.getSeqValue() : ctx_.tx.getFieldU32(sfSequence);
-        Keylet const pdKeylet = keylet::permissionedDomain(account_, seq);
+        Keylet const pdKeylet = keylet::permissionedDomain(accountID_, seq);
         auto slePd = std::make_shared<SLE>(pdKeylet);
 
-        slePd->setAccountID(sfOwner, account_);
+        slePd->setAccountID(sfOwner, accountID_);
         slePd->setFieldU32(sfSequence, seq);
         slePd->peekFieldArray(sfAcceptedCredentials) = std::move(sortedLE);
         auto const page =
-            view().dirInsert(keylet::ownerDir(account_), pdKeylet, describeOwnerDir(account_));
+            view().dirInsert(keylet::ownerDir(accountID_), pdKeylet, describeOwnerDir(accountID_));
         if (!page)
             return tecDIR_FULL;  // LCOV_EXCL_LINE
 
diff --git a/src/libxrpl/tx/transactors/system/Change.cpp b/src/libxrpl/tx/transactors/system/Change.cpp
index 9e9850f5a1..92a06fd807 100644
--- a/src/libxrpl/tx/transactors/system/Change.cpp
+++ b/src/libxrpl/tx/transactors/system/Change.cpp
@@ -154,7 +154,7 @@ Change::doApply()
 void
 Change::preCompute()
 {
-    XRPL_ASSERT(account_ == beast::kZero, "xrpl::Change::preCompute : zero account");
+    XRPL_ASSERT(accountID_ == beast::kZero, "xrpl::Change::preCompute : zero account");
 }
 
 TER
diff --git a/src/libxrpl/tx/transactors/system/TicketCreate.cpp b/src/libxrpl/tx/transactors/system/TicketCreate.cpp
index e7673e0bff..f442ac223b 100644
--- a/src/libxrpl/tx/transactors/system/TicketCreate.cpp
+++ b/src/libxrpl/tx/transactors/system/TicketCreate.cpp
@@ -67,7 +67,7 @@ TicketCreate::preclaim(PreclaimContext const& ctx)
 TER
 TicketCreate::doApply()
 {
-    SLE::pointer const sleAccountRoot = view().peek(keylet::account(account_));
+    SLE::pointer const sleAccountRoot = view().peek(keylet::account(accountID_));
     if (!sleAccountRoot)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -100,15 +100,15 @@ TicketCreate::doApply()
     for (std::uint32_t i = 0; i < ticketCount; ++i)
     {
         std::uint32_t const curTicketSeq = firstTicketSeq + i;
-        Keylet const ticketKeylet = keylet::kTicket(account_, curTicketSeq);
+        Keylet const ticketKeylet = keylet::kTicket(accountID_, curTicketSeq);
         SLE::pointer const sleTicket = std::make_shared<SLE>(ticketKeylet);
 
-        sleTicket->setAccountID(sfAccount, account_);
+        sleTicket->setAccountID(sfAccount, accountID_);
         sleTicket->setFieldU32(sfTicketSequence, curTicketSeq);
         view().insert(sleTicket);
 
-        auto const page =
-            view().dirInsert(keylet::ownerDir(account_), ticketKeylet, describeOwnerDir(account_));
+        auto const page = view().dirInsert(
+            keylet::ownerDir(accountID_), ticketKeylet, describeOwnerDir(accountID_));
 
         JLOG(j_.trace()) << "Creating ticket " << to_string(ticketKeylet.key) << ": "
                          << (page ? "success" : "failure");
diff --git a/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp b/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp
index eb1cb04fc7..382ea7d40e 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenAuthorize.cpp
@@ -148,7 +148,7 @@ MPTokenAuthorize::doApply()
         ctx_.view(),
         preFeeBalance_,
         tx[sfMPTokenIssuanceID],
-        account_,
+        accountID_,
         ctx_.journal,
         tx.getFlags(),
         tx[~sfHolder]);
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
index aa1cb559d2..1440b67309 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
@@ -159,7 +159,7 @@ MPTokenIssuanceCreate::doApply()
         j_,
         {
             .priorBalance = preFeeBalance_,
-            .account = account_,
+            .account = accountID_,
             .sequence = tx.getSeqValue(),
             .flags = tx.getFlags(),
             .maxAmount = tx[~sfMaximumAmount],
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp
index be03d78c64..46811508b7 100644
--- a/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp
+++ b/src/libxrpl/tx/transactors/token/MPTokenIssuanceDestroy.cpp
@@ -45,15 +45,15 @@ TER
 MPTokenIssuanceDestroy::doApply()
 {
     auto const mpt = view().peek(keylet::mptIssuance(ctx_.tx[sfMPTokenIssuanceID]));
-    if (account_ != mpt->getAccountID(sfIssuer))
+    if (accountID_ != mpt->getAccountID(sfIssuer))
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
-    if (!view().dirRemove(keylet::ownerDir(account_), (*mpt)[sfOwnerNode], mpt->key(), false))
+    if (!view().dirRemove(keylet::ownerDir(accountID_), (*mpt)[sfOwnerNode], mpt->key(), false))
         return tefBAD_LEDGER;  // LCOV_EXCL_LINE
 
     view().erase(mpt);
 
-    adjustOwnerCount(view(), view().peek(keylet::account(account_)), -1, j_);
+    adjustOwnerCount(view(), view().peek(keylet::account(accountID_)), -1, j_);
 
     return tesSUCCESS;
 }
diff --git a/src/libxrpl/tx/transactors/token/TrustSet.cpp b/src/libxrpl/tx/transactors/token/TrustSet.cpp
index 7c99085071..a8ea786347 100644
--- a/src/libxrpl/tx/transactors/token/TrustSet.cpp
+++ b/src/libxrpl/tx/transactors/token/TrustSet.cpp
@@ -336,9 +336,9 @@ TrustSet::doApply()
     AccountID const uDstAccountID(saLimitAmount.getIssuer());
 
     // true, if current is high account.
-    bool const bHigh = account_ > uDstAccountID;
+    bool const bHigh = accountID_ > uDstAccountID;
 
-    auto const sle = view().peek(keylet::account(account_));
+    auto const sle = view().peek(keylet::account(accountID_));
     if (!sle)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
@@ -391,10 +391,10 @@ TrustSet::doApply()
     }
 
     STAmount saLimitAllow = saLimitAmount;
-    saLimitAllow.get<Issue>().account = account_;
+    saLimitAllow.get<Issue>().account = accountID_;
 
     SLE::pointer const sleRippleState =
-        view().peek(keylet::line(account_, uDstAccountID, currency));
+        view().peek(keylet::line(accountID_, uDstAccountID, currency));
 
     if (sleRippleState)
     {
@@ -406,8 +406,8 @@ TrustSet::doApply()
         std::uint32_t uLowQualityOut = 0;
         std::uint32_t uHighQualityIn = 0;
         std::uint32_t uHighQualityOut = 0;
-        auto const& uLowAccountID = !bHigh ? account_ : uDstAccountID;
-        auto const& uHighAccountID = bHigh ? account_ : uDstAccountID;
+        auto const& uLowAccountID = !bHigh ? accountID_ : uDstAccountID;
+        auto const& uHighAccountID = bHigh ? accountID_ : uDstAccountID;
         SLE::ref sleLowAccount = !bHigh ? sle : sleDst;
         SLE::ref sleHighAccount = bHigh ? sle : sleDst;
 
@@ -642,7 +642,7 @@ TrustSet::doApply()
         // Zero balance in currency.
         STAmount const saBalance(Issue{currency, noAccount()});
 
-        auto const k = keylet::line(account_, uDstAccountID, currency);
+        auto const k = keylet::line(accountID_, uDstAccountID, currency);
 
         JLOG(j_.trace()) << "doTrustSet: Creating ripple line: " << to_string(k.key);
 
@@ -650,7 +650,7 @@ TrustSet::doApply()
         terResult = trustCreate(
             view(),
             bHigh,
-            account_,
+            accountID_,
             uDstAccountID,
             k.key,
             sle,
diff --git a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
index 1bd61a0175..b5b2c1f384 100644
--- a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
@@ -349,7 +349,7 @@ VaultClawback::doApply()
     MPTIssue const share{mptIssuanceID};
 
     Asset const vaultAsset = vault->at(sfAsset);
-    STAmount const amount = clawbackAmount(vault, tx[~sfAmount], account_);
+    STAmount const amount = clawbackAmount(vault, tx[~sfAmount], accountID_);
 
     auto assetsAvailable = vault->at(sfAssetsAvailable);
     auto assetsTotal = vault->at(sfAssetsTotal);
@@ -364,7 +364,7 @@ VaultClawback::doApply()
     STAmount assetsRecovered = {vault->at(sfAsset)};
 
     // The Owner is burning shares
-    if (account_ == vault->at(sfOwner) && amount.asset() == share)
+    if (accountID_ == vault->at(sfOwner) && amount.asset() == share)
     {
         sharesDestroyed = accountHolds(
             view(), holder, share, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
@@ -426,7 +426,7 @@ VaultClawback::doApply()
     {
         // Transfer assets from vault to issuer.
         if (auto const ter = accountSend(
-                view(), vaultAccount, account_, assetsRecovered, j_, WaiveTransferFee::Yes);
+                view(), vaultAccount, accountID_, assetsRecovered, j_, WaiveTransferFee::Yes);
             !isTesSuccess(ter))
             return ter;
 
diff --git a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
index e1e321b2c6..c6e1f28d57 100644
--- a/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultCreate.cpp
@@ -145,13 +145,13 @@ VaultCreate::doApply()
 
     auto const& tx = ctx_.tx;
     auto const sequence = tx.getSeqValue();
-    auto const owner = view().peek(keylet::account(account_));
+    auto const owner = view().peek(keylet::account(accountID_));
     if (owner == nullptr)
         return tefINTERNAL;  // LCOV_EXCL_LINE
 
-    auto vault = std::make_shared<SLE>(keylet::vault(account_, sequence));
+    auto vault = std::make_shared<SLE>(keylet::vault(accountID_, sequence));
 
-    if (auto ter = dirLink(view(), account_, vault))
+    if (auto ter = dirLink(view(), accountID_, vault))
         return ter;
     // We will create Vault and PseudoAccount, hence increase OwnerCount by 2
     adjustOwnerCount(view(), owner, 2, j_);
@@ -204,7 +204,7 @@ VaultCreate::doApply()
     vault->setFieldIssue(sfAsset, STIssue{sfAsset, asset});
     vault->at(sfFlags) = tx.getFlags() & tfVaultPrivate;
     vault->at(sfSequence) = sequence;
-    vault->at(sfOwner) = account_;
+    vault->at(sfOwner) = accountID_;
     vault->at(sfAccount) = pseudoId;
     vault->at(sfAssetsTotal) = Number(0);
     vault->at(sfAssetsAvailable) = Number(0);
@@ -230,7 +230,7 @@ VaultCreate::doApply()
 
     // Explicitly create MPToken for the vault owner
     if (auto const err =
-            authorizeMPToken(view(), preFeeBalance_, mptIssuanceID, account_, ctx_.journal);
+            authorizeMPToken(view(), preFeeBalance_, mptIssuanceID, accountID_, ctx_.journal);
         !isTesSuccess(err))
         return err;
 
@@ -238,7 +238,7 @@ VaultCreate::doApply()
     if (tx.isFlag(tfVaultPrivate))
     {
         if (auto const err = authorizeMPToken(
-                view(), preFeeBalance_, mptIssuanceID, pseudoId, ctx_.journal, {}, account_);
+                view(), preFeeBalance_, mptIssuanceID, pseudoId, ctx_.journal, {}, accountID_);
             !isTesSuccess(err))
             return err;
     }
diff --git a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
index fc34aba150..438896e7ed 100644
--- a/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultDelete.cpp
@@ -122,16 +122,16 @@ VaultDelete::doApply()
     }
 
     // Try to remove MPToken for vault shares for the vault owner if it exists.
-    if (auto const mptoken = view().peek(keylet::mptoken(shareMPTID, account_)))
+    if (auto const mptoken = view().peek(keylet::mptoken(shareMPTID, accountID_)))
     {
-        if (auto const ter = removeEmptyHolding(view(), account_, MPTIssue(shareMPTID), j_);
+        if (auto const ter = removeEmptyHolding(view(), accountID_, MPTIssue(shareMPTID), j_);
             !isTesSuccess(ter))
         {
             // LCOV_EXCL_START
             JLOG(j_.error())  //
                 << "VaultDelete: failed to remove vault owner's MPToken"
-                << " MPTID=" << to_string(shareMPTID)  //
-                << " account=" << toBase58(account_)   //
+                << " MPTID=" << to_string(shareMPTID)   //
+                << " account=" << toBase58(accountID_)  //
                 << " with result: " << transToken(ter);
             return ter;
             // LCOV_EXCL_STOP
diff --git a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
index a378c4b991..b8230b90c8 100644
--- a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
@@ -156,20 +156,20 @@ VaultDeposit::doApply()
 
     auto const& vaultAccount = vault->at(sfAccount);
     // Note, vault owner is always authorized
-    if (vault->isFlag(lsfVaultPrivate) && account_ != vault->at(sfOwner))
+    if (vault->isFlag(lsfVaultPrivate) && accountID_ != vault->at(sfOwner))
     {
         if (auto const err = enforceMPTokenAuthorization(
-                ctx_.view(), mptIssuanceID, account_, preFeeBalance_, j_);
+                ctx_.view(), mptIssuanceID, accountID_, preFeeBalance_, j_);
             !isTesSuccess(err))
             return err;
     }
-    else  // !vault->isFlag(lsfVaultPrivate) || account_ == vault->at(sfOwner)
+    else  // !vault->isFlag(lsfVaultPrivate) || accountID_ == vault->at(sfOwner)
     {
         // No authorization needed, but must ensure there is MPToken
-        if (!view().exists(keylet::mptoken(mptIssuanceID, account_)))
+        if (!view().exists(keylet::mptoken(mptIssuanceID, accountID_)))
         {
             if (auto const err = authorizeMPToken(
-                    view(), preFeeBalance_, mptIssuanceID->value(), account_, ctx_.journal);
+                    view(), preFeeBalance_, mptIssuanceID->value(), accountID_, ctx_.journal);
                 !isTesSuccess(err))
                 return err;
         }
@@ -179,15 +179,15 @@ VaultDeposit::doApply()
         {
             // This follows from the reverse of the outer enclosing if condition
             XRPL_ASSERT(
-                account_ == vault->at(sfOwner), "xrpl::VaultDeposit::doApply : account is owner");
+                accountID_ == vault->at(sfOwner), "xrpl::VaultDeposit::doApply : account is owner");
             if (auto const err = authorizeMPToken(
                     view(),
                     preFeeBalance_,             // priorBalance
                     mptIssuanceID->value(),     // mptIssuanceID
                     sleIssuance->at(sfIssuer),  // account
                     ctx_.journal,
-                    {},       // flags
-                    account_  // holderID
+                    {},         // flags
+                    accountID_  // holderID
                 );
                 !isTesSuccess(err))
                 return err;
@@ -247,15 +247,15 @@ VaultDeposit::doApply()
         return tecLIMIT_EXCEEDED;
 
     // Transfer assets from depositor to vault.
-    if (auto const ter =
-            accountSend(view(), account_, vaultAccount, assetsDeposited, j_, WaiveTransferFee::Yes);
+    if (auto const ter = accountSend(
+            view(), accountID_, vaultAccount, assetsDeposited, j_, WaiveTransferFee::Yes);
         !isTesSuccess(ter))
         return ter;
 
     // Sanity check
     if (accountHolds(
             view(),
-            account_,
+            accountID_,
             assetsDeposited.asset(),
             FreezeHandling::IgnoreFreeze,
             AuthHandling::IgnoreAuth,
@@ -269,7 +269,7 @@ VaultDeposit::doApply()
 
     // Transfer shares from vault to depositor.
     if (auto const ter =
-            accountSend(view(), vaultAccount, account_, sharesCreated, j_, WaiveTransferFee::Yes);
+            accountSend(view(), vaultAccount, accountID_, sharesCreated, j_, WaiveTransferFee::Yes);
         !isTesSuccess(ter))
         return ter;
 
diff --git a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
index ddfc788928..136f9e17c6 100644
--- a/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultWithdraw.cpp
@@ -222,7 +222,7 @@ VaultWithdraw::doApply()
     }
 
     if (accountHolds(
-            view(), account_, share, FreezeHandling::ZeroIfFrozen, AuthHandling::IgnoreAuth, j_) <
+            view(), accountID_, share, FreezeHandling::ZeroIfFrozen, AuthHandling::IgnoreAuth, j_) <
         sharesRedeemed)
     {
         JLOG(j_.debug()) << "VaultWithdraw: account doesn't hold enough shares";
@@ -251,23 +251,23 @@ VaultWithdraw::doApply()
 
     auto const& vaultAccount = vault->at(sfAccount);
     // Transfer shares from depositor to vault.
-    if (auto const ter =
-            accountSend(view(), account_, vaultAccount, sharesRedeemed, j_, WaiveTransferFee::Yes);
+    if (auto const ter = accountSend(
+            view(), accountID_, vaultAccount, sharesRedeemed, j_, WaiveTransferFee::Yes);
         !isTesSuccess(ter))
         return ter;
 
     // Try to remove MPToken for shares, if the account balance is zero. Vault
     // pseudo-account will never set lsfMPTAuthorized, so we ignore flags.
     // Keep MPToken if holder is the vault owner.
-    if (account_ != vault->at(sfOwner))
+    if (accountID_ != vault->at(sfOwner))
     {
-        if (auto const ter = removeEmptyHolding(view(), account_, sharesRedeemed.asset(), j_);
+        if (auto const ter = removeEmptyHolding(view(), accountID_, sharesRedeemed.asset(), j_);
             isTesSuccess(ter))
         {
             JLOG(j_.debug())  //
                 << "VaultWithdraw: removed empty MPToken for vault shares"
                 << " MPTID=" << to_string(mptIssuanceID)  //
-                << " account=" << toBase58(account_);
+                << " account=" << toBase58(accountID_);
         }
         else if (ter != tecHAS_OBLIGATIONS)
         {
@@ -275,7 +275,7 @@ VaultWithdraw::doApply()
             JLOG(j_.error())  //
                 << "VaultWithdraw: failed to remove MPToken for vault shares"
                 << " MPTID=" << to_string(mptIssuanceID)  //
-                << " account=" << toBase58(account_)      //
+                << " account=" << toBase58(accountID_)    //
                 << " with result: " << transToken(ter);
             return ter;
             // LCOV_EXCL_STOP
@@ -283,12 +283,12 @@ VaultWithdraw::doApply()
         // else quietly ignore, account balance is not zero
     }
 
-    auto const dstAcct = ctx_.tx[~sfDestination].value_or(account_);
+    auto const dstAcct = ctx_.tx[~sfDestination].value_or(accountID_);
 
     associateAsset(*vault, vaultAsset);
 
     return doWithdraw(
-        view(), ctx_.tx, account_, dstAcct, vaultAccount, preFeeBalance_, assetsWithdrawn, j_);
+        view(), ctx_.tx, accountID_, dstAcct, vaultAccount, preFeeBalance_, assetsWithdrawn, j_);
 }
 
 void

From ad3d172a1f0a6bcac7a3d18c2cb15366ee5b1e47 Mon Sep 17 00:00:00 2001
From: Denis Angell <dangell@transia.co>
Date: Mon, 18 May 2026 22:08:48 +0200
Subject: [PATCH 08/12] fix: Use account ledger entry when canceling token
 escrows (#6171)

---
 .../tx/transactors/escrow/EscrowCancel.cpp    |  2 +-
 src/test/app/EscrowToken_test.cpp             | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
index 99cf467ee9..123f83a1a6 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
@@ -184,7 +184,7 @@ EscrowCancel::doApply()
                     return escrowUnlockApplyHelper<T>(
                         ctx_.view(),
                         kParityRate,
-                        slep,
+                        ctx_.view().rules().enabled(fixCleanup3_2_0) ? sle : slep,
                         preFeeBalance_,
                         amount,
                         issuer,
diff --git a/src/test/app/EscrowToken_test.cpp b/src/test/app/EscrowToken_test.cpp
index 82dd067bdc..5bb1303dba 100644
--- a/src/test/app/EscrowToken_test.cpp
+++ b/src/test/app/EscrowToken_test.cpp
@@ -886,6 +886,70 @@ struct EscrowToken_test : public beast::unit_test::Suite
         }
     }
 
+    void
+    testIOUCancelDoApply(FeatureBitset features)
+    {
+        testcase("IOU Cancel DoApply");
+        using namespace jtx;
+        using namespace std::literals;
+
+        {
+            Env env{*this, features};
+            auto const baseFee = env.current()->fees().base;
+            auto const alice = Account("alice");
+            auto const bob = Account("bob");
+            auto const gw = Account("gw");
+            auto const usd = gw["USD"];
+
+            env.fund(XRP(10'000), alice, bob, gw);
+            env.close();
+
+            env(fset(gw, asfAllowTrustLineLocking));
+            env.close();
+
+            env.trust(usd(100'000), alice);
+            env.trust(usd(100'000), bob);
+            env.close();
+
+            env(pay(gw, alice, usd(10'000)));
+            env.close();
+
+            auto const seq = env.seq(alice);
+            env(escrow::create(alice, bob, usd(1'000)),
+                escrow::kFinishTime(env.now() + 1s),
+                escrow::kCancelTime(env.now() + 2s),
+                Fee(baseFee));
+            env.close();
+
+            BEAST_EXPECT(env.balance(alice, usd) == usd(9'000));
+
+            env(pay(alice, gw, usd(9'000)));
+            env.close();
+
+            env(trust(alice, usd(0)));
+            env.close();
+
+            auto const trustLineKey = keylet::line(alice.id(), gw.id(), usd.currency);
+            BEAST_EXPECT(!env.current()->exists(trustLineKey));
+
+            env.close();
+            env.close();
+
+            auto const expectedResult = env.current()->rules().enabled(fixCleanup3_2_0)
+                ? Ter(tesSUCCESS)
+                : Ter(tefEXCEPTION);
+            env(escrow::cancel(alice, alice, seq), Fee(baseFee), expectedResult);
+            env.close();
+
+            if (env.current()->rules().enabled(fixCleanup3_2_0))
+            {
+                BEAST_EXPECT(!env.le(keylet::escrow(alice.id(), seq)));
+                BEAST_EXPECT(env.current()->exists(trustLineKey));
+                BEAST_EXPECT(env.balance(alice, usd) == usd(1'000));
+            }
+        }
+    }
+
     void
     testIOUBalances(FeatureBitset features)
     {
@@ -3887,6 +3951,7 @@ struct EscrowToken_test : public beast::unit_test::Suite
         testIOUFinishPreclaim(features);
         testIOUFinishDoApply(features);
         testIOUCancelPreclaim(features);
+        testIOUCancelDoApply(features);
         testIOUBalances(features);
         testIOUMetaAndOwnership(features);
         testIOURippleState(features);
@@ -3928,6 +3993,7 @@ public:
              {all - featureSingleAssetVault - featureLendingProtocol, all})
         {
             testIOUWithFeats(feats);
+            testIOUWithFeats(feats - fixCleanup3_2_0);
             testMPTWithFeats(feats);
             testMPTWithFeats(feats - fixTokenEscrowV1);
         }

From 1e45d363c56e45ac46f4a7c9295f916193bd4100 Mon Sep 17 00:00:00 2001
From: Fomo <508629+shortthefomo@users.noreply.github.com>
Date: Tue, 19 May 2026 02:05:47 -0400
Subject: [PATCH 09/12] fix: Set default peering port to 2459 (#6848)

Co-authored-by: Bart <bthomee@users.noreply.github.com>
---
 cfg/xrpld-example.cfg | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cfg/xrpld-example.cfg b/cfg/xrpld-example.cfg
index 5de61bb6d1..effc62c274 100644
--- a/cfg/xrpld-example.cfg
+++ b/cfg/xrpld-example.cfg
@@ -1466,10 +1466,7 @@ admin = 127.0.0.1
 protocol = http
 
 [port_peer]
-# Many servers still use the legacy port of 51235, so for backward-compatibility
-# we maintain that port number here. However, for new servers we recommend
-# changing this to the default port of 2459.
-port = 51235
+port = 2459
 ip = 0.0.0.0
 # alternatively, to accept connections on IPv4 + IPv6, use:
 #ip = ::

From 8d1083e5ea7c55c67af903c93dfedf990e71a2a0 Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Tue, 19 May 2026 14:15:11 +0100
Subject: [PATCH 10/12] ci: Only run reusable package in public repos (#7293)

---
 .github/workflows/reusable-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-package.yml b/.github/workflows/reusable-package.yml
index ad73cd8733..ec019b2e7e 100644
--- a/.github/workflows/reusable-package.yml
+++ b/.github/workflows/reusable-package.yml
@@ -58,6 +58,7 @@ jobs:
 
   package:
     needs: [generate-matrix, generate-version]
+    if: ${{ github.event.repository.visibility == 'public' }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
@@ -89,7 +90,6 @@ jobs:
 
       - name: Upload package artifact
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
-        if: ${{ github.event.repository.visibility == 'public' }}
         with:
           name: ${{ matrix.artifact_name }}-pkg-${{ needs.generate-version.outputs.version }}
           path: |

From d9a3af82078d596b169de80bb4bda4d19ad58bb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 May 2026 16:35:38 +0000
Subject: [PATCH 11/12] ci: [DEPENDABOT] bump actions/upload-artifact from
 7.0.0 to 7.0.1 (#7286)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/reusable-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-package.yml b/.github/workflows/reusable-package.yml
index ec019b2e7e..5108a55cd2 100644
--- a/.github/workflows/reusable-package.yml
+++ b/.github/workflows/reusable-package.yml
@@ -89,7 +89,7 @@ jobs:
         run: ./package/build_pkg.sh
 
       - name: Upload package artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: ${{ matrix.artifact_name }}-pkg-${{ needs.generate-version.outputs.version }}
           path: |

From 93ac1aa7aa23f801b0840a87804a6d755c944623 Mon Sep 17 00:00:00 2001
From: Vito Tumas <5780819+Tapanito@users.noreply.github.com>
Date: Tue, 19 May 2026 18:38:50 +0200
Subject: [PATCH 12/12] fix: Disable unnecessary sanity-check in VaultDeposit
 (#7288)

---
 .../tx/transactors/vault/VaultDeposit.cpp     | 32 +++++---
 src/test/app/Vault_test.cpp                   | 80 +++++++++++++++++++
 2 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
index b8230b90c8..aaaf3cced8 100644
--- a/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultDeposit.cpp
@@ -7,6 +7,7 @@
 #include <xrpl/ledger/helpers/MPTokenHelpers.h>
 #include <xrpl/ledger/helpers/TokenHelpers.h>
 #include <xrpl/ledger/helpers/VaultHelpers.h>
+#include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/LedgerFormats.h>
@@ -252,19 +253,26 @@ VaultDeposit::doApply()
         !isTesSuccess(ter))
         return ter;
 
-    // Sanity check
-    if (accountHolds(
-            view(),
-            accountID_,
-            assetsDeposited.asset(),
-            FreezeHandling::IgnoreFreeze,
-            AuthHandling::IgnoreAuth,
-            j_) < beast::kZero)
+    // This check is wrong. Disable it with fixCleanup3_2_0.
+    // For XRP and MPT the predicate is structurally unsatisfiable: xrpLiquid clamps at zero, and
+    // MPT balances are unsigned. For IOUs it only fires when the deposit drove the depositor's
+    // trust line into debt the exact case preclaim authorizes via SpendableHandling::FullBalance.
+    // The check thus converts a preclaim- authorized deposit into tefINTERNAL after the asset
+    // transfer.
+    if (!view().rules().enabled(fixCleanup3_2_0))
     {
-        // LCOV_EXCL_START
-        JLOG(j_.error()) << "VaultDeposit: negative balance of account assets.";
-        return tefINTERNAL;
-        // LCOV_EXCL_STOP
+        // Sanity check
+        if (accountHolds(
+                view(),
+                accountID_,
+                assetsDeposited.asset(),
+                FreezeHandling::IgnoreFreeze,
+                AuthHandling::IgnoreAuth,
+                j_) < beast::kZero)
+        {
+            JLOG(j_.error()) << "VaultDeposit: negative balance of account assets.";
+            return tefINTERNAL;
+        }
     }
 
     // Transfer shares from vault to depositor.
diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp
index cd4c35f1a5..318a6dc45c 100644
--- a/src/test/app/Vault_test.cpp
+++ b/src/test/app/Vault_test.cpp
@@ -6140,10 +6140,90 @@ class Vault_test : public beast::unit_test::Suite
         runTest(amendments);
     }
 
+    // VaultDeposit::preclaim uses accountHolds(..., SpendableHandling::
+    // shFULL_BALANCE), which for an IOU asset adds the counterparty's
+    // LowLimit/HighLimit to the depositor's raw balance (TokenHelpers.cpp:
+    // getTrustLineBalance with includeOppositeLimit=true). When the
+    // depositor's raw balance < deposit amount but raw + opposite limit >=
+    // amount, preclaim is satisfied. doApply then calls
+    // directSendNoFeeIOU, which unconditionally subtracts saAmount from
+    // saBalance — driving the trust line negative — and returns tesSUCCESS.
+    // The post-send sanity check uses the default shSIMPLE_BALANCE (no
+    // opposite-limit add), sees a negative balance, and returns tefINTERNAL.
+    void
+    testVaultDepositNegativeBalanceFromOppositeLimit()
+    {
+        auto runTest = [&](FeatureBitset f, TER expected) {
+            using namespace test::jtx;
+            using namespace std::literals;
+
+            Env env{*this, f};
+            Account const gw{"gateway"};
+            Account const owner{"owner"};
+            Account const depositor{"depositor"};
+
+            env.fund(XRP(10000), gw, owner, depositor);
+            env.close();
+
+            // Gateway with DefaultRipple so vault creation on its IOU works.
+            env(fset(gw, asfDefaultRipple));
+            env.close();
+
+            // Depositor opens a trust line to gateway and receives a small
+            // balance.
+            PrettyAsset const usd = gw["USD"];
+            env.trust(usd(1000), depositor);
+            env(pay(gw, depositor, usd(100)));  // raw trust-line balance: 100
+            env.close();
+
+            // Key precondition: gateway sets a non-zero limit on the same
+            // RippleState — the "opposite field" from depositor's perspective.
+            // This is what inflates shFULL_BALANCE in preclaim above the raw
+            // balance.
+            env(trust(gw, depositor["USD"](1000)));
+            env.close();
+
+            // Create the IOU vault.
+            Vault const vault{env};
+            auto [vaultTx, keylet] = vault.create({.owner = owner, .asset = usd});
+            env(vaultTx);
+            env.close();
+
+            // Submit a deposit of 500 USD:
+            //   - raw balance:                100 USD
+            //   - opposite limit (gw's side): 1000 USD
+            //   - preclaim sees 100 + 1000 = 1100, passes (>= 500)
+            //   - doApply transfers 500, depositor's trust-line balance
+            //     becomes -400
+            //   - sanity check at VaultDeposit.cpp:256 fires
+            //   - tx returns tefINTERNAL (BUG — should be tesSUCCESS.
+            auto depositTx =
+                vault.deposit({.depositor = depositor, .id = keylet.key, .amount = usd(500)});
+            env(depositTx, Ter(expected));
+            env.close();
+        };
+
+        {
+            testcase(
+                "IOU vault deposit exceeding depositor's balance but "
+                "within counterparty's trust limit, pre-fixCleanup3_2_0 "
+                "(tefINTERNAL)");
+            runTest(test::jtx::testableAmendments() - fixCleanup3_2_0, tefINTERNAL);
+        }
+        {
+            testcase(
+                "IOU vault deposit exceeding depositor's balance but "
+                "within counterparty's trust limit, post-fixCleanup3_2_0 "
+                "(tesSUCCESS)");
+            runTest(test::jtx::testableAmendments(), tesSUCCESS);
+        }
+    }
+
 public:
     void
     run() override
     {
+        testVaultDepositNegativeBalanceFromOppositeLimit();
         testSequences();
         testPreflight();
         testCreateFailXRP();